diff options
| author | danbst <abcz2.uprola@gmail.com> | 2019-08-18 18:00:25 +0300 |
|---|---|---|
| committer | danbst <abcz2.uprola@gmail.com> | 2019-08-18 18:00:25 +0300 |
| commit | d80cd26ff981f1c4be96b82757811b21f280f1a6 (patch) | |
| tree | 28375ed14a49fe86c03ef21868833faa23b56215 | |
| parent | 29ba0a0adff274f5ea0d93246be3f2957d234a7b (diff) | |
| parent | 2ca09a94be5182c8f8cc688eaded558d827312f1 (diff) | |
| download | nixpkgs-d80cd26ff981f1c4be96b82757811b21f280f1a6.tar nixpkgs-d80cd26ff981f1c4be96b82757811b21f280f1a6.tar.gz nixpkgs-d80cd26ff981f1c4be96b82757811b21f280f1a6.tar.bz2 nixpkgs-d80cd26ff981f1c4be96b82757811b21f280f1a6.tar.lz nixpkgs-d80cd26ff981f1c4be96b82757811b21f280f1a6.tar.xz nixpkgs-d80cd26ff981f1c4be96b82757811b21f280f1a6.tar.zst nixpkgs-d80cd26ff981f1c4be96b82757811b21f280f1a6.zip | |
Merge branch 'master' into flip-map-foreach
1062 files changed, 25644 insertions, 18257 deletions
diff --git a/doc/functions/dockertools.xml b/doc/functions/dockertools.xml index 3e9281557d5..a284182bb04 100644 --- a/doc/functions/dockertools.xml +++ b/doc/functions/dockertools.xml @@ -312,7 +312,23 @@ hello latest de2bf4786de6 About a minute ago 25.2MB Maximum number of layers to create. </para> <para> - <emphasis>Default:</emphasis> <literal>24</literal> + <emphasis>Default:</emphasis> <literal>100</literal> + </para> + <para> + <emphasis>Maximum:</emphasis> <literal>125</literal> + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <varname>extraCommands</varname> <emphasis>optional</emphasis> + </term> + <listitem> + <para> + Shell commands to run while building the final layer, without access + to most of the layer contents. Changes to this layer are "on top" + of all the other layers, so can create additional directories + and files. </para> </listitem> </varlistentry> diff --git a/doc/languages-frameworks/idris.section.md b/doc/languages-frameworks/idris.section.md index 3025172b5c9..e88015f08e3 100644 --- a/doc/languages-frameworks/idris.section.md +++ b/doc/languages-frameworks/idris.section.md @@ -124,3 +124,21 @@ in another file (say `default.nix`) to be able to build it with ``` $ nix-build -A yaml ``` + +## Passing options to `idris` commands + +The `build-idris-package` function provides also optional input values to set additional options for the used `idris` commands. + +Specifically, you can set `idrisBuildOptions`, `idrisTestOptions`, `idrisInstallOptions` and `idrisDocOptions` to provide additional options to the `idris` command respectively when building, testing, installing and generating docs for your package. + +For example you could set + +``` +build-idris-package { + idrisBuildOptions = [ "--log" "1" "--verbose" ] + + ... +} +``` + +to require verbose output during `idris` build phase. diff --git a/doc/languages-frameworks/qt.xml b/doc/languages-frameworks/qt.xml index 032cdd9945b..3332ce8c06e 100644 --- a/doc/languages-frameworks/qt.xml +++ b/doc/languages-frameworks/qt.xml @@ -113,6 +113,15 @@ mkDerivation { </programlisting> </para> + <note> + <para> + <literal>wrapQtAppsHook</literal> ignores files that are non-ELF executables. + This means that scripts won't be automatically wrapped so you'll need to manually + wrap them as previously mentioned. An example of when you'd always need to do this + is with Python applications that use PyQT. + </para> + </note> + <para> Libraries are built with every available version of Qt. Use the <literal>meta.broken</literal> attribute to disable the package for unsupported Qt versions: diff --git a/doc/quick-start.xml b/doc/quick-start.xml index 4f0952896e4..292d66864a4 100644 --- a/doc/quick-start.xml +++ b/doc/quick-start.xml @@ -210,8 +210,12 @@ </listitem> <listitem> <para> - Optionally commit the new package and open a pull request, or send a patch - to <literal>https://groups.google.com/forum/#!forum/nix-devel</literal>. + Optionally commit the new package and open a pull request <link + xlink:href="https://github.com/NixOS/nixpkgs/pulls">to nixpkgs</link>, or + use <link + xlink:href="https://discourse.nixos.org/t/about-the-patches-category/477"> + the Patches category</link> on Discourse for sending a patch without a + GitHub account. </para> </listitem> </orderedlist> diff --git a/doc/stdenv.xml b/doc/stdenv.xml index 42095c13e0a..fe592965656 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -1601,6 +1601,16 @@ installTargets = "install-bin install-doc";</programlisting> <title>Variables controlling the fixup phase</title> <varlistentry> <term> + <varname>dontFixup</varname> + </term> + <listitem> + <para> + Set to true to skip the fixup phase. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> <varname>dontStrip</varname> </term> <listitem> diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index eadaa0521b3..cf344122cf4 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -71,6 +71,15 @@ checkConfigError 'The option value .* in .* is not of type.*positive integer.*' checkConfigOutput "42" config.value ./declare-int-between-value.nix ./define-value-int-positive.nix checkConfigError 'The option value .* in .* is not of type.*between.*-21 and 43.*inclusive.*' config.value ./declare-int-between-value.nix ./define-value-int-negative.nix +# Check either types +# types.either +checkConfigOutput "42" config.value ./declare-either.nix ./define-value-int-positive.nix +checkConfigOutput "\"24\"" config.value ./declare-either.nix ./define-value-string.nix +# types.oneOf +checkConfigOutput "42" config.value ./declare-oneOf.nix ./define-value-int-positive.nix +checkConfigOutput "[ ]" config.value ./declare-oneOf.nix ./define-value-list.nix +checkConfigOutput "\"24\"" config.value ./declare-oneOf.nix ./define-value-string.nix + # Check mkForce without submodules. set -- config.enable ./declare-enable.nix ./define-enable.nix checkConfigOutput "true" "$@" diff --git a/lib/tests/modules/declare-either.nix b/lib/tests/modules/declare-either.nix new file mode 100644 index 00000000000..5a0fa978a13 --- /dev/null +++ b/lib/tests/modules/declare-either.nix @@ -0,0 +1,5 @@ +{ lib, ... }: { + options.value = lib.mkOption { + type = lib.types.either lib.types.int lib.types.str; + }; +} diff --git a/lib/tests/modules/declare-oneOf.nix b/lib/tests/modules/declare-oneOf.nix new file mode 100644 index 00000000000..df092a14f81 --- /dev/null +++ b/lib/tests/modules/declare-oneOf.nix @@ -0,0 +1,9 @@ +{ lib, ... }: { + options.value = lib.mkOption { + type = lib.types.oneOf [ + lib.types.int + (lib.types.listOf lib.types.int) + lib.types.str + ]; + }; +} diff --git a/lib/types.nix b/lib/types.nix index e22bcd326c8..9c00656ab91 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -443,6 +443,13 @@ rec { functor = (defaultFunctor name) // { wrapped = [ t1 t2 ]; }; }; + # Any of the types in the given list + oneOf = ts: + let + head' = if ts == [] then throw "types.oneOf needs to get at least one type in its argument" else head ts; + tail' = tail ts; + in foldl' either head' tail'; + # Either value of type `finalType` or `coercedType`, the latter is # converted to `finalType` using `coerceFunc`. coercedTo = coercedType: coerceFunc: finalType: diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 23168ff16e9..ebc58aa8d73 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7,6 +7,7 @@ # Optional github = "GithubUsername"; + githubId = your-github-id; keys = [{ longkeyid = "rsa2048/0x0123456789ABCDEF"; fingerprint = "AAAA BBBB CCCC DDDD EEEE FFFF 0000 1111 2222 3333"; @@ -19,6 +20,7 @@ - `name` is your, preferably real, name, - `email` is your maintainer email address, and - `github` is your GitHub handle (as it appears in the URL of your profile page, `https://github.com/<userhandle>`), + - `githubId` is your GitHub user ID, which can be found at `https://api.github.com/users/<userhandle>`, - `keys` is a list of your PGP/GPG key IDs and fingerprints. `handle == github` is strongly preferred whenever `github` is an acceptable attribute name and is short and convenient. @@ -42,6 +44,7 @@ email = "0x4A6F@shackspace.de"; name = "Joachim Ernst"; github = "0x4A6F"; + githubId = 9675338; keys = [{ longkeyid = "rsa8192/0x87027528B006D66D"; fingerprint = "F466 A548 AD3F C1F1 8C88 4576 8702 7528 B006 D66D"; @@ -50,41 +53,49 @@ "1000101" = { email = "jan.hrnko@satoshilabs.com"; github = "1000101"; + githubId = 791309; name = "Jan Hrnko"; }; a1russell = { email = "adamlr6+pub@gmail.com"; github = "a1russell"; + githubId = 241628; name = "Adam Russell"; }; aanderse = { email = "aaron@fosslib.net"; github = "aanderse"; + githubId = 7755101; name = "Aaron Andersen"; }; aaronjanse = { email = "aaron@ajanse.me"; github = "aaronjanse"; + githubId = 16829510; name = "Aaron Janse"; - keys = [ - { longkeyid = "rsa2048/0x651BD4B37D75E234"; # Email only - fingerprint = "490F 5009 34E7 20BD 4C53 96C2 651B D4B3 7D75 E234"; - } - { longkeyid = "rsa4096/0xBE6C92145BFF4A34"; # Git, etc - fingerprint = "CED9 6DF4 63D7 B86A 1C4B 1322 BE6C 9214 5BFF 4A34"; - } - ]; }; aaronschif = { email = "aaronschif@gmail.com"; github = "aaronschif"; + githubId = 2258953; name = "Aaron Schif"; }; abaldeau = { email = "andreas@baldeau.net"; github = "baldo"; + githubId = 178750; name = "Andreas Baldeau"; }; + abbe = { + email = "ashish.is@lostca.se"; + github = "wahjava"; + githubId = 2255192; + name = "Ashish SHUKLA"; + keys = [{ + longkeyid = "rsa4096/0xC746CFA9E74FA4B0"; + fingerprint = "F682 CDCC 39DC 0FEA E116 20B6 C746 CFA9 E74F A4B0"; + }]; + }; abbradar = { email = "ab@fmap.me"; github = "abbradar"; @@ -93,31 +104,37 @@ abhi18av = { email = "abhi18av@gmail.com"; github = "abhi18av"; + githubId = 12799326; name = "Abhinav Sharma"; }; abigailbuccaneer = { email = "abigailbuccaneer@gmail.com"; github = "abigailbuccaneer"; + githubId = 908758; name = "Abigail Bunyan"; }; aborsu = { email = "a.borsu@gmail.com"; github = "aborsu"; + githubId = 5033617; name = "Augustin Borsu"; }; aboseley = { email = "adam.boseley@gmail.com"; github = "aboseley"; + githubId = 13504599; name = "Adam Boseley"; }; abuibrahim = { email = "ruslan@babayev.com"; github = "abuibrahim"; + githubId = 2321000; name = "Ruslan Babayev"; }; acowley = { email = "acowley@gmail.com"; github = "acowley"; + githubId = 124545; name = "Anthony Cowley"; }; adamt = { @@ -128,61 +145,73 @@ adelbertc = { email = "adelbertc@gmail.com"; github = "adelbertc"; + githubId = 1332980; name = "Adelbert Chang"; }; adev = { email = "adev@adev.name"; github = "adevress"; + githubId = 1773511; name = "Adrien Devresse"; }; adisbladis = { email = "adis@blad.is"; github = "adisbladis"; + githubId = 63286; name = "Adam Hose"; }; Adjective-Object = { email = "mhuan13@gmail.com"; github = "Adjective-Object"; + githubId = 1174858; name = "Maxwell Huang-Hobbs"; }; adnelson = { email = "ithinkican@gmail.com"; github = "adnelson"; + githubId = 5091511; name = "Allen Nelson"; }; adolfogc = { email = "adolfo.garcia.cr@gmail.com"; github = "adolfogc"; + githubId = 1250775; name = "Adolfo E. García Castro"; }; aepsil0n = { email = "eduard.bopp@aepsil0n.de"; github = "aepsil0n"; + githubId = 3098430; name = "Eduard Bopp"; }; aerialx = { email = "aaron+nixos@aaronlindsay.com"; github = "AerialX"; + githubId = 117295; name = "Aaron Lindsay"; }; aespinosa = { email = "allan.espinosa@outlook.com"; github = "aespinosa"; + githubId = 58771; name = "Allan Espinosa"; }; aethelz = { email = "aethelz@protonmail.com"; github = "aethelz"; + githubId = 10677343; name = "Eugene"; }; aflatter = { email = "flatter@fastmail.fm"; github = "aflatter"; + githubId = 168; name = "Alexander Flatter"; }; afldcr = { email = "alex@fldcr.com"; github = "afldcr"; + githubId = 335271; name = "James Alexander Feldman-Crough"; }; aforemny = { @@ -193,36 +222,43 @@ afranchuk = { email = "alex.franchuk@gmail.com"; github = "afranchuk"; + githubId = 4296804; name = "Alex Franchuk"; }; aherrmann = { email = "andreash87@gmx.ch"; github = "aherrmann"; + githubId = 732652; name = "Andreas Herrmann"; }; ahmedtd = { email = "ahmed.taahir@gmail.com"; github = "ahmedtd"; + githubId = 1017202; name = "Taahir Ahmed"; }; ahuzik = { email = "ales.guzik@gmail.com"; github = "alesguzik"; + githubId = 209175; name = "Ales Huzik"; }; aij = { email = "aij+git@mrph.org"; github = "aij"; + githubId = 4732885; name = "Ivan Jager"; }; ajs124 = { email = "nix@ajs124.de"; github = "ajs124"; + githubId = 1229027; name = "Andreas Schrägle"; }; ajgrf = { email = "a@ajgrf.com"; github = "ajgrf"; + githubId = 10733175; name = "Alex Griffin"; }; ak = { @@ -233,41 +269,54 @@ akavel = { email = "czapkofan@gmail.com"; github = "akavel"; + githubId = 273837; name = "Mateusz Czapliński"; }; akaWolf = { email = "akawolf0@gmail.com"; github = "akaWolf"; + githubId = 5836586; name = "Artjom Vejsel"; }; akc = { email = "akc@akc.is"; github = "akc"; + githubId = 1318982; name = "Anders Claesson"; }; akru = { email = "mail@akru.me"; github = "akru"; + githubId = 786394; name = "Alexander Krupenkin "; }; alexarice = { email = "alexrice999@hotmail.co.uk"; github = "alexarice"; + githubId = 17208985; name = "Alex Rice"; }; + alexbakker = { + email = "ab@alexbakker.me"; + github = "alexbakker"; + name = "Alexander Bakker"; + }; alexchapman = { email = "alex@farfromthere.net"; github = "AJChapman"; + githubId = 8316672; name = "Alex Chapman"; }; alexfmpe = { email = "alexandre.fmp.esteves@gmail.com"; github = "alexfmpe"; + githubId = 2335822; name = "Alexandre Esteves"; }; alexvorobiev = { email = "alexander.vorobiev@gmail.com"; github = "alexvorobiev"; + githubId = 782180; name = "Alex Vorobiev"; }; algorith = { @@ -277,6 +326,7 @@ alibabzo = { email = "alistair.bill@gmail.com"; github = "alibabzo"; + githubId = 2822871; name = "Alistair Bill"; }; all = { @@ -286,6 +336,7 @@ allonsy = { email = "linuxbash8@gmail.com"; github = "allonsy"; + githubId = 5892756; name = "Alec Snyder"; }; alunduil = { @@ -296,6 +347,7 @@ amar1729 = { email = "amar.paul16@gmail.com"; github = "amar1729"; + githubId = 15623522; name = "Amar Paul"; }; ambrop72 = { @@ -306,11 +358,13 @@ amiddelk = { email = "amiddelk@gmail.com"; github = "amiddelk"; + githubId = 1358320; name = "Arie Middelkoop"; }; amiloradovsky = { email = "miloradovsky@gmail.com"; github = "amiloradovsky"; + githubId = 20530052; name = "Andrew Miloradovsky"; }; aminb = { @@ -321,36 +375,43 @@ aminechikhaoui = { email = "amine.chikhaoui91@gmail.com"; github = "AmineChikhaoui"; + githubId = 5149377; name = "Amine Chikhaoui"; }; amorsillo = { email = "andrew.morsillo@gmail.com"; github = "AndrewMorsillo"; + githubId = 858965; name = "Andrew Morsillo"; }; andersk = { email = "andersk@mit.edu"; github = "andersk"; + githubId = 26471; name = "Anders Kaseorg"; }; anderslundstedt = { email = "git@anderslundstedt.se"; github = "anderslundstedt"; + githubId = 4514101; name = "Anders Lundstedt"; }; AndersonTorres = { email = "torres.anderson.85@protonmail.com"; github = "AndersonTorres"; + githubId = 5954806; name = "Anderson Torres"; }; anderspapitto = { email = "anderspapitto@gmail.com"; github = "anderspapitto"; + githubId = 1388690; name = "Anders Papitto"; }; andir = { email = "andreas@rammhold.de"; github = "andir"; + githubId = 638836; name = "Andreas Rammhold"; }; andreabedini = { @@ -366,21 +427,25 @@ andrestylianos = { email = "andre.stylianos@gmail.com"; github = "andrestylianos"; + githubId = 7112447; name = "Andre S. Ramos"; }; andrew-d = { email = "andrew@du.nham.ca"; github = "andrew-d"; + githubId = 1079173; name = "Andrew Dunham"; }; andrewchambers = { email = "ac@acha.ninja"; github = "andrewchambers"; + githubId = 962885; name = "Andrew Chambers"; }; andrewrk = { email = "superjoe30@gmail.com"; github = "andrewrk"; + githubId = 106511; name = "Andrew Kelley"; }; andsild = { @@ -391,31 +456,37 @@ aneeshusa = { email = "aneeshusa@gmail.com"; github = "aneeshusa"; + githubId = 2085567; name = "Aneesh Agrawal"; }; angristan = { email = "angristan@pm.me"; github = "angristan"; + githubId = 11699655; name = "Stanislas Lange"; }; ankhers = { email = "justin.k.wood@gmail.com"; github = "ankhers"; + githubId = 750786; name = "Justin Wood"; }; anpryl = { email = "anpryl@gmail.com"; github = "anpryl"; + githubId = 5327697; name = "Anatolii Prylutskyi"; }; anton-dessiatov = { email = "anton.dessiatov@gmail.com"; github = "anton-dessiatov"; + githubId = 2873280; name = "Anton Desyatov"; }; Anton-Latukha = { email = "anton.latuka+nixpkgs@gmail.com"; github = "Anton-Latukha"; + githubId = 20933385; name = "Anton Latukha"; }; antono = { @@ -426,51 +497,61 @@ antonxy = { email = "anton.schirg@posteo.de"; github = "antonxy"; + githubId = 4194320; name = "Anton Schirg"; }; apeschar = { email = "albert@peschar.net"; github = "apeschar"; + githubId = 122977; name = "Albert Peschar"; }; apeyroux = { email = "alex@px.io"; github = "apeyroux"; + githubId = 1078530; name = "Alexandre Peyroux"; }; ar1a = { email = "aria@ar1as.space"; github = "ar1a"; + githubId = 8436007; name = "Aria Edmonds"; }; arcadio = { email = "arc@well.ox.ac.uk"; github = "arcadio"; + githubId = 56009; name = "Arcadio Rubio García"; }; ardumont = { email = "eniotna.t@gmail.com"; github = "ardumont"; + githubId = 718812; name = "Antoine R. Dumont"; }; aristid = { email = "aristidb@gmail.com"; github = "aristidb"; + githubId = 30712; name = "Aristid Breitkreuz"; }; ariutta = { email = "anders.riutta@gmail.com"; github = "ariutta"; + githubId = 1296771; name = "Anders Riutta"; }; arobyn = { email = "shados@shados.net"; github = "shados"; + githubId = 338268; name = "Alexei Robyn"; }; artemist = { email = "me@artem.ist"; github = "artemist"; + githubId = 1226638; name = "Artemis Tosini"; keys = [{ longkeyid = "rsa4096/0x4FDC96F161E7BA8A"; @@ -480,56 +561,67 @@ artuuge = { email = "artuuge@gmail.com"; github = "artuuge"; + githubId = 10285250; name = "Artur E. Ruuge"; }; ashalkhakov = { email = "artyom.shalkhakov@gmail.com"; github = "ashalkhakov"; + githubId = 1270502; name = "Artyom Shalkhakov"; }; ashgillman = { email = "gillmanash@gmail.com"; github = "ashgillman"; + githubId = 816777; name = "Ashley Gillman"; }; aske = { email = "aske@fmap.me"; github = "aske"; + githubId = 869771; name = "Kirill Boltaev"; }; asppsa = { email = "asppsa@gmail.com"; github = "asppsa"; + githubId = 453170; name = "Alastair Pharo"; }; astro = { email = "astro@spaceboyz.net"; github = "astro"; + githubId = 12923; name = "Astro"; }; astsmtl = { email = "astsmtl@yandex.ru"; github = "astsmtl"; + githubId = 2093941; name = "Alexander Tsamutali"; }; asymmetric = { email = "lorenzo@mailbox.org"; github = "asymmetric"; + githubId = 101816; name = "Lorenzo Manacorda"; }; aszlig = { email = "aszlig@nix.build"; github = "aszlig"; + githubId = 192147; name = "aszlig"; }; athas = { email = "athas@sigkill.dk"; github = "athas"; + githubId = 55833; name = "Troels Henriksen"; }; atnnn = { email = "etienne@atnnn.com"; github = "atnnn"; + githubId = 706854; name = "Etienne Laurin"; }; auntie = { @@ -540,11 +632,13 @@ avaq = { email = "avaq+nixos@xs4all.nl"; github = "avaq"; + githubId = 1217745; name = "Aldwin Vlasblom"; }; avery = { email = "averyl+nixos@protonmail.com"; github = "AveryLychee"; + githubId = 9147625; name = "Avery Lychee"; }; averelld = { @@ -555,6 +649,7 @@ avitex = { email = "theavitex@gmail.com"; github = "avitex"; + githubId = 5110816; name = "avitex"; keys = [{ longkeyid = "rsa4096/0x8B366C443CABE942"; @@ -564,26 +659,31 @@ avnik = { email = "avn@avnik.info"; github = "avnik"; + githubId = 153538; name = "Alexander V. Nikolaev"; }; aw = { email = "aw-nixos@meterriblecrew.net"; github = "herrwiese"; + githubId = 206242; name = "Andreas Wiese"; }; aycanirican = { email = "iricanaycan@gmail.com"; github = "aycanirican"; + githubId = 135230; name = "Aycan iRiCAN"; }; babariviere = { email = "babariviere@protonmail.com"; github = "babariviere"; + githubId = 12128029; name = "babariviere"; }; bachp = { email = "pascal.bach@nextrem.ch"; github = "bachp"; + githubId = 333807; name = "Pascal Bach"; }; backuitist = { @@ -603,96 +703,115 @@ balsoft = { email = "balsoft75@gmail.com"; github = "balsoft"; + githubId = 18467667; name = "Alexander Bantyev"; }; bandresen = { email = "bandresen@gmail.com"; github = "bandresen"; + githubId = 80325; name = "Benjamin Andresen"; }; baracoder = { email = "baracoder@googlemail.com"; github = "baracoder"; + githubId = 127523; name = "Herman Fries"; }; barrucadu = { email = "mike@barrucadu.co.uk"; github = "barrucadu"; + githubId = 75235; name = "Michael Walker"; }; basvandijk = { email = "v.dijk.bas@gmail.com"; github = "basvandijk"; + githubId = 576355; name = "Bas van Dijk"; }; Baughn = { email = "sveina@gmail.com"; github = "Baughn"; + githubId = 45811; name = "Svein Ove Aas"; }; bb010g = { email = "me@bb010g.com"; github = "bb010g"; + githubId = 340132; name = "Brayden Banks"; }; bbarker = { email = "brandon.barker@gmail.com"; github = "bbarker"; + githubId = 916366; name = "Brandon Elam Barker"; }; bbigras = { email = "bigras.bruno@gmail.com"; github = "bbigras"; + githubId = 24027; name = "Bruno Bigras"; }; bcarrell = { email = "brandoncarrell@gmail.com"; github = "bcarrell"; + githubId = 1015044; name = "Brandon Carrell"; }; bcdarwin = { email = "bcdarwin@gmail.com"; github = "bcdarwin"; + githubId = 164148; name = "Ben Darwin"; }; bdesham = { email = "benjamin@esham.io"; github = "bdesham"; + githubId = 354230; name = "Benjamin Esham"; }; bdimcheff = { email = "brandon@dimcheff.com"; github = "bdimcheff"; + githubId = 14111; name = "Brandon Dimcheff"; }; bendlas = { email = "herwig@bendlas.net"; github = "bendlas"; + githubId = 214787; name = "Herwig Hochleitner"; }; benley = { email = "benley@gmail.com"; github = "benley"; + githubId = 1432730; name = "Benjamin Staffin"; }; bennofs = { email = "benno.fuenfstueck@gmail.com"; github = "bennofs"; + githubId = 3192959; name = "Benno Fünfstück"; }; benpye = { email = "ben@curlybracket.co.uk"; github = "benpye"; + githubId = 442623; name = "Ben Pye"; }; benwbooth = { email = "benwbooth@gmail.com"; github = "benwbooth"; + githubId = 75972; name = "Ben Booth"; }; berce = { email = "bert.moens@gmail.com"; github = "berce"; + githubId = 10439709; name = "Bert Moens"; }; berdario = { @@ -703,36 +822,43 @@ bergey = { email = "bergey@teallabs.org"; github = "bergey"; + githubId = 251106; name = "Daniel Bergey"; }; betaboon = { email = "betaboon@0x80.ninja"; github = "betaboon"; + githubId = 7346933; name = "betaboon"; }; bfortz = { email = "bernard.fortz@gmail.com"; github = "bfortz"; + githubId = 16426882; name = "Bernard Fortz"; }; bgamari = { email = "ben@smart-cactus.org"; github = "bgamari"; + githubId = 1010174; name = "Ben Gamari"; }; bhall = { email = "brendan.j.hall@bath.edu"; github = "brendan-hall"; + githubId = 34919100; name = "Brendan Hall"; }; bhipple = { email = "bhipple@protonmail.com"; github = "bhipple"; + githubId = 2071583; name = "Benjamin Hipple"; }; binarin = { email = "binarin@binarin.ru"; github = "binarin"; + githubId = 185443; name = "Alexey Lebedeff"; }; bjg = { @@ -742,11 +868,13 @@ bjornfor = { email = "bjorn.forsman@gmail.com"; github = "bjornfor"; + githubId = 133602; name = "Bjørn Forsman"; }; bkchr = { email = "nixos@kchr.de"; github = "bkchr"; + githubId = 5718007; name = "Bastian Köcher"; }; bluescreen303 = { @@ -757,21 +885,25 @@ bobakker = { email = "bobakk3r@gmail.com"; github = "bobakker"; + githubId = 10221570; name = "Bo Bakker"; }; bobvanderlinden = { email = "bobvanderlinden@gmail.com"; github = "bobvanderlinden"; + githubId = 6375609; name = "Bob van der Linden"; }; bodil = { email = "nix@bodil.org"; github = "bodil"; + githubId = 17880; name = "Bodil Stokke"; }; boj = { email = "brian@uncannyworks.com"; github = "boj"; + githubId = 50839; name = "Brian Jones"; }; boothead = { @@ -782,181 +914,215 @@ borisbabic = { email = "boris.ivan.babic@gmail.com"; github = "borisbabic"; + githubId = 1743184; name = "Boris Babić"; }; bosu = { email = "boriss@gmail.com"; github = "bosu"; + githubId = 3465841; name = "Boris Sukholitko"; }; bradediger = { email = "brad@bradediger.com"; github = "bradediger"; + githubId = 4621; name = "Brad Ediger"; }; brainrape = { email = "martonboros@gmail.com"; github = "brainrape"; + githubId = 302429; name = "Marton Boros"; }; bramd = { email = "bram@bramd.nl"; github = "bramd"; + githubId = 86652; name = "Bram Duvigneau"; }; braydenjw = { email = "nixpkgs@willenborg.ca"; github = "braydenjw"; + githubId = 2506621; name = "Brayden Willenborg"; }; brian-dawn = { email = "brian.t.dawn@gmail.com"; github = "brian-dawn"; + githubId = 1274409; name = "Brian Dawn"; }; brianhicks = { email = "brian@brianthicks.com"; github = "BrianHicks"; + githubId = 355401; name = "Brian Hicks"; }; bricewge = { email = "bricewge@gmail.com"; github = "bricewge"; + githubId = 5525646; name = "Brice Waegeneire"; }; bstrik = { email = "dutchman55@gmx.com"; github = "bstrik"; + githubId = 7716744; name = "Berno Strik"; }; buffet = { email = "niclas@countingsort.com"; github = "buffet"; + githubId = 33751841; name = "Niclas Meyer"; }; bugworm = { email = "bugworm@zoho.com"; github = "bugworm"; + githubId = 7214361; name = "Roman Gerasimenko"; }; bzizou = { email = "Bruno@bzizou.net"; github = "bzizou"; + githubId = 2647566; name = "Bruno Bzeznik"; }; c0bw3b = { email = "c0bw3b@gmail.com"; github = "c0bw3b"; + githubId = 24417923; name = "Renaud"; }; c0deaddict = { email = "josvanbakel@protonmail.com"; github = "c0deaddict"; + githubId = 510553; name = "Jos van Bakel"; }; calbrecht = { email = "christian.albrecht@mayflower.de"; github = "calbrecht"; + githubId = 1516457; name = "Christian Albrecht"; }; callahad = { email = "dan.callahan@gmail.com"; github = "callahad"; + githubId = 24193; name = "Dan Callahan"; }; calvertvl = { email = "calvertvl@gmail.com"; github = "calvertvl"; + githubId = 7435854; name = "Victor Calvert"; }; campadrenalin = { email = "campadrenalin@gmail.com"; github = "campadrenalin"; + githubId = 289492; name = "Philip Horger"; }; candeira = { email = "javier@candeira.com"; github = "candeira"; + githubId = 91694; name = "Javier Candeira"; }; canndrew = { email = "shum@canndrew.org"; github = "canndrew"; + githubId = 5555066; name = "Andrew Cann"; }; carlosdagos = { email = "m@cdagostino.io"; github = "carlosdagos"; + githubId = 686190; name = "Carlos D'Agostino"; }; carlsverre = { email = "accounts@carlsverre.com"; github = "carlsverre"; + githubId = 82591; name = "Carl Sverre"; }; cartr = { email = "carter.sande@duodecima.technology"; github = "cartr"; + githubId = 5241813; name = "Carter Sande"; }; casey = { email = "casey@rodarmor.net"; github = "casey"; + githubId = 1945; name = "Casey Rodarmor"; }; catern = { email = "sbaugh@catern.com"; github = "catern"; + githubId = 5394722; name = "Spencer Baugh"; }; caugner = { email = "nixos@caugner.de"; github = "caugner"; + githubId = 495429; name = "Claas Augner"; }; cbley = { email = "claudio.bley@gmail.com"; github = "avdv"; + githubId = 3471749; name = "Claudio Bley"; }; cdepillabout = { email = "cdep.illabout@gmail.com"; github = "cdepillabout"; + githubId = 64804; name = "Dennis Gosnell"; }; ceedubs = { email = "ceedubs@gmail.com"; github = "ceedubs"; + githubId = 977929; name = "Cody Allen"; }; cf6b88f = { email = "elmo.todurov@eesti.ee"; - github = "cf6b88f"; name = "Elmo Todurov"; }; cfouche = { email = "chaddai.fouche@gmail.com"; github = "Chaddai"; + githubId = 5771456; name = "Chaddaï Fouché"; }; chaduffy = { email = "charles@dyfis.net"; github = "charles-dyfis-net"; + githubId = 22370; name = "Charles Duffy"; }; changlinli = { email = "mail@changlinli.com"; github = "changlinli"; + githubId = 1762540; name = "Changlin Li"; }; CharlesHD = { email = "charleshdespointes@gmail.com"; github = "CharlesHD"; + githubId = 6608071; name = "Charles Huyghues-Despointes"; }; chaoflow = { email = "flo@chaoflow.net"; github = "chaoflow"; + githubId = 89596; name = "Florian Friesdorf"; }; chattered = { @@ -966,106 +1132,127 @@ ChengCat = { email = "yu@cheng.cat"; github = "ChengCat"; + githubId = 33503784; name = "Yucheng Zhang"; }; chessai = { email = "chessai1996@gmail.com"; github = "chessai"; + githubId = 18648043; name = "Daniel Cartwright"; }; chiiruno = { email = "okinan@protonmail.com"; github = "chiiruno"; + githubId = 30435868; name = "Okina Matara"; }; choochootrain = { email = "hurshal@imap.cc"; github = "choochootrain"; + githubId = 803961; name = "Hurshal Patel"; }; chpatrick = { email = "chpatrick@gmail.com"; github = "chpatrick"; + githubId = 832719; name = "Patrick Chilton"; }; chreekat = { email = "b@chreekat.net"; github = "chreekat"; + githubId = 538538; name = "Bryan Richter"; }; chris-martin = { email = "ch.martin@gmail.com"; github = "chris-martin"; + githubId = 399718; name = "Chris Martin"; }; chrisaw = { email = "home@chrisaw.com"; github = "cawilliamson"; + githubId = 1141769; name = "Christopher A. Williamson"; }; chrisjefferson = { email = "chris@bubblescope.net"; github = "chrisjefferson"; + githubId = 811527; name = "Christopher Jefferson"; }; chrisrosset = { email = "chris@rosset.org.uk"; github = "chrisrosset"; + githubId = 1103294; name = "Christopher Rosset"; }; christopherpoole = { email = "mail@christopherpoole.net"; github = "christopherpoole"; + githubId = 2245737; name = "Christopher Mark Poole"; }; ciil = { email = "simon@lackerbauer.com"; github = "ciil"; + githubId = 3956062; name = "Simon Lackerbauer"; }; ck3d = { email = "ck3d@gmx.de"; github = "ck3d"; + githubId = 25088352; name = "Christian Kögler"; }; ckampka = { email = "christian@kampka.net"; github = "kampka"; + githubId = 422412; name = "Christian Kampka"; }; ckauhaus = { email = "kc@flyingcircus.io"; github = "ckauhaus"; + githubId = 1448923; name = "Christian Kauhaus"; }; cko = { email = "christine.koppelt@gmail.com"; github = "cko"; + githubId = 68239; name = "Christine Koppelt"; }; clacke = { email = "claes.wallin@greatsinodevelopment.com"; github = "clacke"; + githubId = 199180; name = "Claes Wallin"; }; cleverca22 = { email = "cleverca22@gmail.com"; github = "cleverca22"; + githubId = 848609; name = "Michael Bishop"; }; cmcdragonkai = { email = "roger.qiu@matrix.ai"; github = "cmcdragonkai"; + githubId = 640797; name = "Roger Qiu"; }; cmfwyp = { email = "cmfwyp@riseup.net"; github = "cmfwyp"; + githubId = 20808761; name = "cmfwyp"; }; cobbal = { email = "andrew.cobb@gmail.com"; github = "cobbal"; + githubId = 180339; name = "Andrew Cobb"; }; coconnor = { @@ -1076,51 +1263,67 @@ codsl = { email = "codsl@riseup.net"; github = "codsl"; + githubId = 6402559; name = "codsl"; }; codyopel = { email = "codyopel@gmail.com"; github = "codyopel"; + githubId = 5561189; name = "Cody Opel"; }; + cohencyril = { + email = "cyril.cohen@inria.fr"; + github = "CohenCyril"; + githubId = 298705; + name = "Cyril Cohen"; + }; colemickens = { email = "cole.mickens@gmail.com"; github = "colemickens"; + githubId = 327028; name = "Cole Mickens"; }; colescott = { email = "colescottsf@gmail.com"; github = "colescott"; + githubId = 5684605; name = "Cole Scott"; }; copumpkin = { email = "pumpkingod@gmail.com"; github = "copumpkin"; + githubId = 2623; name = "Dan Peebles"; }; corngood = { email = "corngood@gmail.com"; github = "corngood"; + githubId = 3077118; name = "David McFarland"; }; coroa = { email = "jonas@chaoflow.net"; github = "coroa"; + githubId = 2552981; name = "Jonas Hörsch"; }; costrouc = { email = "chris.ostrouchov@gmail.com"; github = "costrouc"; + githubId = 1740337; name = "Chris Ostrouchov"; }; couchemar = { email = "couchemar@yandex.ru"; github = "couchemar"; + githubId = 1573344; name = "Andrey Pavlov"; }; cpages = { email = "page@ruiec.cat"; github = "cpages"; + githubId = 411324; name = "Carles Pagès"; }; cransom = { @@ -1131,36 +1334,43 @@ CrazedProgrammer = { email = "crazedprogrammer@gmail.com"; github = "CrazedProgrammer"; + githubId = 12202789; name = "CrazedProgrammer"; }; cryptix = { email = "cryptix@riseup.net"; github = "cryptix"; + githubId = 111202; name = "Henry Bubert"; }; CrystalGamma = { email = "nixos@crystalgamma.de"; github = "CrystalGamma"; + githubId = 6297001; name = "Jona Stubbe"; }; csingley = { email = "csingley@gmail.com"; github = "csingley"; + githubId = 398996; name = "Christopher Singley"; }; cstrahan = { email = "charles@cstrahan.com"; github = "cstrahan"; + githubId = 143982; name = "Charles Strahan"; }; cwoac = { email = "oliver@codersoffortune.net"; github = "cwoac"; + githubId = 1382175; name = "Oliver Matthews"; }; cypherpunk2140 = { email = "stefan.mihaila@pm.me"; github = "cypherpunk2140"; + githubId = 2217136; name = "Ștefan D. Mihăilă"; keys = [ { longkeyid = "rsa4096/6E68A39BF16A3ECB"; @@ -1174,46 +1384,55 @@ dalance = { email = "dalance@gmail.com"; github = "dalance"; + githubId = 4331004; name = "Naoya Hatta"; }; DamienCassou = { email = "damien@cassou.me"; github = "DamienCassou"; + githubId = 217543; name = "Damien Cassou"; }; danbst = { email = "abcz2.uprola@gmail.com"; github = "danbst"; + githubId = 743057; name = "Danylo Hlynskyi"; }; dancek = { email = "hannu.hartikainen@gmail.com"; github = "dancek"; + githubId = 245394; name = "Hannu Hartikainen"; }; danharaj = { email = "dan@obsidian.systems"; github = "danharaj"; + githubId = 23366017; name = "Dan Haraj"; }; danieldk = { email = "me@danieldk.eu"; github = "danieldk"; + githubId = 49398; name = "Daniël de Kok"; }; danielfullmer = { email = "danielrf12@gmail.com"; github = "danielfullmer"; + githubId = 1298344; name = "Daniel Fullmer"; }; das-g = { email = "nixpkgs@raphael.dasgupta.ch"; github = "das-g"; + githubId = 97746; name = "Raphael Das Gupta"; }; das_j = { email = "janne@hess.ooo"; github = "dasJ"; + githubId = 4971975; name = "Janne Heß"; }; dasuxullebt = { @@ -1223,11 +1442,13 @@ david50407 = { email = "me@davy.tw"; github = "david50407"; + githubId = 841969; name = "David Kuo"; }; davidak = { email = "post@davidak.de"; github = "davidak"; + githubId = 91113; name = "David Kleuker"; }; davidrusu = { @@ -1238,61 +1459,73 @@ davorb = { email = "davor@davor.se"; github = "davorb"; + githubId = 798427; name = "Davor Babic"; }; dawidsowa = { email = "dawid_sowa@posteo.net"; github = "dawidsowa"; + githubId = 49904992; name = "Dawid Sowa"; }; dbohdan = { email = "dbohdan@dbohdan.com"; github = "dbohdan"; + githubId = 3179832; name = "D. Bohdan"; }; dbrock = { email = "daniel@brockman.se"; github = "dbrock"; + githubId = 14032; name = "Daniel Brockman"; }; deepfire = { email = "_deepfire@feelingofgreen.ru"; github = "deepfire"; + githubId = 452652; name = "Kosyrev Serge"; }; delan = { name = "Delan Azabani"; email = "delan@azabani.com"; github = "delan"; + githubId = 465303; }; delroth = { email = "delroth@gmail.com"; github = "delroth"; + githubId = 202798; name = "Pierre Bourdon"; }; deltaevo = { email = "deltaduartedavid@gmail.com"; github = "DeltaEvo"; + githubId = 8864716; name = "Duarte David"; }; demin-dmitriy = { email = "demindf@gmail.com"; github = "demin-dmitriy"; + githubId = 5503422; name = "Dmitriy Demin"; }; demize = { email = "johannes@kyriasis.com"; github = "kyrias"; + githubId = 2285387; name = "Johannes Löthberg"; }; demyanrogozhin = { email = "demyan.rogozhin@gmail.com"; github = "demyanrogozhin"; + githubId = 62989; name = "Demyan Rogozhin"; }; derchris = { email = "derchris@me.com"; github = "derchrisuk"; + githubId = 706758; name = "Christian Gerbrandt"; }; DerGuteMoritz = { @@ -1303,11 +1536,13 @@ dermetfan = { email = "serverkorken@gmail.com"; github = "dermetfan"; + githubId = 4956158; name = "Robin Stumm"; }; DerTim1 = { email = "tim.digel@active-group.de"; github = "DerTim1"; + githubId = 21953890; name = "Tim Digel"; }; desiderius = { @@ -1318,21 +1553,25 @@ devhell = { email = "\"^\"@regexmail.net"; github = "devhell"; + githubId = 896182; name = "devhell"; }; dezgeg = { email = "tuomas.tynkkynen@iki.fi"; github = "dezgeg"; + githubId = 579369; name = "Tuomas Tynkkynen"; }; dfordivam = { email = "dfordivam+nixpkgs@gmail.com"; github = "dfordivam"; + githubId = 681060; name = "Divam"; }; dfoxfranke = { email = "dfoxfranke@gmail.com"; github = "dfoxfranke"; + githubId = 4708206; name = "Daniel Fox Franke"; }; dgonyeo = { @@ -1343,71 +1582,85 @@ dhkl = { email = "david@davidslab.com"; github = "dhl"; + githubId = 265220; name = "David Leung"; }; dipinhora = { email = "dipinhora+github@gmail.com"; github = "dipinhora"; + githubId = 11946442; name = "Dipin Hora"; }; disassembler = { email = "disasm@gmail.com"; github = "disassembler"; + githubId = 651205; name = "Samuel Leathers"; }; disserman = { email = "disserman@gmail.com"; github = "divi255"; + githubId = 40633781; name = "Sergei S."; }; dizfer = { email = "david@izquierdofernandez.com"; github = "dizfer"; + githubId = 8852888; name = "David Izquierdo"; }; Dje4321 = { email = "dje4321@gmail.com"; github = "dje4321"; + githubId = 10913120; name = "Dje4321"; }; dmalikov = { email = "malikov.d.y@gmail.com"; github = "dmalikov"; + githubId = 997543; name = "Dmitry Malikov"; }; DmitryTsygankov = { email = "dmitry.tsygankov@gmail.com"; github = "DmitryTsygankov"; + githubId = 425354; name = "Dmitry Tsygankov"; }; dmjio = { email = "djohnson.m@gmail.com"; github = "dmjio"; + githubId = 875324; name = "David Johnson"; }; dmvianna = { email = "dmlvianna@gmail.com"; github = "dmvianna"; + githubId = 1708810; name = "Daniel Vianna"; }; dochang = { email = "dochang@gmail.com"; github = "dochang"; + githubId = 129093; name = "Desmond O. Chang"; }; domenkozar = { email = "domen@dev.si"; github = "domenkozar"; + githubId = 126339; name = "Domen Kozar"; }; doronbehar = { email = "me@doronbehar.com"; github = "doronbehar"; + githubId = 10998835; name = "Doron Behar"; }; dotlambda = { email = "rschuetz17@gmail.com"; github = "dotlambda"; + githubId = 6806011; name = "Robert Schütz"; }; doublec = { @@ -1418,16 +1671,19 @@ dpaetzel = { email = "david.a.paetzel@gmail.com"; github = "dpaetzel"; + githubId = 974130; name = "David Pätzel"; }; dpflug = { email = "david@pflug.email"; github = "dpflug"; + githubId = 108501; name = "David Pflug"; }; drets = { email = "dmitryrets@gmail.com"; github = "drets"; + githubId = 6199462; name = "Dmytro Rets"; }; drewkett = { @@ -1437,11 +1693,13 @@ dsferruzza = { email = "david.sferruzza@gmail.com"; github = "dsferruzza"; + githubId = 1931963; name = "David Sferruzza"; }; dtzWill = { email = "w@wdtz.org"; github = "dtzWill"; + githubId = 817330; name = "Will Dietz"; keys = [{ longkeyid = "rsa4096/0xFD42C7D0D41494C8"; @@ -1456,46 +1714,61 @@ dysinger = { email = "tim@dysinger.net"; github = "dysinger"; + githubId = 447; name = "Tim Dysinger"; }; dywedir = { email = "dywedir@gra.red"; github = "dywedir"; + githubId = 399312; name = "Vladyslav M."; }; dzabraev = { email = "dzabraew@gmail.com"; github = "dzabraev"; + githubId = 15128988; name = "Maksim Dzabraev"; }; e-user = { email = "nixos@sodosopa.io"; github = "e-user"; + githubId = 93086; name = "Alexander Kahl"; }; eadwu = { email = "edmund.wu@protonmail.com"; github = "eadwu"; + githubId = 22758444; name = "Edmund Wu"; }; + ealasu = { + email = "emanuel.alasu@gmail.com"; + github = "ealasu"; + githubId = 1362096; + name = "Emanuel Alasu"; + }; eamsden = { email = "edward@blackriversoft.com"; github = "eamsden"; + githubId = 54573; name = "Edward Amsden"; }; earldouglas = { email = "james@earldouglas.com"; github = "earldouglas"; + githubId = 424946; name = "James Earl Douglas"; }; earvstedt = { email = "erik.arvstedt@gmail.com"; github = "erikarvstedt"; + githubId = 36110478; name = "Erik Arvstedt"; }; ebzzry = { email = "ebzzry@ebzzry.io"; github = "ebzzry"; + githubId = 7875; name = "Rommel Martinez"; }; edanaher = { @@ -1506,41 +1779,55 @@ edef = { email = "edef@edef.eu"; github = "edef1c"; + githubId = 50854; name = "edef"; }; embr = { email = "hi@liclac.eu"; github = "liclac"; + githubId = 428026; name = "embr"; }; + emily = { + email = "nixpkgs@emily.moe"; + github = "emilazy"; + githubId = 18535642; + name = "Emily"; + }; ederoyd46 = { email = "matt@ederoyd.co.uk"; github = "ederoyd46"; + githubId = 119483; name = "Matthew Brown"; }; eduarrrd = { email = "e.bachmakov@gmail.com"; github = "eduarrrd"; + githubId = 1181393; name = "Eduard Bachmakov"; }; edude03 = { email = "michael@melenion.com"; github = "edude03"; + githubId = 494483; name = "Michael Francis"; }; edwtjo = { email = "ed@cflags.cc"; github = "edwtjo"; + githubId = 54799; name = "Edward Tjörnhammar"; }; eelco = { email = "eelco.dolstra@logicblox.com"; github = "edolstra"; + githubId = 1148549; name = "Eelco Dolstra"; }; ehegnes = { email = "eric.hegnes@gmail.com"; github = "ehegnes"; + githubId = 884970; name = "Eric Hegnes"; }; ehmry = { @@ -1550,56 +1837,67 @@ eikek = { email = "eike.kettner@posteo.de"; github = "eikek"; + githubId = 701128; name = "Eike Kettner"; }; ekleog = { email = "leo@gaspard.io"; github = "ekleog"; + githubId = 411447; name = "Leo Gaspard"; }; elasticdog = { email = "aaron@elasticdog.com"; github = "elasticdog"; + githubId = 4742; name = "Aaron Bull Schaefer"; }; eleanor = { email = "dejan@proteansec.com"; github = "proteansec"; + githubId = 1753498; name = "Dejan Lukan"; }; eliasp = { email = "mail@eliasprobst.eu"; github = "eliasp"; + githubId = 48491; name = "Elias Probst"; }; elijahcaine = { email = "elijahcainemv@gmail.com"; github = "pop"; + githubId = 1897147; name = "Elijah Caine"; }; elitak = { email = "elitak@gmail.com"; github = "elitak"; + githubId = 769073; name = "Eric Litak"; }; ellis = { email = "nixos@ellisw.net"; github = "ellis"; + githubId = 97852; name = "Ellis Whitehead"; }; elohmeier = { email = "elo-nixos@nerdworks.de"; github = "elohmeier"; + githubId = 2536303; name = "Enno Lohmeier"; }; elseym = { email = "elseym@me.com"; github = "elseym"; + githubId = 907478; name = "Simon Waibl"; }; elvishjerricco = { email = "elvishjerricco@gmail.com"; github = "ElvishJerricco"; + githubId = 1365692; name = "Will Fancher"; }; emmanuelrosa = { @@ -1610,21 +1908,25 @@ endgame = { email = "jack@jackkelly.name"; github = "endgame"; + githubId = 231483; name = "Jack Kelly"; }; enorris = { name = "Eric Norris"; email = "erictnorris@gmail.com"; github = "ericnorris"; + githubId = 1906605; }; enzime = { email = "enzime@users.noreply.github.com"; github = "enzime"; + githubId = 10492681; name = "Michael Hoang"; }; eperuffo = { email = "info@emanueleperuffo.com"; github = "emanueleperuffo"; + githubId = 5085029; name = "Emanuele Peruffo"; }; epitrochoid = { @@ -1634,16 +1936,19 @@ eqyiel = { email = "ruben@maher.fyi"; github = "eqyiel"; + githubId = 3422442; name = "Ruben Maher"; }; eraserhd = { email = "jason.m.felice@gmail.com"; github = "eraserhd"; + githubId = 147284; name = "Jason Felice"; }; ericbmerritt = { email = "eric@afiniate.com"; github = "ericbmerritt"; + githubId = 4828; name = "Eric Merritt"; }; ericsagnes = { @@ -1654,11 +1959,13 @@ ericson2314 = { email = "John.Ericson@Obsidian.Systems"; github = "ericson2314"; + githubId = 1055245; name = "John Ericson"; }; erictapen = { email = "justin.humm@posteo.de"; github = "erictapen"; + githubId = 11532355; name = "Justin Humm"; keys = [{ longkeyid = "rsa4096/0x438871E000AA178E"; @@ -1668,11 +1975,13 @@ erikryb = { email = "erik.rybakken@math.ntnu.no"; github = "erikryb"; + githubId = 3787281; name = "Erik Rybakken"; }; erosennin = { email = "ag@sologoc.com"; github = "erosennin"; + githubId = 1583484; name = "Andrey Golovizin"; }; ertes = { @@ -1687,65 +1996,83 @@ ethercrow = { email = "ethercrow@gmail.com"; github = "ethercrow"; + githubId = 222467; name = "Dmitry Ivanov"; }; etu = { email = "elis@hirwing.se"; github = "etu"; + githubId = 461970; name = "Elis Hirwing"; keys = [{ longkeyid = "rsa4096/0xD57EFA625C9A925F"; fingerprint = "67FE 98F2 8C44 CF22 1828 E12F D57E FA62 5C9A 925F"; }]; }; + evanjs = { + email = "evanjsx@gmail.com"; + github = "evanjs"; + githubId = 1847524; + name = "Evan Stoll"; + }; evck = { email = "eric@evenchick.com"; github = "ericevenchick"; + githubId = 195032; name = "Eric Evenchick"; }; exfalso = { email = "0slemi0@gmail.com"; github = "exfalso"; + githubId = 1042674; name = "Andras Slemmer"; }; exi = { email = "nixos@reckling.org"; github = "exi"; + githubId = 449463; name = "Reno Reckling"; }; exlevan = { email = "exlevan@gmail.com"; github = "exlevan"; + githubId = 873530; name = "Alexey Levan"; }; expipiplus1 = { email = "nix@monoid.al"; github = "expipiplus1"; + githubId = 857308; name = "Joe Hermaszewski"; }; eyjhb = { email = "eyjhbb@gmail.com"; github = "eyJhb"; + githubId = 25955146; name = "eyJhb"; }; f--t = { email = "git@f-t.me"; github = "f--t"; + githubId = 2817965; name = "f--t"; }; f-breidenstein = { email = "mail@felixbreidenstein.de"; - github = "f-breidenstein"; + github = "fleaz"; + githubId = 2489598; name = "Felix Breidenstein"; }; fadenb = { email = "tristan.helmich+nixos@gmail.com"; github = "fadenb"; + githubId = 878822; name = "Tristan Helmich"; }; falsifian = { email = "james.cook@utoronto.ca"; github = "falsifian"; + githubId = 225893; name = "James Cook"; }; fare = { @@ -1753,6 +2080,12 @@ github = "fare"; name = "Francois-Rene Rideau"; }; + farlion = { + email = "florian.peter@gmx.at"; + github = "workflow"; + githubId = 1276854; + name = "Florian Peter"; + }; fdns = { email = "fdns02@gmail.com"; github = "fdns"; @@ -1761,66 +2094,79 @@ ffinkdevs = { email = "fink@h0st.space"; github = "ffinkdevs"; + githubId = 45924649; name = "Fabian Fink"; }; fgaz = { email = "fgaz@fgaz.me"; github = "fgaz"; + githubId = 8182846; name = "Francesco Gazzetta"; }; FireyFly = { email = "nix@firefly.nu"; github = "FireyFly"; + githubId = 415760; name = "Jonas Höglund"; }; flexw = { email = "felix.weilbach@t-online.de"; github = "FlexW"; + githubId = 19961516; name = "Felix Weilbach"; }; flokli = { email = "flokli@flokli.de"; github = "flokli"; + githubId = 183879; name = "Florian Klink"; }; FlorianFranzen = { email = "Florian.Franzen@gmail.com"; github = "FlorianFranzen"; + githubId = 781077; name = "Florian Franzen"; }; florianjacob = { email = "projects+nixos@florianjacob.de"; github = "florianjacob"; + githubId = 1109959; name = "Florian Jacob"; }; flosse = { email = "mail@markus-kohlhase.de"; github = "flosse"; + githubId = 276043; name = "Markus Kohlhase"; }; fluffynukeit = { email = "dan@fluffynukeit.com"; github = "fluffynukeit"; + githubId = 844574; name = "Daniel Austin"; }; fmthoma = { email = "f.m.thoma@googlemail.com"; github = "fmthoma"; + githubId = 5918766; name = "Franz Thoma"; }; forkk = { email = "forkk@forkk.net"; github = "forkk"; + githubId = 1300078; name = "Andrew Okin"; }; fornever = { email = "friedrich@fornever.me"; github = "fornever"; + githubId = 92793; name = "Friedrich von Never"; }; fpletz = { email = "fpletz@fnordicwalking.de"; github = "fpletz"; + githubId = 114159; name = "Franz Pletz"; keys = [{ longkeyid = "rsa4096/0x846FDED7792617B4"; @@ -1830,6 +2176,7 @@ fps = { email = "mista.tapas@gmx.net"; github = "fps"; + githubId = 84968; name = "Florian Paul Schmidt"; }; @@ -1842,11 +2189,13 @@ fredeb = { email = "im@fredeb.dev"; github = "fredeeb"; + githubId = 7551358; name = "Frede Emil"; }; freepotion = { email = "free.potion@yandex.ru"; github = "freepotion"; + githubId = 42352817; name = "Free Potion"; }; freezeboy = { @@ -1862,31 +2211,37 @@ fridh = { email = "fridh@fridh.nl"; github = "fridh"; + githubId = 2129135; name = "Frederik Rietdijk"; }; frlan = { email = "frank@frank.uvena.de"; github = "frlan"; + githubId = 1010248; name = "Frank Lanitz"; }; fro_ozen = { email = "fro_ozen@gmx.de"; github = "froozen"; + githubId = 1943632; name = "fro_ozen"; }; frontsideair = { email = "photonia@gmail.com"; github = "frontsideair"; + githubId = 868283; name = "Fatih Altinok"; }; ftrvxmtrx = { email = "ftrvxmtrx@gmail.com"; github = "ftrvxmtrx"; + githubId = 248148; name = "Siarhei Zirukin"; }; fuerbringer = { email = "severin@fuerbringer.info"; github = "fuerbringer"; + githubId = 10528737; name = "Severin Fürbringer"; }; funfunctor = { @@ -1896,16 +2251,19 @@ fusion809 = { email = "brentonhorne77@gmail.com"; github = "fusion809"; + githubId = 4717341; name = "Brenton Horne"; }; fuuzetsu = { email = "fuuzetsu@fuuzetsu.co.uk"; github = "fuuzetsu"; + githubId = 893115; name = "Mateusz Kowalczyk"; }; fuwa = { email = "echowss@gmail.com"; github = "fuwa0529"; + githubId = 40521440; name = "Haruka Akiyama"; }; fuzzy-id = { @@ -1915,16 +2273,19 @@ fxfactorial = { email = "edgar.factorial@gmail.com"; github = "fxfactorial"; + githubId = 3036816; name = "Edgar Aroutiounian"; }; gabesoft = { email = "gabesoft@gmail.com"; github = "gabesoft"; + githubId = 606000; name = "Gabriel Adomnicai"; }; gal_bolle = { email = "florent.becker@ens-lyon.org"; github = "FlorentBecker"; + githubId = 7047019; name = "Florent Becker"; }; garbas = { @@ -1935,6 +2296,7 @@ garrison = { email = "jim@garrison.cc"; github = "garrison"; + githubId = 91987; name = "Jim Garrison"; }; gavin = { @@ -1945,91 +2307,109 @@ gebner = { email = "gebner@gebner.org"; github = "gebner"; + githubId = 313929; name = "Gabriel Ebner"; }; geistesk = { email = "post@0x21.biz"; github = "geistesk"; + githubId = 8402811; name = "Alvar Penning"; }; genesis = { email = "ronan@aimao.org"; github = "bignaux"; + githubId = 149484; name = "Ronan Bignaux"; }; georgewhewell = { email = "georgerw@gmail.com"; github = "georgewhewell"; + githubId = 1176131; name = "George Whewell"; }; gerschtli = { email = "tobias.happ@gmx.de"; github = "Gerschtli"; + githubId = 10353047; name = "Tobias Happ"; }; ggpeti = { email = "ggpeti@gmail.com"; github = "ggpeti"; + githubId = 3217744; name = "Peter Ferenczy"; }; gilligan = { email = "tobias.pflug@gmail.com"; github = "gilligan"; + githubId = 27668; name = "Tobias Pflug"; }; giogadi = { email = "lgtorres42@gmail.com"; github = "giogadi"; + githubId = 1713676; name = "Luis G. Torres"; }; gleber = { email = "gleber.p@gmail.com"; github = "gleber"; + githubId = 33185; name = "Gleb Peregud"; }; glenns = { email = "glenn.searby@gmail.com"; github = "glenns"; + githubId = 615606; name = "Glenn Searby"; }; gloaming = { email = "ch9871@gmail.com"; github = "gloaming"; + githubId = 10156748; name = "Craig Hall"; }; globin = { email = "mail@glob.in"; github = "globin"; + githubId = 1447245; name = "Robin Gloster"; }; gnidorah = { email = "gnidorah@yandex.com"; github = "gnidorah"; + githubId = 12064730; name = "Alex Ivanov"; }; goibhniu = { email = "cillian.deroiste@gmail.com"; github = "cillianderoiste"; + githubId = 643494; name = "Cillian de Róiste"; }; Gonzih = { email = "gonzih@gmail.com"; github = "Gonzih"; + githubId = 266275; name = "Max Gonzih"; }; goodrone = { email = "goodrone@gmail.com"; github = "goodrone"; + githubId = 1621335; name = "Andrew Trachenko"; }; gpyh = { email = "yacine.hmito@gmail.com"; github = "yacinehmito"; + githubId = 6893840; name = "Yacine Hmito"; }; grahamc = { email = "graham@grahamc.com"; github = "grahamc"; + githubId = 76716; name = "Graham Christensen"; }; grburst = { @@ -2040,6 +2420,7 @@ greydot = { email = "lanablack@amok.cc"; github = "greydot"; + githubId = 7385287; name = "Lana Black"; }; gridaphobe = { @@ -2050,106 +2431,127 @@ guibert = { email = "david.guibert@gmail.com"; github = "dguibert"; + githubId = 1178864; name = "David Guibert"; }; groodt = { email = "groodt@gmail.com"; github = "groodt"; + githubId = 343415; name = "Greg Roodt"; }; guibou = { email = "guillaum.bouchard@gmail.com"; github = "guibou"; + githubId = 9705357; name = "Guillaume Bouchard"; }; guillaumekoenig = { email = "guillaume.edward.koenig@gmail.com"; github = "guillaumekoenig"; + githubId = 10654650; name = "Guillaume Koenig"; }; guyonvarch = { email = "joris@guyonvarch.me"; github = "guyonvarch"; + githubId = 6768842; name = "Joris Guyonvarch"; }; hakuch = { email = "hakuch@gmail.com"; github = "hakuch"; + githubId = 1498782; name = "Jesse Haber-Kucharsky"; }; hamhut1066 = { email = "github@hamhut1066.com"; - github = "hamhut1066"; + github = "moredhel"; + githubId = 1742172; name = "Hamish Hutchings"; }; hansjoergschurr = { email = "commits@schurr.at"; github = "hansjoergschurr"; + githubId = 9850776; name = "Hans-Jörg Schurr"; }; HaoZeke = { email = "r95g10@gmail.com"; github = "haozeke"; + githubId = 4336207; name = "Rohit Goswami"; }; haslersn = { email = "haslersn@fius.informatik.uni-stuttgart.de"; github = "haslersn"; + githubId = 33969028; name = "Sebastian Hasler"; }; havvy = { email = "ryan.havvy@gmail.com"; github = "havvy"; + githubId = 731722; name = "Ryan Scheel"; }; hax404 = { email = "hax404foogit@hax404.de"; github = "hax404"; + githubId = 1379411; name = "Georg Haas"; }; hbunke = { email = "bunke.hendrik@gmail.com"; github = "hbunke"; + githubId = 1768793; name = "Hendrik Bunke"; }; hce = { email = "hc@hcesperer.org"; github = "hce"; + githubId = 147689; name = "Hans-Christian Esperer"; }; hectorj = { email = "hector.jusforgues+nixos@gmail.com"; github = "hectorj"; + githubId = 2427959; name = "Hector Jusforgues"; }; hedning = { email = "torhedinbronner@gmail.com"; github = "hedning"; + githubId = 71978; name = "Tor Hedin Brønner"; }; heel = { email = "parizhskiy@gmail.com"; github = "heel"; + githubId = 287769; name = "Sergii Paryzhskyi"; }; helkafen = { email = "arnaudpourseb@gmail.com"; github = "Helkafen"; + githubId = 2405974; name = "Sébastian Méric de Bellefon"; }; henrytill = { email = "henrytill@gmail.com"; github = "henrytill"; + githubId = 6430643; name = "Henry Till"; }; herberteuler = { email = "herberteuler@gmail.com"; github = "herberteuler"; + githubId = 1401179; name = "Guanpeng Xu"; }; hhm = { email = "heehooman+nixpkgs@gmail.com"; github = "hhm0"; + githubId = 3656888; name = "hhm"; }; hinton = { @@ -2159,101 +2561,121 @@ hlolli = { email = "hlolli@gmail.com"; github = "hlolli"; + githubId = 6074754; name = "Hlodver Sigurdsson"; }; hugoreeves = { email = "hugolreeves@gmail.com"; github = "hugoreeves"; + githubId = 20039091; name = "Hugo Reeves"; }; hodapp = { email = "hodapp87@gmail.com"; github = "Hodapp87"; + githubId = 896431; name = "Chris Hodapp"; }; hrdinka = { email = "c.nix@hrdinka.at"; github = "hrdinka"; + githubId = 1436960; name = "Christoph Hrdinka"; }; hschaeidt = { email = "he.schaeidt@gmail.com"; github = "hschaeidt"; + githubId = 1614615; name = "Hendrik Schaeidt"; }; htr = { email = "hugo@linux.com"; github = "htr"; + githubId = 39689; name = "Hugo Tavares Reis"; }; hyphon81 = { email = "zero812n@gmail.com"; github = "hyphon81"; + githubId = 12491746; name = "Masato Yonekawa"; }; iand675 = { email = "ian@iankduncan.com"; github = "iand675"; + githubId = 69209; name = "Ian Duncan"; }; ianwookim = { email = "ianwookim@gmail.com"; github = "wavewave"; + githubId = 1031119; name = "Ian-Woo Kim"; }; iblech = { email = "iblech@speicherleck.de"; github = "iblech"; + githubId = 3661115; name = "Ingo Blechschmidt"; }; idontgetoutmuch = { email = "dominic@steinitz.org"; github = "idontgetoutmuch"; + githubId = 1550265; name = "Dominic Steinitz"; }; igsha = { email = "igor.sharonov@gmail.com"; github = "igsha"; + githubId = 5345170; name = "Igor Sharonov"; }; iimog = { email = "iimog@iimog.org"; github = "iimog"; + githubId = 7403236; name = "Markus J. Ankenbrand"; }; ikervagyok = { email = "ikervagyok@gmail.com"; github = "ikervagyok"; + githubId = 7481521; name = "Balázs Lengyel"; }; ilikeavocadoes = { email = "ilikeavocadoes@hush.com"; github = "ilikeavocadoes"; + githubId = 36193715; name = "Lassi Haasio"; }; illegalprime = { email = "themichaeleden@gmail.com"; github = "illegalprime"; + githubId = 4401220; name = "Michael Eden"; }; ilya-kolpakov = { email = "ilya.kolpakov@gmail.com"; github = "ilya-kolpakov"; + githubId = 592849; name = "Ilya Kolpakov"; }; imalison = { email = "IvanMalison@gmail.com"; github = "IvanMalison"; + githubId = 1246619; name = "Ivan Malison"; }; imalsogreg = { email = "imalsogreg@gmail.com"; github = "imalsogreg"; + githubId = 993484; name = "Greg Hale"; }; imuli = { email = "i@imu.li"; github = "imuli"; + githubId = 4085046; name = "Imuli"; }; infinisil = { @@ -2264,16 +2686,19 @@ ingenieroariel = { email = "ariel@nunez.co"; github = "ingenieroariel"; + githubId = 54999; name = "Ariel Nunez"; }; ironpinguin = { email = "michele@catalano.de"; github = "ironpinguin"; + githubId = 137306; name = "Michele Catalano"; }; ivan = { email = "ivan@ludios.org"; github = "ivan"; + githubId = 4458; name = "Ivan Kozik"; }; ivan-tkatchev = { @@ -2283,6 +2708,7 @@ ivanbrennan = { email = "ivan.brennan@gmail.com"; github = "ivanbrennan"; + githubId = 1672874; name = "Ivan Brennan"; keys = [{ longkeyid = "rsa4096/0x79C3C47DC652EA54"; @@ -2292,6 +2718,7 @@ ivegotasthma = { email = "ivegotasthma@protonmail.com"; github = "ivegotasthma"; + githubId = 2437675; name = "John Doe"; keys = [{ longkeyid = "rsa4096/09AC52AEA87817A4"; @@ -2301,21 +2728,25 @@ ixmatus = { email = "parnell@digitalmentat.com"; github = "ixmatus"; + githubId = 30714; name = "Parnell Springmeyer"; }; ixxie = { email = "matan@fluxcraft.net"; github = "ixxie"; + githubId = 20320695; name = "Matan Bendix Shenhav"; }; izorkin = { email = "Izorkin@gmail.com"; github = "izorkin"; + githubId = 26877687; name = "Yurii Izorkin"; }; j-keck = { email = "jhyphenkeck@gmail.com"; github = "j-keck"; + githubId = 3081095; name = "Jürgen Keck"; }; j03 = { @@ -2326,51 +2757,61 @@ jagajaga = { email = "ars.seroka@gmail.com"; github = "jagajaga"; + githubId = 2179419; name = "Arseniy Seroka"; }; jakelogemann = { email = "jake.logemann@gmail.com"; github = "jakelogemann"; + githubId = 820715; name = "Jake Logemann"; }; jakewaksbaum = { email = "jake.waksbaum@gmail.com"; github = "jbaum98"; + githubId = 5283991; name = "Jake Waksbaum"; }; jammerful = { email = "jammerful@gmail.com"; github = "jammerful"; + githubId = 20176306; name = "jammerful"; }; jansol = { email = "jan.solanti@paivola.fi"; github = "jansol"; + githubId = 2588851; name = "Jan Solanti"; }; javaguirre = { email = "contacto@javaguirre.net"; github = "javaguirre"; + githubId = 488556; name = "Javier Aguirre"; }; jb55 = { email = "jb55@jb55.com"; github = "jb55"; + githubId = 45598; name = "William Casarin"; }; jbedo = { email = "cu@cua0.org"; github = "jbedo"; + githubId = 372912; name = "Justin Bedő"; }; jbgi = { email = "jb@giraudeau.info"; github = "jbgi"; + githubId = 221929; name = "Jean-Baptiste Giraudeau"; }; jchw = { email = "johnwchadwick@gmail.com"; github = "jchv"; + githubId = 938744; name = "John Chadwick"; }; jcumming = { @@ -2380,31 +2821,37 @@ jD91mZM2 = { email = "me@krake.one"; github = "jD91mZM2"; + githubId = 12830969; name = "jD91mZM2"; }; jdagilliland = { email = "jdagilliland@gmail.com"; github = "jdagilliland"; + githubId = 1383440; name = "Jason Gilliland"; }; jdehaas = { email = "qqlq@nullptr.club"; github = "jeroendehaas"; + githubId = 117874; name = "Jeroen de Haas"; }; jefdaj = { email = "jefdaj@gmail.com"; github = "jefdaj"; + githubId = 1198065; name = "Jeffrey David Johnson"; }; jensbin = { email = "jensbin+git@pm.me"; github = "jensbin"; + githubId = 1608697; name = "Jens Binkert"; }; jerith666 = { email = "github@matt.mchenryfamily.org"; github = "jerith666"; + githubId = 854319; name = "Matt McHenry"; }; jeschli = { @@ -2415,6 +2862,7 @@ jethro = { email = "jethrokuan95@gmail.com"; github = "jethrokuan"; + githubId = 1667473; name = "Jethro Kuan"; }; jfb = { @@ -2425,71 +2873,85 @@ jflanglois = { email = "yourstruly@julienlanglois.me"; github = "jflanglois"; + githubId = 18501; name = "Julien Langlois"; }; jfrankenau = { email = "johannes@frankenau.net"; github = "jfrankenau"; + githubId = 2736480; name = "Johannes Frankenau"; }; jgeerds = { email = "jascha@geerds.org"; github = "jgeerds"; + githubId = 1473909; name = "Jascha Geerds"; }; jgertm = { email = "jger.tm@gmail.com"; github = "jgertm"; + githubId = 6616642; name = "Tim Jaeger"; }; jgillich = { email = "jakob@gillich.me"; github = "jgillich"; + githubId = 347965; name = "Jakob Gillich"; }; jglukasik = { email = "joseph@jgl.me"; github = "jglukasik"; + githubId = 6445082; name = "Joseph Lukasik"; }; jhhuh = { email = "jhhuh.note@gmail.com"; github = "jhhuh"; + githubId = 5843245; name = "Ji-Haeng Huh"; }; jhillyerd = { email = "james+nixos@hillyerd.com"; github = "jhillyerd"; + githubId = 2502736; name = "James Hillyerd"; }; jirkamarsik = { email = "jiri.marsik89@gmail.com"; github = "jirkamarsik"; + githubId = 184898; name = "Jirka Marsik"; }; jlesquembre = { email = "jl@lafuente.me"; github = "jlesquembre"; + githubId = 1058504; name = "José Luis Lafuente"; }; jluttine = { email = "jaakko.luttinen@iki.fi"; github = "jluttine"; + githubId = 2195834; name = "Jaakko Luttinen"; }; jmagnusj = { email = "jmagnusj@gmail.com"; github = "magnusjonsson"; + githubId = 8900; name = "Johan Magnus Jonsson"; }; jmettes = { email = "jonathan@jmettes.com"; github = "jmettes"; + githubId = 587870; name = "Jonathan Mettes"; }; joachifm = { email = "joachifm@fastmail.fm"; github = "joachifm"; + githubId = 41977; name = "Joachim Fasting"; }; joamaki = { @@ -2500,11 +2962,13 @@ joelburget = { email = "joelburget@gmail.com"; github = "joelburget"; + githubId = 310981; name = "Joel Burget"; }; joelmo = { email = "joel.moberg@gmail.com"; github = "joelmo"; + githubId = 336631; name = "Joel Moberg"; }; joelteon = { @@ -2516,39 +2980,51 @@ name = "Sven Slootweg"; github = "joepie91"; }; + joesalisbury = { + email = "salisbury.joseph@gmail.com"; + github = "JosephSalisbury"; + name = "Joe Salisbury"; + }; johanot = { email = "write@ownrisk.dk"; github = "johanot"; + githubId = 998763; name = "Johan Thomsen"; }; johbo = { email = "johannes@bornhold.name"; github = "johbo"; + githubId = 117805; name = "Johannes Bornhold"; }; johnazoidberg = { email = "git@danielschaefer.me"; github = "johnazoidberg"; + githubId = 5307138; name = "Daniel Schäfer"; }; johnchildren = { email = "john.a.children@gmail.com"; github = "johnchildren"; + githubId = 32305209; name = "John Children"; }; johnmh = { email = "johnmh@openblox.org"; github = "johnmh"; + githubId = 2576152; name = "John M. Harris, Jr."; }; johnramsden = { email = "johnramsden@riseup.net"; github = "johnramsden"; + githubId = 8735102; name = "John Ramsden"; }; joko = { email = "ioannis.koutras@gmail.com"; github = "jokogr"; + githubId = 1252547; keys = [{ # compare with https://keybase.io/joko longkeyid = "rsa2048/0x85EAE7D9DF56C5CA"; @@ -2559,71 +3035,85 @@ jonafato = { email = "jon@jonafato.com"; github = "jonafato"; + githubId = 392720; name = "Jon Banafato"; }; jonathanreeve = { email = "jon.reeve@gmail.com"; github = "JonathanReeve"; + githubId = 1843676; name = "Jonathan Reeve"; }; joncojonathan = { email = "joncojonathan@gmail.com"; github = "joncojonathan"; + githubId = 11414454; name = "Jonathan Haddock"; }; jonringer = { email = "jonringer117@gmail.com"; github = "jonringer"; + githubId = 7673602; name = "Jonathan Ringer"; }; jorise = { email = "info@jorisengbers.nl"; github = "JorisE"; + githubId = 1767283; name = "Joris Engbers"; }; jorsn = { name = "Johannes Rosenberger"; email = "johannes@jorsn.eu"; github = "jorsn"; + githubId = 4646725; }; jpdoyle = { email = "joethedoyle@gmail.com"; github = "jpdoyle"; + githubId = 1918771; name = "Joe Doyle"; }; jpierre03 = { email = "nix@prunetwork.fr"; github = "jpierre03"; + githubId = 954536; name = "Jean-Pierre PRUNARET"; }; jpotier = { email = "jpo.contributes.to.nixos@marvid.fr"; github = "jpotier"; + githubId = 752510; name = "Martin Potier"; }; jqueiroz = { email = "nixos@johnjq.com"; github = "jqueiroz"; + githubId = 4968215; name = "Jonathan Queiroz"; }; jraygauthier = { email = "jraygauthier@gmail.com"; github = "jraygauthier"; + githubId = 4611077; name = "Raymond Gauthier"; }; jtobin = { email = "jared@jtobin.io"; github = "jtobin"; + githubId = 1414434; name = "Jared Tobin"; }; jtojnar = { email = "jtojnar@gmail.com"; github = "jtojnar"; + githubId = 705123; name = "Jan Tojnar"; }; juaningan = { email = "juaningan@gmail.com"; github = "juaningan"; + githubId = 810075; name = "Juan Rodal"; }; juliendehos = { @@ -2634,11 +3124,13 @@ justinwoo = { email = "moomoowoo@gmail.com"; github = "justinwoo"; + githubId = 2396926; name = "Justin Woo"; }; jwiegley = { email = "johnw@newartisans.com"; github = "jwiegley"; + githubId = 8460; name = "John Wiegley"; }; jwilberding = { @@ -2653,21 +3145,25 @@ jzellner = { email = "jeffz@eml.cc"; github = "sofuture"; + githubId = 66669; name = "Jeff Zellner"; }; kaiha = { email = "kai.harries@gmail.com"; github = "kaiha"; + githubId = 6544084; name = "Kai Harries"; }; kalbasit = { email = "wael.nasreddine@gmail.com"; github = "kalbasit"; + githubId = 87115; name = "Wael Nasreddine"; }; kamilchm = { email = "kamil.chm@gmail.com"; github = "kamilchm"; + githubId = 1621930; name = "Kamil Chmielewski"; }; kampfschlaefer = { @@ -2682,66 +3178,84 @@ kazcw = { email = "kaz@lambdaverse.org"; github = "kazcw"; + githubId = 1047859; name = "Kaz Wesley"; }; kentjames = { email = "jameschristopherkent@gmail.com"; github = "kentjames"; + githubId = 2029444; name = "James Kent"; }; kevincox = { email = "kevincox@kevincox.ca"; github = "kevincox"; + githubId = 494012; name = "Kevin Cox"; }; khumba = { email = "bog@khumba.net"; github = "khumba"; + githubId = 788813; name = "Bryan Gardiner"; }; KibaFox = { email = "kiba.fox@foxypossibilities.com"; github = "KibaFox"; + githubId = 16481032; name = "Kiba Fox"; }; kierdavis = { email = "kierdavis@gmail.com"; github = "kierdavis"; + githubId = 845652; name = "Kier Davis"; }; killercup = { email = "killercup@gmail.com"; github = "killercup"; + githubId = 20063; name = "Pascal Hertleif"; }; kiloreux = { email = "kiloreux@gmail.com"; github = "kiloreux"; + githubId = 6282557; name = "Kiloreux Emperex"; }; + kim0 = { + email = "email.ahmedkamal@googlemail.com"; + github = "kim0"; + name = "Ahmed Kamal"; + }; kimburgess = { email = "kim@acaprojects.com"; github = "kimburgess"; + githubId = 843652; name = "Kim Burgess"; }; kini = { email = "keshav.kini@gmail.com"; github = "kini"; + githubId = 691290; name = "Keshav Kini"; }; kirelagin = { email = "kirelagin@gmail.com"; github = "kirelagin"; + githubId = 451835; name = "Kirill Elagin"; }; kisonecat = { email = "kisonecat@gmail.com"; github = "kisonecat"; + githubId = 148352; name = "Jim Fowler"; }; kiwi = { email = "envy1988@gmail.com"; github = "Kiwi"; + githubId = 35715; name = "Robert Djubek"; keys = [{ longkeyid = "rsa4096/0x156C88A5B0A04B2A"; @@ -2751,6 +3265,7 @@ kjuvi = { email = "quentin.vaucher@pm.me"; github = "kjuvi"; + githubId = 17534323; name = "Quentin Vaucher"; }; kkallio = { @@ -2761,37 +3276,44 @@ email = "klntsky@gmail.com"; name = "Vladimir Kalnitsky"; github = "klntsky"; + githubId = 18447310; }; kmeakin = { email = "karlwfmeakin@gmail.com"; name = "Karl Meakin"; github = "Kmeakin"; + githubId = 19665139; }; kmein = { email = "kieran.meinhardt@gmail.com"; name = "Kierán Meinhardt"; github = "kmein"; + githubId = 10352507; }; knedlsepp = { email = "josef.kemetmueller@gmail.com"; github = "knedlsepp"; + githubId = 3287933; name = "Josef Kemetmüller"; }; knl = { email = "nikola@knezevic.co"; github = "knl"; + githubId = 361496; name = "Nikola Knežević"; }; kolaente = { email = "k@knt.li"; github = "kolaente"; + githubId = 13721712; name = "Konrad Langenberg"; }; konimex = { email = "herdiansyah@netc.eu"; github = "konimex"; + githubId = 15692230; name = "Muhammad Herdiansyah"; }; koral = { @@ -2802,61 +3324,73 @@ kovirobi = { email = "kovirobi@gmail.com"; github = "kovirobi"; + githubId = 1903418; name = "Kovacsics Robert"; }; kquick = { email = "quick@sparq.org"; github = "kquick"; + githubId = 787421; name = "Kevin Quick"; }; kragniz = { email = "louis@kragniz.eu"; github = "kragniz"; + githubId = 735008; name = "Louis Taylor"; }; krav = { email = "kristoffer@microdisko.no"; github = "krav"; + githubId = 4032; name = "Kristoffer Thømt Ravneberg"; }; kroell = { email = "nixosmainter@makroell.de"; github = "rokk4"; + githubId = 17659803; name = "Matthias Axel Kröll"; }; kristoff3r = { email = "k.soeholm@gmail.com"; github = "kristoff3r"; + githubId = 160317; name = "Kristoffer Søholm"; }; ktf = { email = "giulio.eulisse@cern.ch"; github = "ktf"; + githubId = 10544; name = "Giuluo Eulisse"; }; ktosiek = { email = "tomasz.kontusz@gmail.com"; github = "ktosiek"; + githubId = 278013; name = "Tomasz Kontusz"; }; kuznero = { email = "roman@kuznero.com"; github = "kuznero"; + githubId = 449813; name = "Roman Kuznetsov"; }; kylewlacy = { email = "kylelacy+nix@pm.me"; github = "kylewlacy"; + githubId = 1362179; name = "Kyle Lacy"; }; lasandell = { email = "lasandell@gmail.com"; github = "lasandell"; + githubId = 2034420; name = "Luke Sandell"; }; lambda-11235 = { email = "taranlynn0@gmail.com"; github = "lambda-11235"; + githubId = 16354815; name = "Taran Lynn"; }; lassulus = { @@ -2867,26 +3401,31 @@ layus = { email = "layus.on@gmail.com"; github = "layus"; + githubId = 632767; name = "Guillaume Maudoux"; }; lblasc = { email = "lblasc@znode.net"; github = "lblasc"; + githubId = 32152; name = "Luka Blaskovic"; }; ldesgoui = { email = "ldesgoui@gmail.com"; github = "ldesgoui"; + githubId = 2472678; name = "Lucas Desgouilles"; }; league = { email = "league@contrapunctus.net"; github = "league"; + githubId = 50286; name = "Christopher League"; }; leahneukirchen = { email = "leah@vuxu.org"; github = "leahneukirchen"; + githubId = 139; name = "Leah Neukirchen"; }; lebastr = { @@ -2897,26 +3436,31 @@ ledif = { email = "refuse@gmail.com"; github = "ledif"; + githubId = 307744; name = "Adam Fidel"; }; leemachin = { email = "me@mrl.ee"; github = "leemachin"; + githubId = 736291; name = "Lee Machin"; }; leenaars = { email = "ml.software@leenaa.rs"; github = "leenaars"; + githubId = 4158274; name = "Michiel Leenaars"; }; lejonet = { email = "daniel@kuehn.se"; github = "lejonet"; + githubId = 567634; name = "Daniel Kuehn"; }; leo60228 = { email = "iakornfeld@gmail.com"; github = "leo60228"; + githubId = 8355305; name = "leo60228"; }; leonardoce = { @@ -2927,66 +3471,79 @@ lethalman = { email = "lucabru@src.gnome.org"; github = "lethalman"; + githubId = 480920; name = "Luca Bruno"; }; lewo = { email = "lewo@abesis.fr"; github = "nlewo"; + githubId = 3425311; name = "Antoine Eiche"; }; lheckemann = { email = "git@sphalerite.org"; github = "lheckemann"; + githubId = 341954; name = "Linus Heckemann"; }; lhvwb = { email = "nathaniel.baxter@gmail.com"; github = "nathanielbaxter"; + githubId = 307589; name = "Nathaniel Baxter"; }; lightdiscord = { email = "root@arnaud.sh"; github = "lightdiscord"; + githubId = 24509182; name = "Arnaud Pascal"; }; lihop = { email = "nixos@leroy.geek.nz"; github = "lihop"; + githubId = 3696783; name = "Leroy Hopson"; }; lilyball = { email = "lily@sb.org"; github = "lilyball"; + githubId = 714; name = "Lily Ballard"; }; limeytexan = { email = "limeytexan@gmail.com"; github = "limeytexan"; + githubId = 36448130; name = "Michael Brantley"; }; linarcx = { email = "linarcx@gmail.com"; github = "linarcx"; + githubId = 10884422; name = "Kaveh Ahangar"; }; linc01n = { email = "git@lincoln.hk"; github = "linc01n"; + githubId = 667272; name = "Lincoln Lee"; }; linquize = { email = "linquize@yahoo.com.hk"; github = "linquize"; + githubId = 791115; name = "Linquize"; }; linus = { email = "linusarver@gmail.com"; github = "listx"; + githubId = 725613; name = "Linus Arver"; }; livnev = { email = "lev@liv.nev.org.uk"; github = "livnev"; + githubId = 3964494; name = "Lev Livnev"; keys = [{ longkeyid = "rsa2048/0x68FF81E6A7850F49"; @@ -2996,41 +3553,49 @@ luis = { email = "luis.nixos@gmail.com"; github = "Luis-Hebendanz"; + githubId = 22085373; name = "Luis Hebendanz"; }; lionello = { email = "lio@lunesu.com"; github = "lionello"; + githubId = 591860; name = "Lionello Lunesu"; }; lluchs = { email = "lukas.werling@gmail.com"; github = "lluchs"; + githubId = 516527; name = "Lukas Werling"; }; lnl7 = { email = "daiderd@gmail.com"; github = "lnl7"; + githubId = 689294; name = "Daiderd Jordan"; }; lo1tuma = { email = "schreck.mathias@gmail.com"; github = "lo1tuma"; + githubId = 169170; name = "Mathias Schreck"; }; loewenheim = { email = "loewenheim@mailbox.org"; github = "loewenheim"; + githubId = 7622248; name = "Sebastian Zivota"; }; lopsided98 = { email = "benwolsieffer@gmail.com"; github = "lopsided98"; + githubId = 5624721; name = "Ben Wolsieffer"; }; loskutov = { email = "ignat.loskutov@gmail.com"; github = "loskutov"; + githubId = 1202012; name = "Ignat Loskutov"; }; lovek323 = { @@ -3041,16 +3606,19 @@ lowfatcomputing = { email = "andreas.wagner@lowfatcomputing.org"; github = "lowfatcomputing"; + githubId = 10626; name = "Andreas Wagner"; }; lschuermann = { email = "leon.git@is.currently.online"; github = "lschuermann"; + githubId = 5341193; name = "Leon Schuermann"; }; lsix = { email = "lsix@lancelotsix.com"; github = "lsix"; + githubId = 724339; name = "Lancelot SIX"; }; ltavard = { @@ -3061,51 +3629,61 @@ lucas8 = { email = "luc.linux@mailoo.org"; github = "lucas8"; + githubId = 2025623; name = "Luc Chabassier"; }; lucus16 = { email = "lars.jellema@gmail.com"; github = "Lucus16"; + githubId = 2487922; name = "Lars Jellema"; }; ludo = { email = "ludo@gnu.org"; github = "civodul"; + githubId = 1168435; name = "Ludovic Courtès"; }; lufia = { email = "lufia@lufia.org"; github = "lufia"; + githubId = 1784379; name = "Kyohei Kadota"; }; luispedro = { email = "luis@luispedro.org"; github = "luispedro"; + githubId = 79334; name = "Luis Pedro Coelho"; }; lukeadams = { email = "luke.adams@belljar.io"; github = "lukeadams"; + githubId = 3508077; name = "Luke Adams"; }; lukebfox = { email = "lbentley-fox1@sheffield.ac.uk"; github = "lukebfox"; + githubId = 34683288; name = "Luke Bentley-Fox"; }; lukego = { email = "luke@snabb.co"; github = "lukego"; + githubId = 13791; name = "Luke Gorrie"; }; luz = { email = "luz666@daum.net"; github = "Luz"; + githubId = 208297; name = "Luz"; }; lw = { email = "lw@fmap.me"; github = "lolwat97"; + githubId = 2057309; name = "Sergey Sofeychuk"; }; lyt = { @@ -3119,71 +3697,85 @@ ma27 = { email = "maximilian@mbosch.me"; github = "ma27"; + githubId = 6025220; name = "Maximilian Bosch"; }; ma9e = { email = "sean@lfo.team"; - github = "ma9e"; + github = "furrycatherder"; + githubId = 36235154; name = "Sean Haugh"; }; madjar = { email = "georges.dubus@compiletoi.net"; github = "madjar"; + githubId = 109141; name = "Georges Dubus"; }; mafo = { email = "Marc.Fontaine@gmx.de"; github = "MarcFontaine"; + githubId = 1433367; name = "Marc Fontaine"; }; magenbluten = { email = "magenbluten@codemonkey.cc"; github = "magenbluten"; + githubId = 1140462; name = "magenbluten"; }; magnetophon = { email = "bart@magnetophon.nl"; github = "magnetophon"; + githubId = 7645711; name = "Bart Brouns"; }; mahe = { email = "matthias.mh.herrmann@gmail.com"; github = "2chilled"; + githubId = 1238350; name = "Matthias Herrmann"; }; makefu = { email = "makefu@syntax-fehler.de"; github = "makefu"; + githubId = 115218; name = "Felix Richter"; }; malyn = { email = "malyn@strangeGizmo.com"; github = "malyn"; + githubId = 346094; name = "Michael Alyn Miller"; }; manveru = { email = "m.fellinger@gmail.com"; github = "manveru"; + githubId = 3507; name = "Michael Fellinger"; }; marcweber = { email = "marco-oweber@gmx.de"; github = "marcweber"; + githubId = 34086; name = "Marc Weber"; }; marenz = { email = "marenz@arkom.men"; github = "marenz2569"; + githubId = 12773269; name = "Markus Schmidl"; }; markus1189 = { email = "markus1189@gmail.com"; github = "markus1189"; + githubId = 591567; name = "Markus Hauck"; }; markuskowa = { email = "markus.kowalewski@gmail.com"; github = "markuskowa"; + githubId = 26470037; name = "Markus Kowalewski"; }; markWot = { @@ -3194,25 +3786,30 @@ email = "mariusdavid@laposte.net"; name = "Marius David"; github = "marius851000"; + githubId = 22586596; }; marsam = { email = "marsam@users.noreply.github.com"; github = "marsam"; + githubId = 65531; name = "Mario Rodas"; }; martijnvermaat = { email = "martijn@vermaat.name"; github = "martijnvermaat"; + githubId = 623509; name = "Martijn Vermaat"; }; martingms = { email = "martin@mg.am"; github = "martingms"; + githubId = 458783; name = "Martin Gammelsæter"; }; marzipankaiser = { email = "nixos@gaisseml.de"; github = "marzipankaiser"; + githubId = 2551444; name = "Marcial Gaißert"; keys = [{ longkeyid = "rsa2048/0xB629036BE399EEE9"; @@ -3222,16 +3819,19 @@ matejc = { email = "cotman.matej@gmail.com"; github = "matejc"; + githubId = 854770; name = "Matej Cotman"; }; mathnerd314 = { email = "mathnerd314.gph+hs@gmail.com"; github = "mathnerd314"; + githubId = 322214; name = "Mathnerd314"; }; matklad = { email = "aleksey.kladov@gmail.com"; github = "matklad"; + githubId = 1711539; name = "matklad"; }; matthewbauer = { @@ -3242,6 +3842,7 @@ matthiasbeyer = { email = "mail@beyermatthias.de"; github = "matthiasbeyer"; + githubId = 427866; name = "Matthias Beyer"; }; matti-kariluoma = { @@ -3252,76 +3853,91 @@ maurer = { email = "matthew.r.maurer+nix@gmail.com"; github = "maurer"; + githubId = 136037; name = "Matthew Maurer"; }; mbakke = { email = "mbakke@fastmail.com"; github = "mbakke"; + githubId = 1269099; name = "Marius Bakke"; }; mbbx6spp = { email = "me@susanpotter.net"; github = "mbbx6spp"; + githubId = 564; name = "Susan Potter"; }; mbe = { email = "brandonedens@gmail.com"; github = "brandonedens"; + githubId = 396449; name = "Brandon Edens"; }; mbode = { email = "maxbode@gmail.com"; github = "mbode"; + githubId = 9051309; name = "Maximilian Bode"; }; mboes = { email = "mboes@tweag.net"; github = "mboes"; + githubId = 51356; name = "Mathieu Boespflug"; }; mbrgm = { email = "marius@yeai.de"; github = "mbrgm"; + githubId = 2971615; name = "Marius Bergmann"; }; mcmtroffaes = { email = "matthias.troffaes@gmail.com"; github = "mcmtroffaes"; + githubId = 158568; name = "Matthias C. M. Troffaes"; }; mdaiter = { email = "mdaiter8121@gmail.com"; github = "mdaiter"; + githubId = 1377571; name = "Matthew S. Daiter"; }; mdevlamynck = { email = "matthias.devlamynck@mailoo.org"; github = "mdevlamynck"; + githubId = 4378377; name = "Matthias Devlamynck"; }; meditans = { email = "meditans@gmail.com"; github = "meditans"; + githubId = 4641445; name = "Carlo Nucera"; }; megheaiulian = { email = "iulian.meghea@gmail.com"; github = "megheaiulian"; + githubId = 1788114; name = "Meghea Iulian"; }; mehandes = { email = "niewskici@gmail.com"; github = "mehandes"; + githubId = 32581276; name = "Matt Deming"; }; meisternu = { email = "meister@krutt.org"; github = "meisternu"; + githubId = 8263431; name = "Matt Miemiec"; }; melchips = { email = "truphemus.francois@gmail.com"; github = "melchips"; + githubId = 365721; name = "Francois Truphemus"; }; melsigl = { @@ -3332,6 +3948,7 @@ melkor333 = { email = "samuel@ton-kunst.ch"; github = "melkor333"; + githubId = 6412377; name = "Samuel Ruprecht"; }; metabar = { @@ -3342,40 +3959,48 @@ email = "kira.bruneau@gmail.com"; name = "Kira Bruneau"; github = "metadark"; + githubId = 382041; }; mfossen = { email = "msfossen@gmail.com"; github = "mfossen"; + githubId = 3300322; name = "Mitchell Fossen"; }; mgdelacroix = { email = "mgdelacroix@gmail.com"; github = "mgdelacroix"; + githubId = 223323; name = "Miguel de la Cruz"; }; mgregoire = { email = "gregoire@martinache.net"; github = "M-Gregoire"; + githubId = 9469313; name = "Gregoire Martinache"; }; mgttlinger = { email = "megoettlinger@gmail.com"; github = "mgttlinger"; + githubId = 5120487; name = "Merlin Göttlinger"; }; mguentner = { email = "code@klandest.in"; github = "mguentner"; + githubId = 668926; name = "Maximilian Güntner"; }; mhaselsteiner = { email = "magdalena.haselsteiner@gmx.at"; github = "mhaselsteiner"; + githubId = 20536514; name = "Magdalena Haselsteiner"; }; mic92 = { email = "joerg@thalheim.io"; github = "mic92"; + githubId = 96200; name = "Jörg Thalheim"; keys = [{ # compare with https://keybase.io/Mic92 @@ -3391,6 +4016,7 @@ michalrus = { email = "m@michalrus.com"; github = "michalrus"; + githubId = 4366292; name = "Michal Rus"; }; michelk = { @@ -3401,26 +4027,31 @@ michojel = { email = "mic.liamg@gmail.com"; github = "michojel"; + githubId = 21156022; name = "Michal Minář"; }; mickours = { email = "mickours@gmail.com<"; github = "mickours"; + githubId = 837312; name = "Michael Mercier"; }; midchildan = { email = "midchildan+nix@gmail.com"; github = "midchildan"; + githubId = 7343721; name = "midchildan"; }; mikefaille = { email = "michael@faille.io"; github = "mikefaille"; + githubId = 978196; name = "Michaël Faille"; }; mikoim = { email = "ek@esh.ink"; github = "mikoim"; + githubId = 3958340; name = "Eshin Kunishima"; }; miltador = { @@ -3430,6 +4061,7 @@ mimadrid = { email = "mimadrid@ucm.es"; github = "mimadrid"; + githubId = 3269878; name = "Miguel Madrid"; }; minijackson = { @@ -3445,36 +4077,43 @@ mirrexagon = { email = "mirrexagon@mirrexagon.com"; github = "mirrexagon"; + githubId = 1776903; name = "Andrew Abbott"; }; mjanczyk = { email = "m@dragonvr.pl"; github = "mjanczyk"; + githubId = 1001112; name = "Marcin Janczyk"; }; mjp = { email = "mike@mythik.co.uk"; github = "MikePlayle"; + githubId = 16974598; name = "Mike Playle"; }; mkazulak = { email = "kazulakm@gmail.com"; github = "mulderr"; + githubId = 5698461; name = "Maciej Kazulak"; }; mkg = { email = "mkg@vt.edu"; github = "mkgvt"; + githubId = 22477669; name = "Mark K Gardner"; }; mlieberman85 = { email = "mlieberman85@gmail.com"; github = "mlieberman85"; + githubId = 622577; name = "Michael Lieberman"; }; mmahut = { email = "marek.mahut@gmail.com"; github = "mmahut"; + githubId = 104795; name = "Marek Mahut"; }; mmlb = { @@ -3485,21 +4124,25 @@ mnacamura = { email = "m.nacamura@gmail.com"; github = "mnacamura"; + githubId = 45770; name = "Mitsuhiro Nakamura"; }; moaxcp = { email = "moaxcp@gmail.com"; github = "moaxcp"; + githubId = 7831184; name = "John Mercier"; }; modulistic = { email = "modulistic@gmail.com"; github = "modulistic"; + githubId = 1902456; name = "Pablo Costa"; }; mog = { email = "mog-lists@rldn.net"; github = "mogorman"; + githubId = 64710; name = "Matthew O'Gorman"; }; Mogria = { @@ -3510,36 +4153,43 @@ monsieurp = { email = "monsieurp@gentoo.org"; github = "monsieurp"; + githubId = 350116; name = "Patrice Clement"; }; montag451 = { email = "montag451@laposte.net"; github = "montag451"; + githubId = 249317; name = "montag451"; }; moosingin3space = { email = "moosingin3space@gmail.com"; github = "moosingin3space"; + githubId = 830082; name = "Nathan Moos"; }; moredread = { email = "code@apb.name"; github = "moredread"; + githubId = 100848; name = "André-Patrick Bubel"; }; moretea = { email = "maarten@moretea.nl"; github = "moretea"; + githubId = 99988; name = "Maarten Hoogendoorn"; }; MostAwesomeDude = { email = "cds@corbinsimpson.com"; github = "MostAwesomeDude"; + githubId = 118035; name = "Corbin Simpson"; }; mounium = { email = "muoniurn@gmail.com"; github = "mounium"; + githubId = 20026143; name = "Katona László"; }; MP2E = { @@ -3550,16 +4200,19 @@ mpcsh = { email = "m@mpc.sh"; github = "mpcsh"; + githubId = 2894019; name = "Mark Cohen"; }; mpickering = { email = "matthewtpickering@gmail.com"; github = "mpickering"; + githubId = 1216657; name = "Matthew Pickering"; }; mpoquet = { email = "millian.poquet@gmail.com"; github = "mpoquet"; + githubId = 3502831; name = "Millian Poquet"; }; mpscholten = { @@ -3570,6 +4223,7 @@ mpsyco = { email = "fr.st-amour@gmail.com"; github = "fstamour"; + githubId = 2881922; name = "Francis St-Amour"; }; mredaelli = { @@ -3580,16 +4234,19 @@ mrkkrp = { email = "markkarpov92@gmail.com"; github = "mrkkrp"; + githubId = 8165792; name = "Mark Karpov"; }; mrmebelman = { email = "burzakovskij@protonmail.com"; github = "MrMebelMan"; + githubId = 15896005; name = "Vladyslav Burzakovskyy"; }; mrVanDalo = { email = "contact@ingolf-wagner.de"; github = "mrVanDalo"; + githubId = 839693; name = "Ingolf Wanger"; }; msackman = { @@ -3603,26 +4260,31 @@ mschristiansen = { email = "mikkel@rheosystems.com"; github = "mschristiansen"; + githubId = 437005; name = "Mikkel Christiansen"; }; msiedlarek = { email = "mikolaj@siedlarek.pl"; github = "msiedlarek"; + githubId = 133448; name = "Mikołaj Siedlarek"; }; mstarzyk = { email = "mstarzyk@gmail.com"; github = "mstarzyk"; + githubId = 111304; name = "Maciek Starzyk"; }; msteen = { email = "emailmatthijs@gmail.com"; github = "msteen"; + githubId = 788953; name = "Matthijs Steen"; }; mt-caret = { email = "mtakeda.enigsol@gmail.com"; github = "mt-caret"; + githubId = 4996739; name = "Masayuki Takeda"; }; MtP = { @@ -3633,46 +4295,55 @@ mtreskin = { email = "zerthurd@gmail.com"; github = "Zert"; + githubId = 39034; name = "Max Treskin"; }; mudri = { email = "lamudri@gmail.com"; github = "laMudri"; + githubId = 5139265; name = "James Wood"; }; muflax = { email = "mail@muflax.com"; github = "muflax"; + githubId = 69918; name = "Stefan Dorn"; }; mvnetbiz = { email = "mvnetbiz@gmail.com"; github = "mvnetbiz"; + githubId = 6455574; name = "Matt Votava"; }; mwilsoninsight = { email = "max.wilson@insight.com"; github = "mwilsoninsight"; + githubId = 47782621; name = "Max Wilson"; }; myrl = { email = "myrl.0xf@gmail.com"; github = "myrl"; + githubId = 9636071; name = "Myrl Hex"; }; nadrieril = { email = "nadrieril@gmail.com"; github = "nadrieril"; + githubId = 6783654; name = "Nadrieril Feneanar"; }; nalbyuites = { email = "ashijit007@gmail.com"; github = "nalbyuites"; + githubId = 1009523; name = "Ashijit Pramanik"; }; namore = { email = "namor@hemio.de"; github = "namore"; + githubId = 1222539; name = "Roman Naumann"; }; nand0p = { @@ -3687,146 +4358,173 @@ nathan-gs = { email = "nathan@nathan.gs"; github = "nathan-gs"; + githubId = 330943; name = "Nathan Bijnens"; }; nathyong = { email = "nathyong@noreply.github.com"; github = "nathyong"; + githubId = 818502; name = "Nathan Yong"; }; nckx = { email = "github@tobias.gr"; github = "nckx"; + githubId = 364510; name = "Tobias Geerinckx-Rice"; }; ndowens = { email = "ndowens04@gmail.com"; github = "ndowens"; + githubId = 117743; name = "Nathan Owens"; }; neeasade = { email = "nathanisom27@gmail.com"; github = "neeasade"; + githubId = 3747396; name = "Nathan Isom"; }; neonfuz = { email = "neonfuz@gmail.com"; github = "neonfuz"; + githubId = 2590830; name = "Sage Raflik"; }; nequissimus = { email = "tim@nequissimus.com"; github = "nequissimus"; + githubId = 628342; name = "Tim Steinbach"; }; netixx = { email = "dev.espinetfrancois@gmail.com"; github = "netixx"; + githubId = 1488603; name = "François Espinet"; }; nikitavoloboev = { email = "nikita.voloboev@gmail.com"; github = "nikitavoloboev"; + githubId = 6391776; name = "Nikita Voloboev"; }; nfjinjing = { email = "nfjinjing@gmail.com"; - github = "nfjinjing"; name = "Jinjing Wang"; }; nh2 = { email = "mail@nh2.me"; github = "nh2"; + githubId = 399535; name = "Niklas Hambüchen"; }; nhooyr = { email = "anmol@aubble.com"; github = "nhooyr"; + githubId = 10180857; name = "Anmol Sethi"; }; nickhu = { email = "me@nickhu.co.uk"; github = "nickhu"; + githubId = 450276; name = "Nick Hu"; }; nicknovitski = { email = "nixpkgs@nicknovitski.com"; github = "nicknovitski"; + githubId = 151337; name = "Nick Novitski"; }; nico202 = { email = "anothersms@gmail.com"; github = "nico202"; + githubId = 8214542; name = "Nicolò Balzarotti"; }; NikolaMandic = { email = "nikola@mandic.email"; github = "NikolaMandic"; + githubId = 4368690; name = "Ratko Mladic"; }; ninjatrappeur = { email = "felix@alternativebit.fr"; github = "ninjatrappeur"; + githubId = 1219785; name = "Félix Baylac-Jacqué"; }; nioncode = { email = "nioncode+github@gmail.com"; github = "nioncode"; + githubId = 3159451; name = "Nicolas Schneider"; }; nipav = { email = "niko.pavlinek@gmail.com"; github = "nipav"; + githubId = 16385648; name = "Niko Pavlinek"; }; nixy = { email = "nixy@nixy.moe"; github = "nixy"; + githubId = 7588406; name = "Andrew R. M."; }; nmattia = { email = "nicolas@nmattia.com"; github = "nmattia"; + githubId = 6930756; name = "Nicolas Mattia"; }; nocent = { email = "nocent@protonmail.ch"; github = "nocent"; + githubId = 25505957; name = "nocent"; }; nocoolnametom = { email = "nocoolnametom@gmail.com"; github = "nocoolnametom"; + githubId = 810877; name = "Tom Doggett"; }; nomeata = { email = "mail@joachim-breitner.de"; github = "nomeata"; + githubId = 148037; name = "Joachim Breitner"; }; noneucat = { email = "andy@lolc.at"; github = "noneucat"; + githubId = 40049608; name = "Andy Chun"; }; notthemessiah = { email = "brian.cohen.88@gmail.com"; github = "notthemessiah"; + githubId = 2946283; name = "Brian Cohen"; }; np = { email = "np.nix@nicolaspouillard.fr"; github = "np"; + githubId = 5548; name = "Nicolas Pouillard"; }; nphilou = { email = "nphilou@gmail.com"; github = "nphilou"; + githubId = 9939720; name = "Philippe Nguyen"; }; nshalman = { email = "nahamu@gmail.com"; github = "nshalman"; + githubId = 20391; name = "Nahum Shalman"; }; nslqqq = { @@ -3836,51 +4534,61 @@ nthorne = { email = "notrupertthorne@gmail.com"; github = "nthorne"; + githubId = 1839979; name = "Niklas Thörne"; }; numinit = { email = "me@numin.it"; github = "numinit"; + githubId = 369111; name = "Morgan Jones"; }; nyanloutre = { email = "paul@nyanlout.re"; github = "nyanloutre"; + githubId = 7677321; name = "Paul Trehiou"; }; nyarly = { email = "nyarly@gmail.com"; github = "nyarly"; + githubId = 127548; name = "Judson Lester"; }; nzhang-zh = { email = "n.zhang.hp.au@gmail.com"; github = "nzhang-zh"; + githubId = 30825096; name = "Ning Zhang"; }; obadz = { email = "obadz-nixos@obadz.com"; github = "obadz"; + githubId = 3359345; name = "obadz"; }; ocharles = { email = "ollie@ocharles.org.uk"; github = "ocharles"; + githubId = 20878; name = "Oliver Charles"; }; odi = { email = "oliver.dunkl@gmail.com"; github = "odi"; + githubId = 158758; name = "Oliver Dunkl"; }; offline = { email = "jaka@x-truder.net"; github = "offlinehacker"; + githubId = 585547; name = "Jaka Hudoklin"; }; oida = { email = "oida@posteo.de"; github = "oida"; + githubId = 7249506; name = "oida"; }; okasu = { @@ -3890,11 +4598,13 @@ olcai = { email = "dev@timan.info"; github = "olcai"; + githubId = 20923; name = "Erik Timan"; }; olejorgenb = { email = "olejorgenb@yahoo.no"; github = "olejorgenb"; + githubId = 72201; name = "Ole Jørgen Brønner"; }; olynch = { @@ -3905,16 +4615,19 @@ omnipotententity = { email = "omnipotententity@gmail.com"; github = "omnipotententity"; + githubId = 1538622; name = "Michael Reilly"; }; OPNA2608 = { email = "christoph.neidahl@gmail.com"; github = "OPNA2608"; + githubId = 23431373; name = "Christoph Neidahl"; }; orbekk = { email = "kjetil.orbekk@gmail.com"; github = "orbekk"; + githubId = 19862; name = "KJ Ørbekk"; }; orbitz = { @@ -3925,21 +4638,25 @@ orivej = { email = "orivej@gmx.fr"; github = "orivej"; + githubId = 101514; name = "Orivej Desh"; }; osener = { email = "ozan@ozansener.com"; github = "osener"; + githubId = 111265; name = "Ozan Sener"; }; otwieracz = { email = "slawek@otwiera.cz"; github = "otwieracz"; + githubId = 108072; name = "Slawomir Gonet"; }; oxij = { email = "oxij@oxij.org"; github = "oxij"; + githubId = 391919; name = "Jan Malakhovski"; keys = [{ longkeyid = "rsa2048/0x0E6CA66E5C557AA8"; @@ -3949,66 +4666,79 @@ oyren = { email = "m.scheuren@oyra.eu"; github = "oyren"; + githubId = 15930073; name = "Moritz Scheuren"; }; pacien = { email = "b4gx3q.nixpkgs@pacien.net"; github = "pacien"; + githubId = 1449319; name = "Pacien Tran-Girard"; }; paddygord = { email = "pgpatrickgordon@gmail.com"; github = "paddygord"; + githubId = 10776658; name = "Patrick Gordon"; }; paholg = { email = "paho@paholg.com"; github = "paholg"; + githubId = 4908217; name = "Paho Lurie-Gregg"; }; pakhfn = { email = "pakhfn@gmail.com"; github = "pakhfn"; + githubId = 11016164; name = "Fedor Pakhomov"; }; panaeon = { email = "vitalii.voloshyn@gmail.com"; github = "panaeon"; + githubId = 686076; name = "Vitalii Voloshyn"; }; pandaman = { email = "kointosudesuyo@infoseek.jp"; github = "pandaman64"; + githubId = 1788628; name = "pandaman"; }; paperdigits = { email = "mica@silentumbrella.com"; github = "paperdigits"; + githubId = 71795; name = "Mica Semrick"; }; paraseba = { email = "paraseba@gmail.com"; github = "paraseba"; + githubId = 20792; name = "Sebastian Galkin"; }; pashev = { email = "pashev.igor@gmail.com"; github = "ip1981"; + githubId = 131844; name = "Igor Pashev"; }; patternspandemic = { email = "patternspandemic@live.com"; github = "patternspandemic"; + githubId = 15645854; name = "Brad Christensen"; }; pawelpacana = { email = "pawel.pacana@gmail.com"; github = "pawelpacana"; + githubId = 116740; name = "Paweł Pacana"; }; pbogdan = { email = "ppbogdan@gmail.com"; github = "pbogdan"; + githubId = 157610; name = "Piotr Bogdan"; }; pcarrier = { @@ -4019,81 +4749,97 @@ periklis = { email = "theopompos@gmail.com"; github = "periklis"; + githubId = 152312; name = "Periklis Tsirakidis"; }; pesterhazy = { email = "pesterhazy@gmail.com"; github = "pesterhazy"; + githubId = 106328; name = "Paulus Esterhazy"; }; petabyteboy = { email = "me@pbb.lc"; github = "petabyteboy"; + githubId = 3250809; name = "Milan Pässler"; }; peterhoeg = { email = "peter@hoeg.com"; github = "peterhoeg"; + githubId = 722550; name = "Peter Hoeg"; }; peterromfeldhk = { email = "peter.romfeld.hk@gmail.com"; github = "peterromfeldhk"; + githubId = 5515707; name = "Peter Romfeld"; }; peti = { email = "simons@cryp.to"; github = "peti"; + githubId = 28323; name = "Peter Simons"; }; philandstuff = { email = "philip.g.potter@gmail.com"; github = "philandstuff"; + githubId = 581269; name = "Philip Potter"; }; phile314 = { email = "nix@314.ch"; github = "phile314"; + githubId = 1640697; name = "Philipp Hausmann"; }; Phlogistique = { email = "noe.rubinstein@gmail.com"; github = "Phlogistique"; + githubId = 421510; name = "Noé Rubinstein"; }; phreedom = { email = "phreedom@yandex.ru"; github = "phreedom"; + githubId = 62577; name = "Evgeny Egorochkin"; }; phryneas = { email = "mail@lenzw.de"; github = "phryneas"; + githubId = 4282439; name = "Lenz Weber"; }; phunehehe = { email = "phunehehe@gmail.com"; github = "phunehehe"; + githubId = 627831; name = "Hoang Xuan Phu"; }; pierrechevalier83 = { email = "pierrechevalier83@gmail.com"; github = "pierrechevalier83"; + githubId = 5790907; name = "Pierre Chevalier"; }; pierreis = { email = "pierre@pierre.is"; github = "pierreis"; + githubId = 203973; name = "Pierre Matri"; }; pierrer = { email = "pierrer@pi3r.be"; github = "pierrer"; + githubId = 93115; name = "Pierre Radermecker"; }; pierron = { email = "nixos@nbp.name"; github = "nbp"; + githubId = 1179566; name = "Nicolas B. Pierron"; }; piotr = { @@ -4103,16 +4849,19 @@ pjbarnoy = { email = "pjbarnoy@gmail.com"; github = "pjbarnoy"; + githubId = 119460; name = "Perry Barnoy"; }; pjones = { email = "pjones@devalot.com"; github = "pjones"; + githubId = 3737; name = "Peter Jones"; }; pkmx = { email = "pkmx.tw@gmail.com"; github = "pkmx"; + githubId = 610615; name = "Chih-Mao Chen"; }; plchldr = { @@ -4123,16 +4872,19 @@ plcplc = { email = "plcplc@gmail.com"; github = "plcplc"; + githubId = 358550; name = "Philip Lykke Carlsen"; }; plumps = { email = "maks.bronsky@web.de"; github = "plumps"; + githubId = 13000278; name = "Maksim Bronsky"; }; pmahoney = { email = "pat@polycrystal.org"; github = "pmahoney"; + githubId = 103822; name = "Patrick Mahoney"; }; pmeunier = { @@ -4143,21 +4895,25 @@ pmiddend = { email = "pmidden@secure.mailbox.org"; github = "pmiddend"; + githubId = 178496; name = "Philipp Middendorf"; }; pmyjavec = { email = "pauly@myjavec.com"; github = "pmyjavec"; + githubId = 315096; name = "Pauly Myjavec"; }; pnelson = { email = "me@pnelson.ca"; github = "pnelson"; + githubId = 579773; name = "Philip Nelson"; }; pneumaticat = { email = "kevin@potatofrom.space"; github = "pneumaticat"; + githubId = 11365056; name = "Kevin Liu"; }; polyrod = { @@ -4168,16 +4924,19 @@ pombeirp = { email = "nix@endgr.33mail.com"; github = "PombeirP"; + githubId = 138074; name = "Pedro Pombeiro"; }; pradeepchhetri = { email = "pradeep.chhetri89@gmail.com"; github = "pradeepchhetri"; + githubId = 2232667; name = "Pradeep Chhetri"; }; pradyuman = { email = "me@pradyuman.co"; github = "pradyuman"; + githubId = 9904569; name = "Pradyuman Vig"; keys = [ { longkeyid = "rsa4096/4F74D5361C4CA31E"; @@ -4188,11 +4947,13 @@ prikhi = { email = "pavan.rikhi@gmail.com"; github = "prikhi"; + githubId = 1304102; name = "Pavan Rikhi"; }; primeos = { email = "dev.primeos@gmail.com"; github = "primeos"; + githubId = 7537109; name = "Michael Weiss"; keys = [ { longkeyid = "ed25519/0x130826A6C2A389FD"; # Git only @@ -4206,21 +4967,25 @@ Profpatsch = { email = "mail@profpatsch.de"; github = "Profpatsch"; + githubId = 3153638; name = "Profpatsch"; }; proglodyte = { email = "proglodyte23@gmail.com"; github = "proglodyte"; + githubId = 18549627; name = "Proglodyte"; }; protoben = { email = "protob3n@gmail.com"; github = "protoben"; + githubId = 4633847; name = "Ben Hamlin"; }; prusnak = { email = "pavol@rusnak.io"; github = "prusnak"; + githubId = 42201; name = "Pavol Rusnak"; keys = [{ longkeyid = "rsa4096/0x91F3B339B9A02A3D"; @@ -4230,11 +4995,13 @@ pshendry = { email = "paul@pshendry.com"; github = "pshendry"; + githubId = 1829032; name = "Paul Hendry"; }; psibi = { email = "sibi@psibi.in"; github = "psibi"; + githubId = 737477; name = "Sibi"; }; pstn = { @@ -4244,26 +5011,31 @@ pSub = { email = "mail@pascal-wittmann.de"; github = "pSub"; + githubId = 83842; name = "Pascal Wittmann"; }; psyanticy = { email = "iuns@outlook.fr"; github = "PsyanticY"; + githubId = 20524473; name = "Psyanticy"; }; ptival = { email = "valentin.robert.42@gmail.com"; github = "Ptival"; + githubId = 478606; name = "Valentin Robert"; }; ptrhlm = { email = "ptrhlm0@gmail.com"; github = "ptrhlm"; + githubId = 9568176; name = "Piotr Halama"; }; puffnfresh = { email = "brian@brianmckenna.org"; github = "puffnfresh"; + githubId = 37715; name = "Brian McKenna"; }; pxc = { @@ -4273,26 +5045,31 @@ pyrolagus = { email = "pyrolagus@gmail.com"; github = "PyroLagus"; + githubId = 4579165; name = "Danny Bautista"; }; q3k = { email = "q3k@q3k.org"; github = "q3k"; + githubId = 315234; name = "Serge Bazanski"; }; qknight = { email = "js@lastlog.de"; github = "qknight"; + githubId = 137406; name = "Joachim Schiele"; }; qoelet = { email = "kenny@machinesung.com"; github = "qoelet"; + githubId = 115877; name = "Kenny Shen"; }; qyliss = { email = "hi@alyssa.is"; github = "alyssais"; + githubId = 2768870; name = "Alyssa Ross"; keys = [{ longkeyid = "rsa4096/736CCDF9EF51BD97"; @@ -4307,36 +5084,43 @@ raquelgb = { email = "raquel.garcia.bautista@gmail.com"; github = "raquelgb"; + githubId = 1246959; name = "Raquel García"; }; ragge = { email = "r.dahlen@gmail.com"; github = "ragnard"; + githubId = 882; name = "Ragnar Dahlen"; }; ralith = { email = "ben.e.saunders@gmail.com"; github = "ralith"; + githubId = 104558; name = "Benjamin Saunders"; }; ramkromberg = { email = "ramkromberg@mail.com"; github = "ramkromberg"; + githubId = 14829269; name = "Ram Kromberg"; }; rardiol = { email = "ricardo.ardissone@gmail.com"; github = "rardiol"; + githubId = 11351304; name = "Ricardo Ardissone"; }; rasendubi = { email = "rasen.dubi@gmail.com"; github = "rasendubi"; + githubId = 1366419; name = "Alexey Shmalko"; }; raskin = { email = "7c6f434c@mail.ru"; github = "7c6f434c"; + githubId = 1891350; name = "Michael Raskin"; }; ravloony = { @@ -4346,101 +5130,121 @@ rawkode = { email = "david.andrew.mckay@gmail.com"; github = "rawkode"; + githubId = 145816; name = "David McKay"; }; razvan = { email = "razvan.panda@gmail.com"; github = "razvan-panda"; + githubId = 1758708; name = "Răzvan Flavius Panda"; }; rbasso = { email = "rbasso@sharpgeeks.net"; github = "rbasso"; + githubId = 16487165; name = "Rafael Basso"; }; rbrewer = { email = "rwb123@gmail.com"; github = "rbrewer123"; + githubId = 743058; name = "Rob Brewer"; }; rdnetto = { email = "rdnetto@gmail.com"; github = "rdnetto"; + githubId = 1973389; name = "Reuben D'Netto"; }; redbaron = { email = "ivanov.maxim@gmail.com"; github = "redbaron"; + githubId = 16624; name = "Maxim Ivanov"; }; redfish64 = { email = "engler@gmail.com"; github = "redfish64"; + githubId = 1922770; name = "Tim Engler"; }; redvers = { email = "red@infect.me"; github = "redvers"; + githubId = 816465; name = "Redvers Davies"; }; refnil = { email = "broemartino@gmail.com"; github = "refnil"; + githubId = 1142322; name = "Martin Lavoie"; }; regnat = { email = "regnat@regnat.ovh"; github = "regnat"; + githubId = 7226587; name = "Théophane Hufschmitt"; }; relrod = { email = "ricky@elrod.me"; github = "relrod"; + githubId = 43930; name = "Ricky Elrod"; }; rembo10 = { email = "rembo10@users.noreply.github.com"; github = "rembo10"; + githubId = 801525; name = "rembo10"; }; renatoGarcia = { email = "fgarcia.renato@gmail.com"; github = "renatoGarcia"; + githubId = 220211; name = "Renato Garcia"; }; rencire = { email = "546296+rencire@users.noreply.github.com"; github = "rencire"; + githubId = 546296; name = "Eric Ren"; }; renzo = { email = "renzocarbonara@gmail.com"; github = "k0001"; + githubId = 3302; name = "Renzo Carbonara"; }; retrry = { email = "retrry@gmail.com"; github = "retrry"; + githubId = 500703; name = "Tadas Barzdžius"; }; rexim = { email = "reximkut@gmail.com"; github = "rexim"; + githubId = 165283; name = "Alexey Kutepov"; }; rht = { email = "rhtbot@protonmail.com"; github = "rht"; + githubId = 395821; name = "rht"; }; richardipsum = { email = "richardipsum@fastmail.co.uk"; github = "richardipsum"; + githubId = 10631029; name = "Richard Ipsum"; }; rick68 = { email = "rick68@gmail.com"; github = "rick68"; + githubId = 42619; name = "Wei-Ming Yang"; }; rickynils = { @@ -4451,31 +5255,37 @@ ris = { email = "code@humanleg.org.uk"; github = "risicle"; + githubId = 807447; name = "Robert Scott"; }; rittelle = { email = "rittelle@posteo.de"; github = "rittelle"; + githubId = 33598633; name = "Lennart Rittel"; }; rixed = { email = "rixed-github@happyleptic.org"; github = "rixed"; + githubId = 449990; name = "Cedric Cellier"; }; rkoe = { email = "rk@simple-is-better.org"; github = "rkoe"; + githubId = 2507744; name = "Roland Koebler"; }; rlupton20 = { email = "richard.lupton@gmail.com"; github = "rlupton20"; + githubId = 13752145; name = "Richard Lupton"; }; rnhmjoj = { email = "micheleguerinirocco@me.com"; github = "rnhmjoj"; + githubId = 2817565; name = "Michele Guerini Rocco"; }; rob = { @@ -4491,91 +5301,109 @@ robbinch = { email = "robbinch33@gmail.com"; github = "robbinch"; + githubId = 12312980; name = "Robbin C."; }; roberth = { email = "nixpkgs@roberthensing.nl"; github = "roberth"; + githubId = 496447; name = "Robert Hensing"; }; robertodr = { email = "roberto.diremigio@gmail.com"; github = "robertodr"; + githubId = 3708689; name = "Roberto Di Remigio"; }; robgssp = { email = "robgssp@gmail.com"; github = "robgssp"; + githubId = 521306; name = "Rob Glossop"; }; roblabla = { email = "robinlambertz+dev@gmail.com"; github = "roblabla"; + githubId = 1069318; name = "Robin Lambertz"; }; roconnor = { email = "roconnor@theorem.ca"; github = "roconnor"; + githubId = 852967; name = "Russell O'Connor"; }; romildo = { email = "malaquias@gmail.com"; github = "romildo"; + githubId = 1217934; name = "José Romildo Malaquias"; }; rongcuid = { email = "rongcuid@outlook.com"; github = "rongcuid"; + githubId = 1312525; name = "Rongcui Dong"; }; roosemberth = { email = "roosembert.palacios+nixpkgs@gmail.com"; github = "roosemberth"; + githubId = 3621083; name = "Roosembert (Roosemberth) Palacios"; }; royneary = { email = "christian@ulrich.earth"; github = "royneary"; + githubId = 1942810; name = "Christian Ulrich"; }; rprospero = { email = "rprospero+nix@gmail.com"; github = "rprospero"; + githubId = 1728853; name = "Adam Washington"; }; rps = { email = "robbpseaton@gmail.com"; github = "robertseaton"; + githubId = 221121; name = "Robert P. Seaton"; }; rszibele = { email = "richard@szibele.com"; github = "rszibele"; + githubId = 1387224; name = "Richard Szibele"; }; rtreffer = { email = "treffer+nixos@measite.de"; github = "rtreffer"; + githubId = 61306; name = "Rene Treffer"; }; rushmorem = { email = "rushmore@webenchanter.com"; github = "rushmorem"; + githubId = 4958190; name = "Rushmore Mushambi"; }; ruuda = { email = "dev+nix@veniogames.com"; github = "ruuda"; + githubId = 506953; name = "Ruud van Asseldonk"; }; rvl = { email = "dev+nix@rodney.id.au"; github = "rvl"; + githubId = 1019641; name = "Rodney Lorrimar"; }; rvlander = { email = "rvlander@gaetanandre.eu"; github = "rvlander"; + githubId = 5236428; name = "Gaëtan André"; }; rvolosatovs = { @@ -4586,6 +5414,7 @@ ryanartecona = { email = "ryanartecona@gmail.com"; github = "ryanartecona"; + githubId = 889991; name = "Ryan Artecona"; }; ryansydnor = { @@ -4596,21 +5425,25 @@ ryantm = { email = "ryan@ryantm.com"; github = "ryantm"; + githubId = 4804; name = "Ryan Mulligan"; }; ryantrinkle = { email = "ryan.trinkle@gmail.com"; github = "ryantrinkle"; + githubId = 1156448; name = "Ryan Trinkle"; }; rybern = { email = "ryan.bernstein@columbia.edu"; github = "rybern"; + githubId = 4982341; name = "Ryan Bernstein"; }; rycee = { email = "robert@rycee.net"; github = "rycee"; + githubId = 798147; name = "Robert Helgesson"; keys = [{ longkeyid = "rsa4096/0x3573356C25C424D4"; @@ -4620,31 +5453,37 @@ ryneeverett = { email = "ryneeverett@gmail.com"; github = "ryneeverett"; + githubId = 3280280; name = "Ryne Everett"; }; rzetterberg = { email = "richard.zetterberg@gmail.com"; github = "rzetterberg"; + githubId = 766350; name = "Richard Zetterberg"; }; samdroid-apps = { email = "sam@sam.today"; github = "samdroid-apps"; + githubId = 6022042; name = "Sam Parkinson"; }; samrose = { email = "samuel.rose@gmail.com"; github = "samrose"; + githubId = 115821; name = "Sam Rose"; }; samueldr = { email = "samuel@dionne-riel.com"; github = "samueldr"; + githubId = 132835; name = "Samuel Dionne-Riel"; }; samuelrivas = { email = "samuelrivas@gmail.com"; github = "samuelrivas"; + githubId = 107703; name = "Samuel Rivas"; }; sander = { @@ -4655,26 +5494,31 @@ sargon = { email = "danielehlers@mindeye.net"; github = "sargon"; + githubId = 178904; name = "Daniel Ehlers"; }; saschagrunert = { email = "mail@saschagrunert.de"; github = "saschagrunert"; + githubId = 695473; name = "Sascha Grunert"; }; sauyon = { email = "s@uyon.co"; github = "sauyon"; + githubId = 2347889; name = "Sauyon Lee"; }; sb0 = { email = "sb@m-labs.hk"; github = "sbourdeauducq"; + githubId = 720864; name = "Sébastien Bourdeauducq"; }; sboosali = { email = "SamBoosalis@gmail.com"; github = "sboosali"; + githubId = 2320433; name = "Sam Boosalis"; }; scalavision = { @@ -4685,6 +5529,7 @@ schmitthenner = { email = "development@schmitthenner.eu"; github = "fkz"; + githubId = 354463; name = "Fabian Schmitthenner"; }; schmittlauch = { @@ -4694,6 +5539,7 @@ schneefux = { email = "schneefux+nixos_pkg@schneefux.xyz"; github = "schneefux"; + githubId = 15379000; name = "schneefux"; }; schristo = { @@ -4703,21 +5549,25 @@ scode = { email = "peter.schuller@infidyne.com"; github = "scode"; + githubId = 59476; name = "Peter Schuller"; }; scolobb = { email = "sivanov@colimite.fr"; github = "scolobb"; + githubId = 11320; name = "Sergiu Ivanov"; }; screendriver = { email = "nix@echooff.de"; github = "screendriver"; + githubId = 149248; name = "Christian Rackerseder"; }; Scriptkiddi = { email = "nixos@scriptkiddi.de"; github = "scriptkiddi"; + githubId = 3598650; name = "Fritz Otlinghaus"; }; scubed2 = { @@ -4728,61 +5578,73 @@ sdll = { email = "sasha.delly@gmail.com"; github = "sdll"; + githubId = 17913919; name = "Sasha Illarionov"; }; SeanZicari = { email = "sean.zicari@gmail.com"; github = "SeanZicari"; + githubId = 2343853; name = "Sean Zicari"; }; sellout = { email = "greg@technomadic.org"; github = "sellout"; + githubId = 33031; name = "Greg Pfeil"; }; sengaya = { email = "tlo@sengaya.de"; github = "sengaya"; + githubId = 1286668; name = "Thilo Uttendorfer"; }; sephalon = { email = "me@sephalon.net"; github = "sephalon"; + githubId = 893474; name = "Stefan Wiehler"; }; sepi = { email = "raffael@mancini.lu"; github = "sepi"; + githubId = 529649; name = "Raffael Mancini"; }; seppeljordan = { email = "sebastian.jordan.mail@googlemail.com"; github = "seppeljordan"; + githubId = 4805746; name = "Sebastian Jordan"; }; seqizz = { email = "seqizz@gmail.com"; github = "seqizz"; + githubId = 307899; name = "Gurkan Gur"; }; sfrijters = { email = "sfrijters@gmail.com"; github = "sfrijters"; + githubId = 918365; name = "Stefan Frijters"; }; sgraf = { email = "sgraf1337@gmail.com"; github = "sgraf812"; + githubId = 1151264; name = "Sebastian Graf"; }; shanemikel = { email = "shanemikel1@gmail.com"; github = "shanemikel"; + githubId = 6720672; name = "Shane Pearlman"; }; shawndellysse = { email = "sdellysse@gmail.com"; github = "shawndellysse"; + githubId = 293035; name = "Shawn Dellysse"; }; shazow = { @@ -4793,16 +5655,19 @@ sheenobu = { email = "sheena.artrip@gmail.com"; github = "sheenobu"; + githubId = 1443459; name = "Sheena Artrip"; }; sheganinans = { email = "sheganinans@gmail.com"; github = "sheganinans"; + githubId = 2146203; name = "Aistis Raulinaitis"; }; shell = { email = "cam.turn@gmail.com"; github = "VShell"; + githubId = 251028; name = "Shell Turner"; }; shlevy = { @@ -4818,51 +5683,61 @@ shou = { email = "x+g@shou.io"; github = "Shou"; + githubId = 819413; name = "Benedict Aas"; }; siddharthist = { email = "langston.barrett@gmail.com"; - github = "siddharthist"; + github = "langston-barrett"; + githubId = 4294323; name = "Langston Barrett"; }; siers = { email = "veinbahs+nixpkgs@gmail.com"; github = "siers"; + githubId = 235147; name = "Raitis Veinbahs"; }; sifmelcara = { email = "ming@culpring.com"; github = "sifmelcara"; + githubId = 10496191; name = "Ming Chuan"; }; sigma = { email = "yann.hodique@gmail.com"; github = "sigma"; + githubId = 16090; name = "Yann Hodique"; }; sikmir = { email = "sikmir@gmail.com"; github = "sikmir"; + githubId = 688044; name = "Nikolay Korotkiy"; }; simonvandel = { email = "simon.vandel@gmail.com"; github = "simonvandel"; + githubId = 2770647; name = "Simon Vandel Sillesen"; }; sivteck = { email = "sivaram1992@gmail.com"; github = "sivteck"; + githubId = 8017899; name = "Sivaram Balakrishnan"; }; sjagoe = { email = "simon@simonjagoe.com"; github = "sjagoe"; + githubId = 80012; name = "Simon Jagoe"; }; sjau = { email = "nixos@sjau.ch"; github = "sjau"; + githubId = 848812; name = "Stephan Jau"; }; sjmackenzie = { @@ -4877,6 +5752,7 @@ skeidel = { email = "svenkeidel@gmail.com"; github = "svenkeidel"; + githubId = 266500; name = "Sven Keidel"; }; skrzyp = { @@ -4886,11 +5762,13 @@ sleexyz = { email = "freshdried@gmail.com"; github = "sleexyz"; + githubId = 1505617; name = "Sean Lee"; }; smakarov = { email = "setser200018@gmail.com"; github = "setser"; + githubId = 12733495; name = "Sergey Makarov"; keys = [{ longkeyid = "rsa2048/6AA23A1193B7064B"; @@ -4900,6 +5778,7 @@ smaret = { email = "sebastien.maret@icloud.com"; github = "smaret"; + githubId = 95471; name = "Sébastien Maret"; keys = [{ longkeyid = "rsa4096/0x86E30E5A0F5FC59C"; @@ -4909,31 +5788,37 @@ smironov = { email = "grrwlf@gmail.com"; github = "grwlf"; + githubId = 4477729; name = "Sergey Mironov"; }; sna = { email = "abouzahra.9@wright.edu"; github = "s-na"; + githubId = 20214715; name = "S. Nordin Abouzahra"; }; snaar = { email = "snaar@snaar.net"; github = "snaar"; + githubId = 602439; name = "Serguei Narojnyi"; }; snyh = { email = "snyh@snyh.org"; github = "snyh"; + githubId = 1437166; name = "Xia Bin"; }; solson = { email = "scott@solson.me"; github = "solson"; + githubId = 26806; name = "Scott Olson"; }; sondr3 = { email = "nilsen.sondre@gmail.com"; github = "sondr3"; + githubId = 2280539; name = "Sondre Nilsen"; keys = [{ longkeyid = "ed25519/0x25676BCBFFAD76B1"; @@ -4943,31 +5828,37 @@ sorki = { email = "srk@48.io"; github = "sorki"; + githubId = 115308; name = "Richard Marko"; }; sorpaas = { email = "hi@that.world"; github = "sorpaas"; + githubId = 6277322; name = "Wei Tang"; }; spacefrogg = { email = "spacefrogg-nixos@meterriblecrew.net"; github = "spacefrogg"; + githubId = 167881; name = "Michael Raitza"; }; spacekookie = { email = "kookie@spacekookie.de"; github = "spacekookie"; + githubId = 7669898; name = "Katharina Fey"; }; spencerjanssen = { email = "spencerjanssen@gmail.com"; github = "spencerjanssen"; + githubId = 2600039; name = "Spencer Janssen"; }; spinus = { email = "tomasz.czyz@gmail.com"; github = "spinus"; + githubId = 950799; name = "Tomasz Czyż"; }; sprock = { @@ -4978,6 +5869,7 @@ spwhitt = { email = "sw@swhitt.me"; github = "spwhitt"; + githubId = 1414088; name = "Spencer Whitt"; }; srghma = { @@ -4988,37 +5880,44 @@ srgom = { email = "srgom@users.noreply.github.com"; github = "srgom"; + githubId = 8103619; name = "SRGOM"; }; srhb = { email = "sbrofeldt@gmail.com"; github = "srhb"; + githubId = 219362; name = "Sarah Brofeldt"; }; SShrike = { email = "severen@shrike.me"; github = "severen"; + githubId = 4061736; name = "Severen Redwood"; }; steell = { email = "steve@steellworks.com"; github = "Steell"; + githubId = 1699155; name = "Steve Elliott"; }; stephenmw = { email = "stephen@q5comm.com"; github = "stephenmw"; + githubId = 231788; name = "Stephen Weinberg"; }; sternenseemann = { email = "post@lukasepple.de"; github = "sternenseemann"; + githubId = 3154475; name = "Lukas Epple"; }; steshaw = { name = "Steven Shaw"; email = "steven@steshaw.org"; github = "steshaw"; + githubId = 45735; keys = [{ longkeyid = "rsa4096/0x1D9A17DFD23DCB91"; fingerprint = "0AFE 77F7 474D 1596 EE55 7A29 1D9A 17DF D23D CB91"; @@ -5027,111 +5926,133 @@ stesie = { email = "stesie@brokenpipe.de"; github = "stesie"; + githubId = 113068; name = "Stefan Siegl"; }; steve-chavez = { email = "stevechavezast@gmail.com"; github = "steve-chavez"; + githubId = 1829294; name = "Steve Chávez"; }; steveej = { email = "mail@stefanjunker.de"; github = "steveej"; + githubId = 1181362; name = "Stefan Junker"; }; StijnDW = { email = "stekke@airmail.cc"; github = "StijnDW"; + githubId = 1751956; name = "Stijn DW"; }; StillerHarpo = { email = "florianengel39@gmail.com"; github = "StillerHarpo"; + githubId = 25526706; name = "Florian Engel"; }; stites = { email = "sam@stites.io"; github = "stites"; + githubId = 1694705; name = "Sam Stites"; }; stumoss = { email = "samoss@gmail.com"; github = "stumoss"; + githubId = 638763; name = "Stuart Moss"; }; suhr = { email = "suhr@i2pmail.org"; github = "suhr"; + githubId = 65870; name = "Сухарик"; }; SuprDewd = { email = "suprdewd@gmail.com"; github = "SuprDewd"; + githubId = 187109; name = "Bjarki Ágúst Guðmundsson"; }; suvash = { email = "suvash+nixpkgs@gmail.com"; github = "suvash"; + githubId = 144952; name = "Suvash Thapaliya"; }; sveitser = { email = "sveitser@gmail.com"; github = "sveitser"; + githubId = 1040871; name = "Mathis Antony"; }; svsdep = { email = "svsdep@gmail.com"; github = "svsdep"; + githubId = 36695359; name = "Vasyl Solovei"; }; swarren83 = { email = "shawn.w.warren@gmail.com"; github = "swarren83"; + githubId = 4572854; name = "Shawn Warren"; }; swdunlop = { email = "swdunlop@gmail.com"; github = "swdunlop"; + githubId = 120188; name = "Scott W. Dunlop"; }; swflint = { email = "swflint@flintfam.org"; github = "swflint"; + githubId = 1771109; name = "Samuel W. Flint"; }; swistak35 = { email = "me@swistak35.com"; github = "swistak35"; + githubId = 332289; name = "Rafał Łasocha"; }; symphorien = { email = "symphorien_nixpkgs@xlumurb.eu"; github = "symphorien"; + githubId = 12595971; name = "Guillaume Girol"; }; synthetica = { email = "nix@hilhorst.be"; github = "Synthetica9"; + githubId = 7075751; name = "Patrick Hilhorst"; }; szczyp = { email = "qb@szczyp.com"; github = "szczyp"; + githubId = 203195; name = "Szczyp"; }; sztupi = { email = "attila.sztupak@gmail.com"; github = "sztupi"; + githubId = 143103; name = "Attila Sztupak"; }; t184256 = { email = "monk@unboiled.info"; github = "t184256"; + githubId = 5991987; name = "Alexander Sosedkin"; }; tadeokondrak = { email = "me@tadeo.ca"; github = "tadeokondrak"; + githubId = 4098453; name = "Tadeo Kondrak"; keys = [{ longkeyid = "ed25519/0xFBE607FCC49516D3"; @@ -5141,11 +6062,13 @@ tadfisher = { email = "tadfisher@gmail.com"; github = "tadfisher"; + githubId = 129148; name = "Tad Fisher"; }; taeer = { email = "taeer@necsi.edu"; github = "Radvendii"; + githubId = 1239929; name = "Taeer Bar-Yam"; }; taha = { @@ -5156,76 +6079,91 @@ tailhook = { email = "paul@colomiets.name"; github = "tailhook"; + githubId = 321799; name = "Paul Colomiets"; }; taketwo = { email = "alexandrov88@gmail.com"; github = "taketwo"; + githubId = 1241736; name = "Sergey Alexandrov"; }; takikawa = { email = "asumu@igalia.com"; github = "takikawa"; + githubId = 64192; name = "Asumu Takikawa"; }; taktoa = { email = "taktoa@gmail.com"; github = "taktoa"; + githubId = 553443; name = "Remy Goldschmidt"; }; taku0 = { email = "mxxouy6x3m_github@tatapa.org"; github = "taku0"; + githubId = 870673; name = "Takuo Yonezawa"; }; talyz = { email = "kim.lindberger@gmail.com"; github = "talyz"; + githubId = 63433; name = "Kim Lindberger"; }; taneb = { email = "nvd1234@gmail.com"; github = "Taneb"; + githubId = 1901799; name = "Nathan van Doorn"; }; tari = { email = "peter@taricorp.net"; github = "tari"; + githubId = 506181; name = "Peter Marheine"; }; tavyc = { email = "octavian.cerna@gmail.com"; github = "tavyc"; + githubId = 3650609; name = "Octavian Cerna"; }; tazjin = { email = "mail@tazj.in"; github = "tazjin"; + githubId = 1552853; name = "Vincent Ambo"; }; tbenst = { email = "nix@tylerbenster.com"; github = "tbenst"; + githubId = 863327; name = "Tyler Benster"; }; teh = { email = "tehunger@gmail.com"; github = "teh"; + githubId = 139251; name = "Tom Hunger"; }; telotortium = { email = "rirelan@gmail.com"; github = "telotortium"; + githubId = 1755789; name = "Robert Irelan"; }; teozkr = { email = "teo@nullable.se"; github = "teozkr"; + githubId = 649832; name = "Teo Klestrup Röijezon"; }; terlar = { email = "terlar@gmail.com"; github = "terlar"; + githubId = 280235; name = "Terje Larsen"; }; tesq0 = { @@ -5241,26 +6179,31 @@ tex = { email = "milan.svoboda@centrum.cz"; github = "tex"; + githubId = 27386; name = "Milan Svoboda"; }; tg-x = { email = "*@tg-x.net"; github = "tg-x"; + githubId = 378734; name = "TG ⊗ Θ"; }; thall = { email = "niclas.thall@gmail.com"; github = "thall"; + githubId = 102452; name = "Niclas Thall"; }; thammers = { email = "jawr@gmx.de"; github = "tobias-hammerschmidt"; + githubId = 2543259; name = "Tobias Hammerschmidt"; }; thanegill = { email = "me@thanegill.com"; github = "thanegill"; + githubId = 1141680; name = "Thane Gill"; }; the-kenny = { @@ -5271,16 +6214,19 @@ thedavidmeister = { email = "thedavidmeister@gmail.com"; github = "thedavidmeister"; + githubId = 629710; name = "David Meister"; }; thefloweringash = { email = "lorne@cons.org.nz"; github = "thefloweringash"; + githubId = 42933; name = "Andrew Childs"; }; thesola10 = { email = "thesola10@bobile.fr"; github = "thesola10"; + githubId = 7287268; keys = [{ longkeyid = "rsa4096/0x89245619BEBB95BA"; fingerprint = "1D05 13A6 1AC4 0D8D C6D6 5F2C 8924 5619 BEBB 95BA"; @@ -5290,31 +6236,37 @@ theuni = { email = "ct@flyingcircus.io"; github = "ctheune"; + githubId = 1220572; name = "Christian Theune"; }; thiagokokada = { email = "thiagokokada@gmail.com"; github = "thiagokokada"; + githubId = 844343; name = "Thiago K. Okada"; }; ThomasMader = { email = "thomas.mader@gmail.com"; github = "ThomasMader"; + githubId = 678511; name = "Thomas Mader"; }; thoughtpolice = { email = "aseipp@pobox.com"; github = "thoughtpolice"; + githubId = 3416; name = "Austin Seipp"; }; thpham = { email = "thomas.pham@ithings.ch"; github = "thpham"; + githubId = 224674; name = "Thomas Pham"; }; tilpner = { email = "till@hoeppner.ws"; github = "tilpner"; + githubId = 4322055; name = "Till Höppner"; }; timbertson = { @@ -5325,31 +6277,37 @@ timokau = { email = "timokau@zoho.com"; github = "timokau"; + githubId = 3799330; name = "Timo Kaufmann"; }; timor = { email = "timor.dd@googlemail.com"; github = "timor"; + githubId = 174156; name = "timor"; }; timput = { email = "tim@timput.com"; github = "TimPut"; + githubId = 2845239; name = "Tim Put"; }; tiramiseb = { email = "sebastien@maccagnoni.eu"; github = "tiramiseb"; + githubId = 1292007; name = "Sébastien Maccagnoni"; }; titanous = { email = "jonathan@titanous.com"; github = "titanous"; + githubId = 13026; name = "Jonathan Rudenberg"; }; tmplt = { email = "tmplt@dragons.rocks"; github = "tmplt"; + githubId = 6118602; name = "Viktor"; }; tnias = { @@ -5359,67 +6317,80 @@ }; tobim = { email = "nix@tobim.fastmail.fm"; - github = "tobimpub"; + github = "tobim"; + githubId = 858790; name = "Tobias Mayer"; }; tobiasBora = { email = "tobias.bora.list@gmail.com"; github = "tobiasBora"; + githubId = 2164118; name = "Tobias Bora"; }; tohl = { email = "tom@logand.com"; github = "tohl"; + githubId = 12159013; name = "Tomas Hlavaty"; }; tokudan = { email = "git@danielfrank.net"; github = "tokudan"; + githubId = 692610; name = "Daniel Frank"; }; tomahna = { email = "kevin.rauscher@tomahna.fr"; github = "Tomahna"; + githubId = 8577941; name = "Kevin Rauscher"; }; tomberek = { email = "tomberek@gmail.com"; github = "tomberek"; + githubId = 178444; name = "Thomas Bereknyei"; }; tomsmeets = { email = "tom.tsmeets@gmail.com"; github = "tomsmeets"; + githubId = 6740669; name = "Tom Smeets"; }; toonn = { email = "nnoot@toonn.io"; github = "toonn"; + githubId = 1486805; name = "Toon Nolten"; }; travisbhartwell = { email = "nafai@travishartwell.net"; github = "travisbhartwell"; + githubId = 10110; name = "Travis B. Hartwell"; }; treemo = { email = "matthieu.chevrier@treemo.fr"; github = "treemo"; + githubId = 207457; name = "Matthieu Chevrier"; }; trevorj = { email = "nix@trevor.joynson.io"; github = "akatrevorjay"; + githubId = 1312290; name = "Trevor Joynson"; }; trino = { email = "muehlhans.hubert@ekodia.de"; github = "hmuehlhans"; + githubId = 9870613; name = "Hubert Mühlhans"; }; troydm = { email = "d.geurkov@gmail.com"; github = "troydm"; + githubId = 483735; name = "Dmitry Geurkov"; }; tstrobel = { @@ -5429,11 +6400,13 @@ ttuegel = { email = "ttuegel@mailbox.org"; github = "ttuegel"; + githubId = 563054; name = "Thomas Tuegel"; }; tv = { email = "tv@krebsco.de"; github = "4z3"; + githubId = 427872; name = "Tomislav Viljetić"; }; tvestelind = { @@ -5444,6 +6417,7 @@ tvorog = { email = "marszaripov@gmail.com"; github = "tvorog"; + githubId = 1325161; name = "Marsel Zaripov"; }; tweber = { @@ -5460,6 +6434,7 @@ name = "Tyson Whitehead"; email = "twhitehead@gmail.com"; github = "twhitehead"; + githubId = 787843; keys = [{ longkeyid = "rsa2048/0x594258F0389D2802"; fingerprint = "E631 8869 586F 99B4 F6E6 D785 5942 58F0 389D 2802"; @@ -5468,41 +6443,49 @@ typetetris = { email = "ericwolf42@mail.com"; github = "typetetris"; + githubId = 1983821; name = "Eric Wolf"; }; udono = { email = "udono@virtual-things.biz"; github = "udono"; + githubId = 347983; name = "Udo Spallek"; }; unode = { email = "alves.rjc@gmail.com"; github = "unode"; + githubId = 122319; name = "Renato Alves"; }; uralbash = { email = "root@uralbash.ru"; github = "uralbash"; + githubId = 619015; name = "Svintsov Dmitry"; }; uri-canva = { email = "uri@canva.com"; github = "uri-canva"; + githubId = 33242106; name = "Uri Baghin"; }; uskudnik = { email = "urban.skudnik@gmail.com"; github = "uskudnik"; + githubId = 120451; name = "Urban Skudnik"; }; utdemir = { email = "me@utdemir.com"; github = "utdemir"; + githubId = 928084; name = "Utku Demir"; }; uvnikita = { email = "uv.nikita@gmail.com"; github = "uvNikita"; + githubId = 1084748; name = "Nikita Uvarov"; }; uwap = { @@ -5513,11 +6496,13 @@ va1entin = { email = "github@valentinsblog.com"; github = "va1entin"; + githubId = 31535155; name = "Valentin Heidelberger"; }; vaibhavsagar = { email = "vaibhavsagar@gmail.com"; github = "vaibhavsagar"; + githubId = 1525767; name = "Vaibhav Sagar"; }; valeriangalliat = { @@ -5528,37 +6513,44 @@ vandenoever = { email = "jos@vandenoever.info"; github = "vandenoever"; + githubId = 608417; name = "Jos van den Oever"; }; vanschelven = { email = "klaas@vanschelven.com"; github = "vanschelven"; + githubId = 223833; name = "Klaas van Schelven"; }; vanzef = { email = "vanzef@gmail.com"; github = "vanzef"; + githubId = 12428837; name = "Ivan Solyankin"; }; varunpatro = { email = "varun.kumar.patro@gmail.com"; github = "varunpatro"; + githubId = 6943308; name = "Varun Patro"; }; vbgl = { email = "Vincent.Laporte@gmail.com"; github = "vbgl"; + githubId = 2612464; name = "Vincent Laporte"; }; vbmithr = { email = "vb@luminar.eu.org"; github = "vbmithr"; + githubId = 797581; name = "Vincent Bernardoff"; }; vcunat = { name = "Vladimír Čunát"; email = "v@cunat.cz"; # vcunat@gmail.com predominated in commits before 2019/03 github = "vcunat"; + githubId = 1785925; keys = [{ longkeyid = "rsa4096/0xE747DF1F9575A3AA"; fingerprint = "B600 6460 B60A 80E7 8206 2449 E747 DF1F 9575 A3AA"; @@ -5567,31 +6559,37 @@ vdemeester = { email = "vincent@sbr.pm"; github = "vdemeester"; + githubId = 6508; name = "Vincent Demeester"; }; velovix = { email = "xaviosx@gmail.com"; github = "velovix"; + githubId = 2856634; name = "Tyler Compton"; }; veprbl = { email = "veprbl@gmail.com"; github = "veprbl"; + githubId = 245573; name = "Dmitry Kalinkin"; }; vidbina = { email = "vid@bina.me"; github = "vidbina"; + githubId = 335406; name = "David Asabina"; }; vifino = { email = "vifino@tty.sh"; github = "vifino"; + githubId = 5837359; name = "Adrian Pistol"; }; vinymeuh = { email = "vinymeuh@gmail.com"; github = "vinymeuh"; + githubId = 118959; name = "VinyMeuh"; }; viric = { @@ -5599,6 +6597,12 @@ github = "viric"; name = "Lluís Batlle i Rossell"; }; + virusdave = { + email = "dave.nicponski@gmail.com"; + github = "virusdave"; + githubId = 6148271; + name = "Dave Nicponski"; + }; vizanto = { email = "danny@prime.vc"; github = "vizanto"; @@ -5607,21 +6611,25 @@ vklquevs = { email = "vklquevs@gmail.com"; github = "vklquevs"; + githubId = 1771234; name = "vklquevs"; }; vlaci = { email = "laszlo.vasko@outlook.com"; github = "vlaci"; + githubId = 1771332; name = "László Vaskó"; }; vlstill = { email = "xstill@fi.muni.cz"; github = "vlstill"; + githubId = 4070422; name = "Vladimír Štill"; }; vmandela = { email = "venkat.mandela@gmail.com"; github = "vmandela"; + githubId = 849772; name = "Venkateswara Rao Mandela"; }; vmchale = { @@ -5632,11 +6640,13 @@ volhovm = { email = "volhovm.cs@gmail.com"; github = "volhovm"; + githubId = 5604643; name = "Mikhail Volkhov"; }; volth = { email = "jaroslavas@volth.com"; github = "volth"; + githubId = 508305; name = "Jaroslavas Pocepko"; }; vozz = { @@ -5646,31 +6656,37 @@ vrthra = { email = "rahul@gopinath.org"; github = "vrthra"; + githubId = 70410; name = "Rahul Gopinath"; }; vskilet = { email = "victor@sene.ovh"; github = "vskilet"; + githubId = 7677567; name = "Victor SENE"; }; vyorkin = { email = "vasiliy.yorkin@gmail.com"; github = "vyorkin"; + githubId = 988849; name = "Vasiliy Yorkin"; }; vyp = { email = "elisp.vim@gmail.com"; github = "vyp"; + githubId = 3889405; name = "vyp"; }; waynr = { name = "Wayne Warren"; email = "wayne.warren.s@gmail.com"; github = "waynr"; + githubId = 1441126; }; wchresta = { email = "wchresta.nix@chrummibei.ch"; github = "wchresta"; + githubId = 34962284; name = "wchresta"; }; wedens = { @@ -5680,6 +6696,7 @@ willibutz = { email = "willibutz@posteo.de"; github = "willibutz"; + githubId = 20464732; name = "Willi Butz"; }; willtim = { @@ -5693,36 +6710,43 @@ winpat = { email = "patrickwinter@posteo.ch"; github = "winpat"; + githubId = 6016963; name = "Patrick Winter"; }; wizeman = { email = "rcorreia@wizy.org"; github = "wizeman"; + githubId = 168610; name = "Ricardo M. Correia"; }; wjlroe = { email = "willroe@gmail.com"; github = "wjlroe"; + githubId = 43315; name = "William Roe"; }; wmertens = { email = "Wout.Mertens@gmail.com"; github = "wmertens"; + githubId = 54934; name = "Wout Mertens"; }; woffs = { email = "github@woffs.de"; github = "woffs"; + githubId = 895853; name = "Frank Doepper"; }; womfoo = { email = "kranium@gikos.net"; github = "womfoo"; + githubId = 1595132; name = "Kranium Gikos Mendoza"; }; worldofpeace = { email = "worldofpeace@protonmail.ch"; github = "worldofpeace"; + githubId = 28888242; name = "Worldofpeace"; }; wscott = { @@ -5733,31 +6757,37 @@ wucke13 = { email = "info@wucke13.de"; github = "wucke13"; + githubId = 20400405; name = "Wucke"; }; wykurz = { email = "wykurz@gmail.com"; github = "wykurz"; + githubId = 483465; name = "Mateusz Wykurz"; }; wyvie = { email = "elijahrum@gmail.com"; github = "wyvie"; + githubId = 3992240; name = "Elijah Rum"; }; xaverdh = { email = "hoe.dom@gmx.de"; github = "xaverdh"; + githubId = 11050617; name = "Dominik Xaver Hörl"; }; xbreak = { email = "xbreak@alphaware.se"; github = "xbreak"; + githubId = 13489144; name = "Calle Rosenquist"; }; xeji = { email = "xeji@cat3.de"; github = "xeji"; + githubId = 36407913; name = "Uli Baum"; }; xnaveira = { @@ -5768,31 +6798,37 @@ xnwdd = { email = "nwdd+nixos@no.team"; github = "xnwdd"; + githubId = 3028542; name = "Guillermo NWDD"; }; xrelkd = { email = "46590321+xrelkd@users.noreply.github.com"; github = "xrelkd"; + githubId = 46590321; name = "xrelkd"; }; xurei = { email = "olivier.bourdoux@gmail.com"; github = "xurei"; + githubId = 621695; name = "Olivier Bourdoux"; }; xvapx = { email = "marti.serra.coscollano@gmail.com"; github = "xvapx"; + githubId = 11824817; name = "Marti Serra"; }; xwvvvvwx = { email = "davidterry@posteo.de"; github = "xwvvvvwx"; + githubId = 6689924; name = "David Terry"; }; xzfc = { email = "xzfcpw@gmail.com"; github = "xzfc"; + githubId = 5121426; name = "Albert Safin"; }; y0no = { @@ -5803,71 +6839,85 @@ yarny = { email = "41838844+Yarny0@users.noreply.github.com"; github = "Yarny0"; + githubId = 41838844; name = "Yarny"; }; yarr = { email = "savraz@gmail.com"; github = "Eternity-Yarr"; + githubId = 3705333; name = "Dmitry V."; }; yegortimoshenko = { email = "yegortimoshenko@riseup.net"; github = "yegortimoshenko"; + githubId = 1643293; name = "Yegor Timoshenko"; }; yesbox = { email = "jesper.geertsen.jonsson@gmail.com"; github = "yesbox"; + githubId = 4113027; name = "Jesper Geertsen Jonsson"; }; ylwghst = { email = "ylwghst@onionmail.info"; github = "ylwghst"; + githubId = 26011724; name = "Burim Augustin Berisa"; }; yochai = { email = "yochai@titat.info"; github = "yochai"; + githubId = 1322201; name = "Yochai"; }; yorickvp = { email = "yorickvanpelt@gmail.com"; github = "yorickvp"; + githubId = 647076; name = "Yorick van Pelt"; }; yrashk = { email = "yrashk@gmail.com"; github = "yrashk"; + githubId = 452; name = "Yurii Rashkovskii"; }; ysndr = { email = "me@ysndr.de"; github = "ysndr"; + githubId = 7040031; name = "Yannik Sander"; }; yuriaisaka = { email = "yuri.aisaka+nix@gmail.com"; github = "yuriaisaka"; + githubId = 687198; name = "Yuri Aisaka"; }; yurrriq = { email = "eric@ericb.me"; github = "yurrriq"; + githubId = 1866448; name = "Eric Bailey"; }; z77z = { email = "maggesi@math.unifi.it"; github = "maggesi"; + githubId = 1809783; name = "Marco Maggesi"; }; zachcoyle = { email = "zach.coyle@gmail.com"; github = "zachcoyle"; + githubId = 908716; name = "Zach Coyle"; }; zagy = { email = "cz@flyingcircus.io"; github = "zagy"; + githubId = 568532; name = "Christian Zagrodnick"; }; zalakain = { @@ -5878,16 +6928,19 @@ zaninime = { email = "francesco@zanini.me"; github = "zaninime"; + githubId = 450885; name = "Francesco Zanini"; }; zarelit = { email = "david@zarel.net"; github = "zarelit"; + githubId = 3449926; name = "David Costa"; }; zauberpony = { email = "elmar@athmer.org"; github = "zauberpony"; + githubId = 250877; name = "Elmar Athmer"; }; zef = { @@ -5897,61 +6950,73 @@ zgrannan = { email = "zgrannan@gmail.com"; github = "zgrannan"; + githubId = 1141948; name = "Zack Grannan"; }; zimbatm = { email = "zimbatm@zimbatm.com"; github = "zimbatm"; + githubId = 3248; name = "zimbatm"; }; Zimmi48 = { email = "theo.zimmermann@univ-paris-diderot.fr"; github = "Zimmi48"; + githubId = 1108325; name = "Théo Zimmermann"; }; zohl = { email = "zohl@fmap.me"; github = "zohl"; + githubId = 6067895; name = "Al Zohali"; }; zookatron = { email = "tim@zookatron.com"; github = "zookatron"; + githubId = 1772064; name = "Tim Zook"; }; zoomulator = { email = "zoomulator@gmail.com"; github = "zoomulator"; + githubId = 1069303; name = "Kim Simmons"; }; zraexy = { email = "zraexy@gmail.com"; github = "zraexy"; + githubId = 8100652; name = "David Mell"; }; zx2c4 = { email = "Jason@zx2c4.com"; github = "zx2c4"; + githubId = 10643; name = "Jason A. Donenfeld"; }; zzamboni = { email = "diego@zzamboni.org"; github = "zzamboni"; + githubId = 32876; name = "Diego Zamboni"; }; turbomack = { email = "marek.faj@gmail.com"; github = "turboMaCk"; + githubId = 2130305; name = "Marek Fajkus"; }; melling = { email = "mattmelling@fastmail.com"; github = "mattmelling"; + githubId = 1215331; name = "Matt Melling"; }; wd15 = { email = "daniel.wheeler2@gmail.com"; github = "wd15"; + githubId = 1986844; name = "Daniel Wheeler"; }; } diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index 0963560a5bf..f9de2db1a08 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -5,55 +5,6 @@ with pkgs; let lib = pkgs.lib; - # Remove invisible and internal options. - optionsListVisible = lib.filter (opt: opt.visible && !opt.internal) (lib.optionAttrSetToDocList options); - - # Replace functions by the string <function> - substFunction = x: - if builtins.isAttrs x then lib.mapAttrs (name: substFunction) x - else if builtins.isList x then map substFunction x - else if lib.isFunction x then "<function>" - else x; - - # Generate DocBook documentation for a list of packages. This is - # what `relatedPackages` option of `mkOption` from - # ../../../lib/options.nix influences. - # - # Each element of `relatedPackages` can be either - # - a string: that will be interpreted as an attribute name from `pkgs`, - # - a list: that will be interpreted as an attribute path from `pkgs`, - # - an attrset: that can specify `name`, `path`, `package`, `comment` - # (either of `name`, `path` is required, the rest are optional). - genRelatedPackages = packages: - let - unpack = p: if lib.isString p then { name = p; } - else if lib.isList p then { path = p; } - else p; - describe = args: - let - title = args.title or null; - name = args.name or (lib.concatStringsSep "." args.path); - path = args.path or [ args.name ]; - package = args.package or (lib.attrByPath path (throw "Invalid package attribute path `${toString path}'") pkgs); - in "<listitem>" - + "<para><literal>${lib.optionalString (title != null) "${title} aka "}pkgs.${name} (${package.meta.name})</literal>" - + lib.optionalString (!package.meta.available) " <emphasis>[UNAVAILABLE]</emphasis>" - + ": ${package.meta.description or "???"}.</para>" - + lib.optionalString (args ? comment) "\n<para>${args.comment}</para>" - # Lots of `longDescription's break DocBook, so we just wrap them into <programlisting> - + lib.optionalString (package.meta ? longDescription) "\n<programlisting>${package.meta.longDescription}</programlisting>" - + "</listitem>"; - in "<itemizedlist>${lib.concatStringsSep "\n" (map (p: describe (unpack p)) packages)}</itemizedlist>"; - - optionsListDesc = lib.forEach optionsListVisible (opt: opt // { - # Clean up declaration sites to not refer to the NixOS source tree. - declarations = map stripAnyPrefixes opt.declarations; - } - // lib.optionalAttrs (opt ? example) { example = substFunction opt.example; } - // lib.optionalAttrs (opt ? default) { default = substFunction opt.default; } - // lib.optionalAttrs (opt ? type) { type = substFunction opt.type; } - // lib.optionalAttrs (opt ? relatedPackages && opt.relatedPackages != []) { relatedPackages = genRelatedPackages opt.relatedPackages; }); - # We need to strip references to /nix/store/* from options, # including any `extraSources` if some modules came from elsewhere, # or else the build will fail. @@ -63,37 +14,13 @@ let prefixesToStrip = map (p: "${toString p}/") ([ ../../.. ] ++ extraSources); stripAnyPrefixes = lib.flip (lib.fold lib.removePrefix) prefixesToStrip; - # Custom "less" that pushes up all the things ending in ".enable*" - # and ".package*" - optionLess = a: b: - let - ise = lib.hasPrefix "enable"; - isp = lib.hasPrefix "package"; - cmp = lib.splitByAndCompare ise lib.compare - (lib.splitByAndCompare isp lib.compare lib.compare); - in lib.compareLists cmp a.loc b.loc < 0; - - # Customly sort option list for the man page. - optionsList = lib.sort optionLess optionsListDesc; - - # Convert the list of options into an XML file. - optionsXML = builtins.toFile "options.xml" (builtins.toXML optionsList); - - optionsDocBook = runCommand "options-db.xml" {} '' - optionsXML=${optionsXML} - if grep /nixpkgs/nixos/modules $optionsXML; then - echo "The manual appears to depend on the location of Nixpkgs, which is bad" - echo "since this prevents sharing via the NixOS channel. This is typically" - echo "caused by an option default that refers to a relative path (see above" - echo "for hints about the offending path)." - exit 1 - fi - ${buildPackages.libxslt.bin}/bin/xsltproc \ - --stringparam revision '${revision}' \ - -o intermediate.xml ${./options-to-docbook.xsl} $optionsXML - ${buildPackages.libxslt.bin}/bin/xsltproc \ - -o "$out" ${./postprocess-option-descriptions.xsl} intermediate.xml - ''; + optionsDoc = buildPackages.nixosOptionsDoc { + inherit options revision; + transformOptions = opt: opt // { + # Clean up declaration sites to not refer to the NixOS source tree. + declarations = map stripAnyPrefixes opt.declarations; + }; + }; sources = lib.sourceFilesBySuffices ./. [".xml"]; @@ -108,7 +35,7 @@ let generatedSources = runCommand "generated-docbook" {} '' mkdir $out ln -s ${modulesDoc} $out/modules.xml - ln -s ${optionsDocBook} $out/options-db.xml + ln -s ${optionsDoc.optionsDocBook} $out/options-db.xml printf "%s" "${version}" > $out/version ''; @@ -234,22 +161,7 @@ let in rec { inherit generatedSources; - # The NixOS options in JSON format. - optionsJSON = runCommand "options-json" - { meta.description = "List of NixOS options in JSON format"; - } - '' - # Export list of options in different format. - dst=$out/share/doc/nixos - mkdir -p $dst - - cp ${builtins.toFile "options.json" (builtins.unsafeDiscardStringContext (builtins.toJSON - (builtins.listToAttrs (map (o: { name = o.name; value = removeAttrs o ["name" "visible" "internal"]; }) optionsList)))) - } $dst/options.json - - mkdir -p $out/nix-support - echo "file json $dst/options.json" >> $out/nix-support/hydra-build-products - ''; # */ + inherit (optionsDoc) optionsJSON optionsXML optionsDocBook; # Generate the NixOS manual. manualHTML = runCommand "nixos-manual-html" diff --git a/nixos/doc/manual/development/option-types.xml b/nixos/doc/manual/development/option-types.xml index 069cc36573d..8fcbb627342 100644 --- a/nixos/doc/manual/development/option-types.xml +++ b/nixos/doc/manual/development/option-types.xml @@ -348,6 +348,18 @@ </varlistentry> <varlistentry> <term> + <varname>types.oneOf</varname> [ <replaceable>t1</replaceable> <replaceable>t2</replaceable> ... ] + </term> + <listitem> + <para> + Type <replaceable>t1</replaceable> or type <replaceable>t2</replaceable> and so forth, + e.g. <literal>with types; oneOf [ int str bool ]</literal>. Multiple definitions + cannot be merged. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> <varname>types.coercedTo</varname> <replaceable>from</replaceable> <replaceable>f</replaceable> <replaceable>to</replaceable> </term> <listitem> diff --git a/nixos/doc/manual/development/releases.xml b/nixos/doc/manual/development/releases.xml index f45fecd16c3..3cb16d33cd4 100755 --- a/nixos/doc/manual/development/releases.xml +++ b/nixos/doc/manual/development/releases.xml @@ -100,6 +100,16 @@ </listitem> <listitem> <para> + Remove attributes that we know we will not be able to support, + especially if there is a stable alternative. E.g. Check that our + Linux kernels' + <link xlink:href="https://www.kernel.org/category/releases.html"> + projected end-of-life</link> are after our release projected + end-of-life + </para> + </listitem> + <listitem> + <para> Edit changelog at <literal>nixos/doc/manual/release-notes/rl-1709.xml</literal> (double check desktop versions are noted) diff --git a/nixos/doc/manual/installation/changing-config.xml b/nixos/doc/manual/installation/changing-config.xml index b77d71389a9..48193d986ab 100644 --- a/nixos/doc/manual/installation/changing-config.xml +++ b/nixos/doc/manual/installation/changing-config.xml @@ -14,6 +14,13 @@ to build the new configuration, make it the default configuration for booting, and try to realise the configuration in the running system (e.g., by restarting system services). + <warning> + <para> + This command doesn't start/stop <link linkend="opt-systemd.user.services">user + services</link> automatically. <command>nixos-rebuild</command> only runs a + <literal>daemon-reload</literal> for each user with running user services. + </para> + </warning> </para> <warning> <para> diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml index 742376378de..9cea2db610e 100644 --- a/nixos/doc/manual/installation/installing.xml +++ b/nixos/doc/manual/installation/installing.xml @@ -29,13 +29,14 @@ </para> <para> - You are logged-in automatically as <literal>root</literal>. (The - <literal>root</literal> user account has an empty password.) + You are logged-in automatically as <literal>nixos</literal>. + The <literal>nixos</literal> user account has an empty password so you + can use <command>sudo</command> without a password. </para> <para> If you downloaded the graphical ISO image, you can run <command>systemctl - start display-manager</command> to start KDE. If you want to continue on the + start display-manager</command> to start the desktop environment. If you want to continue on the terminal, you can use <command>loadkeys</command> to switch to your preferred keyboard layout. (We even provide neo2 via <command>loadkeys de neo</command>!) @@ -65,9 +66,9 @@ <para> If you would like to continue the installation from a different machine you - need to activate the SSH daemon via <literal>systemctl start - sshd</literal>. In order to be able to login you also need to set a - password for <literal>root</literal> using <literal>passwd</literal>. + need to activate the SSH daemon via <command>systemctl start + sshd</command>. You then must set a password for either <literal>root</literal> or + <literal>nixos</literal> with <command>passwd></command> to be able to login. </para> </section> </section> @@ -334,7 +335,7 @@ If you’re using the graphical ISO image, other editors may be available (such as <command>vim</command>). If you have network access, you can also install other editors — for instance, you can install Emacs by running - <literal>nix-env -i emacs</literal>. + <literal>nix-env -f '<nixpkgs>' -iA emacs</literal>. </para> <variablelist> <varlistentry> @@ -466,10 +467,10 @@ Retype new UNIX password: ***</screen> <para> You may also want to install some software. For instance, <screen> -<prompt>$ </prompt>nix-env -qa \*</screen> +<prompt>$ </prompt>nix-env -qaP \*</screen> shows what packages are available, and <screen> -<prompt>$ </prompt>nix-env -i w3m</screen> +<prompt>$ </prompt>nix-env -f '<nixpkgs>' -iA w3m</screen> install the <literal>w3m</literal> browser. </para> </listitem> diff --git a/nixos/doc/manual/man-nixos-enter.xml b/nixos/doc/manual/man-nixos-enter.xml index 42edaa1ae5b..1481db46712 100644 --- a/nixos/doc/manual/man-nixos-enter.xml +++ b/nixos/doc/manual/man-nixos-enter.xml @@ -34,6 +34,12 @@ </arg> <replaceable>shell-command</replaceable> </arg> + + <arg> + <arg choice='plain'> + <option>--silent</option> + </arg> + </arg> <arg> <arg choice='plain'> @@ -102,6 +108,16 @@ </varlistentry> <varlistentry> <term> + <option>--silent</option> + </term> + <listitem> + <para> + Suppresses all output from the activation script of the target system. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> <option>--</option> </term> <listitem> diff --git a/nixos/doc/manual/man-nixos-rebuild.xml b/nixos/doc/manual/man-nixos-rebuild.xml index 9cec83f1e28..4c20cfcdd7d 100644 --- a/nixos/doc/manual/man-nixos-rebuild.xml +++ b/nixos/doc/manual/man-nixos-rebuild.xml @@ -90,6 +90,35 @@ <arg> <option>--show-trace</option> </arg> + <arg> + <option>-I</option> + <replaceable>path</replaceable> + </arg> + <arg> + <group choice='req'> + <arg choice='plain'><option>--verbose</option></arg> + <arg choice='plain'><option>-v</option></arg> + </group> + </arg> + <arg> + <group choice='req'> + <arg choice='plain'><option>--max-jobs</option></arg> + <arg choice='plain'><option>-j</option></arg> + </group> + <replaceable>number</replaceable> + </arg> + <arg> + <group choice='req'> + <arg choice='plain'><option>--keep-failed</option></arg> + <arg choice='plain'><option>-K</option></arg> + </group> + </arg> + <arg> + <group choice='req'> + <arg choice='plain'><option>--keep-going</option></arg> + <arg choice='plain'><option>-k</option></arg> + </group> + </arg> </cmdsynopsis> </refsynopsisdiv> <refsection> @@ -101,7 +130,8 @@ NixOS module, you must run <command>nixos-rebuild</command> to make the changes take effect. It builds the new system in <filename>/nix/store</filename>, runs its activation script, and stop and - (re)starts any system services if needed. + (re)starts any system services if needed. Please note that user services need + to be started manually as they aren't detected by the activation script at the moment. </para> <para> This command has one required argument, which specifies the desired diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml index 398234cf025..ca2f26ec4a8 100644 --- a/nixos/doc/manual/release-notes/rl-1909.xml +++ b/nixos/doc/manual/release-notes/rl-1909.xml @@ -33,6 +33,21 @@ PHP 7.1 is no longer supported due to upstream not supporting this version for the entire lifecycle of the 19.09 release. </para> </listitem> + <listitem> + <para> + The binfmt module is now easier to use. Additional systems can + be added through <option>boot.binfmt.emulatedSystems</option>. + For instance, <literal>boot.binfmt.emulatedSystems = [ + "wasm32-wasi" "x86_64-windows" "aarch64-linux" ];</literal> will + set up binfmt interpreters for each of those listed systems. + </para> + </listitem> + <listitem> + <para> + The installer now uses a less privileged <literal>nixos</literal> user whereas before we logged in as root. + To gain root privileges use <literal>sudo -i</literal> without a password. + </para> + </listitem> </itemizedlist> </section> @@ -47,6 +62,13 @@ The following new services were added since the last release: </para> + <itemizedlist> + <listitem> + <para> + <literal>./programs/dwm-status.nix</literal> + </para> + </listitem> + </itemizedlist> </section> <section xmlns="http://docbook.org/ns/docbook" @@ -226,6 +248,21 @@ Only some exporters are affected by the latter, namely the exporters <literal>dovecot</literal>, <literal>node</literal>, <literal>postfix</literal> and <literal>varnish</literal>. </para> </listitem> + <listitem> + <para> + The <literal>ibus-qt</literal> package is not installed by default anymore when <xref linkend="opt-i18n.inputMethod.enabled" /> is set to <literal>ibus</literal>. + If IBus support in Qt 4.x applications is required, add the <literal>ibus-qt</literal> package to your <xref linkend="opt-environment.systemPackages" /> manually. + </para> + </listitem> + <listitem> + <para> + The CUPS Printing service now uses socket-based activation by + default, only starting when needed. The previous behavior can + be restored by setting + <option>services.cups.startWhenNeeded</option> to + <literal>false</literal>. + </para> + </listitem> </itemizedlist> </section> diff --git a/nixos/lib/build-vms.nix b/nixos/lib/build-vms.nix index 00ab189be0f..1bad63b9194 100644 --- a/nixos/lib/build-vms.nix +++ b/nixos/lib/build-vms.nix @@ -67,7 +67,7 @@ rec { in { key = "ip-address"; config = - { networking.hostName = m.fst; + { networking.hostName = mkDefault m.fst; networking.interfaces = listToAttrs interfaces; diff --git a/nixos/lib/make-options-doc/default.nix b/nixos/lib/make-options-doc/default.nix new file mode 100644 index 00000000000..88e052106a2 --- /dev/null +++ b/nixos/lib/make-options-doc/default.nix @@ -0,0 +1,164 @@ +/* Generate JSON, XML and DocBook documentation for given NixOS options. + + Minimal example: + + { pkgs, }: + + let + eval = import (pkgs.path + "/nixos/lib/eval-config.nix") { + baseModules = [ + ../module.nix + ]; + modules = []; + }; + in pkgs.nixosOptionsDoc { + options = eval.options; + } + +*/ +{ pkgs +, lib +, options +, transformOptions ? lib.id # function for additional tranformations of the options +, revision ? "" # Specify revision for the options +}: + +let + # Replace functions by the string <function> + substFunction = x: + if builtins.isAttrs x then lib.mapAttrs (name: substFunction) x + else if builtins.isList x then map substFunction x + else if lib.isFunction x then "<function>" + else x; + + optionsListDesc = lib.flip map optionsListVisible + (opt: transformOptions opt + // lib.optionalAttrs (opt ? example) { example = substFunction opt.example; } + // lib.optionalAttrs (opt ? default) { default = substFunction opt.default; } + // lib.optionalAttrs (opt ? type) { type = substFunction opt.type; } + // lib.optionalAttrs (opt ? relatedPackages && opt.relatedPackages != []) { relatedPackages = genRelatedPackages opt.relatedPackages; } + ); + + # Generate DocBook documentation for a list of packages. This is + # what `relatedPackages` option of `mkOption` from + # ../../../lib/options.nix influences. + # + # Each element of `relatedPackages` can be either + # - a string: that will be interpreted as an attribute name from `pkgs`, + # - a list: that will be interpreted as an attribute path from `pkgs`, + # - an attrset: that can specify `name`, `path`, `package`, `comment` + # (either of `name`, `path` is required, the rest are optional). + genRelatedPackages = packages: + let + unpack = p: if lib.isString p then { name = p; } + else if lib.isList p then { path = p; } + else p; + describe = args: + let + title = args.title or null; + name = args.name or (lib.concatStringsSep "." args.path); + path = args.path or [ args.name ]; + package = args.package or (lib.attrByPath path (throw "Invalid package attribute path `${toString path}'") pkgs); + in "<listitem>" + + "<para><literal>${lib.optionalString (title != null) "${title} aka "}pkgs.${name} (${package.meta.name})</literal>" + + lib.optionalString (!package.meta.available) " <emphasis>[UNAVAILABLE]</emphasis>" + + ": ${package.meta.description or "???"}.</para>" + + lib.optionalString (args ? comment) "\n<para>${args.comment}</para>" + # Lots of `longDescription's break DocBook, so we just wrap them into <programlisting> + + lib.optionalString (package.meta ? longDescription) "\n<programlisting>${package.meta.longDescription}</programlisting>" + + "</listitem>"; + in "<itemizedlist>${lib.concatStringsSep "\n" (map (p: describe (unpack p)) packages)}</itemizedlist>"; + + # Custom "less" that pushes up all the things ending in ".enable*" + # and ".package*" + optionLess = a: b: + let + ise = lib.hasPrefix "enable"; + isp = lib.hasPrefix "package"; + cmp = lib.splitByAndCompare ise lib.compare + (lib.splitByAndCompare isp lib.compare lib.compare); + in lib.compareLists cmp a.loc b.loc < 0; + + # Remove invisible and internal options. + optionsListVisible = lib.filter (opt: opt.visible && !opt.internal) (lib.optionAttrSetToDocList options); + + # Customly sort option list for the man page. + optionsList = lib.sort optionLess optionsListDesc; + + # Convert the list of options into an XML file. + optionsXML = builtins.toFile "options.xml" (builtins.toXML optionsList); + + optionsNix = builtins.listToAttrs (map (o: { name = o.name; value = removeAttrs o ["name" "visible" "internal"]; }) optionsList); + + # TODO: declarations: link to github + singleAsciiDoc = name: value: '' + == ${name} + + ${value.description} + + [discrete] + === details + + Type:: ${value.type} + ${ if lib.hasAttr "default" value + then '' + Default:: + + + ---- + ${builtins.toJSON value.default} + ---- + '' + else "No Default:: {blank}" + } + ${ if value.readOnly + then "Read Only:: {blank}" + else "" + } + ${ if lib.hasAttr "example" value + then '' + Example:: + + + ---- + ${builtins.toJSON value.example} + ---- + '' + else "No Example:: {blank}" + } + ''; + +in rec { + inherit optionsNix; + + optionsAsciiDoc = lib.concatStringsSep "\n" (lib.mapAttrsToList singleAsciiDoc optionsNix); + + optionsJSON = pkgs.runCommand "options.json" + { meta.description = "List of NixOS options in JSON format"; + } + '' + # Export list of options in different format. + dst=$out/share/doc/nixos + mkdir -p $dst + + cp ${builtins.toFile "options.json" (builtins.unsafeDiscardStringContext (builtins.toJSON optionsNix))} $dst/options.json + + mkdir -p $out/nix-support + echo "file json $dst/options.json" >> $out/nix-support/hydra-build-products + ''; # */ + + optionsDocBook = pkgs.runCommand "options-docbook.xml" {} '' + optionsXML=${optionsXML} + if grep /nixpkgs/nixos/modules $optionsXML; then + echo "The manual appears to depend on the location of Nixpkgs, which is bad" + echo "since this prevents sharing via the NixOS channel. This is typically" + echo "caused by an option default that refers to a relative path (see above" + echo "for hints about the offending path)." + exit 1 + fi + + ${pkgs.libxslt.bin}/bin/xsltproc \ + --stringparam revision '${revision}' \ + -o intermediate.xml ${./options-to-docbook.xsl} $optionsXML + ${pkgs.libxslt.bin}/bin/xsltproc \ + -o "$out" ${./postprocess-option-descriptions.xsl} intermediate.xml + ''; +} diff --git a/nixos/doc/manual/options-to-docbook.xsl b/nixos/lib/make-options-doc/options-to-docbook.xsl index 72ac89d4ff6..72ac89d4ff6 100644 --- a/nixos/doc/manual/options-to-docbook.xsl +++ b/nixos/lib/make-options-doc/options-to-docbook.xsl diff --git a/nixos/doc/manual/postprocess-option-descriptions.xsl b/nixos/lib/make-options-doc/postprocess-option-descriptions.xsl index 1201c7612c2..1201c7612c2 100644 --- a/nixos/doc/manual/postprocess-option-descriptions.xsl +++ b/nixos/lib/make-options-doc/postprocess-option-descriptions.xsl diff --git a/nixos/modules/config/timezone.nix b/nixos/modules/config/locale.nix index b15948f6e2e..6f056588187 100644 --- a/nixos/modules/config/timezone.nix +++ b/nixos/modules/config/locale.nix @@ -9,6 +9,8 @@ let timezone = types.nullOr (types.addCheck types.str nospace) // { description = "null or string without spaces"; }; + lcfg = config.location; + in { @@ -37,12 +39,45 @@ in }; }; + + location = { + + latitude = mkOption { + type = types.float; + description = '' + Your current latitude, between + <literal>-90.0</literal> and <literal>90.0</literal>. Must be provided + along with longitude. + ''; + }; + + longitude = mkOption { + type = types.float; + description = '' + Your current longitude, between + between <literal>-180.0</literal> and <literal>180.0</literal>. Must be + provided along with latitude. + ''; + }; + + provider = mkOption { + type = types.enum [ "manual" "geoclue2" ]; + default = "manual"; + description = '' + The location provider to use for determining your location. If set to + <literal>manual</literal> you must also provide latitude/longitude. + ''; + }; + + }; }; config = { environment.sessionVariables.TZDIR = "/etc/zoneinfo"; + services.geoclue2.enable = mkIf (lcfg.provider == "geoclue2") true; + # This way services are restarted when tzdata changes. systemd.globalEnvironment.TZDIR = tzdir; diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index c3f228c9bcc..25f1c67ce83 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -564,7 +564,10 @@ in { }; }) (filterAttrs (_: u: u.packages != []) cfg.users)); - environment.profiles = [ "/etc/profiles/per-user/$USER" ]; + environment.profiles = [ + "$HOME/.nix-profile" + "/etc/profiles/per-user/$USER" + ]; assertions = [ { assertion = !cfg.enforceIdUniqueness || (uidsAreUnique && gidsAreUnique); diff --git a/nixos/modules/hardware/device-tree.nix b/nixos/modules/hardware/device-tree.nix new file mode 100644 index 00000000000..f57502d4c83 --- /dev/null +++ b/nixos/modules/hardware/device-tree.nix @@ -0,0 +1,56 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.hardware.deviceTree; +in { + options = { + hardware.deviceTree = { + enable = mkOption { + default = pkgs.stdenv.hostPlatform.platform.kernelDTB or false; + type = types.bool; + description = '' + Build device tree files. These are used to describe the + non-discoverable hardware of a system. + ''; + }; + + base = mkOption { + default = "${config.boot.kernelPackages.kernel}/dtbs"; + defaultText = "\${config.boot.kernelPackages.kernel}/dtbs"; + example = literalExample "pkgs.deviceTree_rpi"; + type = types.path; + description = '' + The package containing the base device-tree (.dtb) to boot. Contains + device trees bundled with the Linux kernel by default. + ''; + }; + + overlays = mkOption { + default = []; + example = literalExample + "[\"\${pkgs.deviceTree_rpi.overlays}/w1-gpio.dtbo\"]"; + type = types.listOf types.path; + description = '' + A path containing device tree overlays (.dtbo) to be applied to all + base device-trees. + ''; + }; + + package = mkOption { + default = null; + type = types.nullOr types.path; + internal = true; + description = '' + A path containing the result of applying `overlays` to `base`. + ''; + }; + }; + }; + + config = mkIf (cfg.enable) { + hardware.deviceTree.package = if (cfg.overlays != []) + then pkgs.deviceTree.applyOverlays cfg.base cfg.overlays else cfg.base; + }; +} diff --git a/nixos/modules/i18n/input-method/ibus.nix b/nixos/modules/i18n/input-method/ibus.nix index f8e021f551e..8109ef76c40 100644 --- a/nixos/modules/i18n/input-method/ibus.nix +++ b/nixos/modules/i18n/input-method/ibus.nix @@ -55,7 +55,7 @@ in # Without dconf enabled it is impossible to use IBus environment.systemPackages = with pkgs; [ - ibus-qt gnome3.dconf ibusAutostart + gnome3.dconf ibusAutostart ]; environment.variables = { diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix index f65239a5bc0..1578e1547bc 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix @@ -8,16 +8,30 @@ with lib; { imports = [ ./installation-cd-base.nix ]; + # Whitelist wheel users to do anything + # This is useful for things like pkexec + # + # WARNING: this is dangerous for systems + # outside the installation-cd and shouldn't + # be used anywhere else. + security.polkit.extraConfig = '' + polkit.addRule(function(action, subject) { + if (subject.isInGroup("wheel")) { + return polkit.Result.YES; + } + }); + ''; + services.xserver = { enable = true; # Don't start the X server by default. autorun = mkForce false; - # Automatically login as root. + # Automatically login as nixos. displayManager.slim = { enable = true; - defaultUser = "root"; + defaultUser = "nixos"; autoLogin = true; }; @@ -33,7 +47,6 @@ with lib; # Enable sound in graphical iso's. hardware.pulseaudio.enable = true; - hardware.pulseaudio.systemWide = true; # Needed since we run plasma as root. environment.systemPackages = [ # Include gparted for partitioning disks. diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix index 1c3c9cb30b4..2536ba73a1d 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix @@ -1,5 +1,5 @@ # This module defines a NixOS installation CD that contains X11 and -# Plasma5. +# Plasma 5. { config, lib, pkgs, ... }: @@ -30,15 +30,20 @@ with lib; Version=1.0 Type=Application Name=NixOS Manual - Exec=firefox ${config.system.build.manual.manualHTMLIndex} + Exec=firefox ${config.system.build.manual.manual}/share/doc/nixos/index.html Icon=text-html ''; + homeDir = "/home/nixos/"; + desktopDir = homeDir + "Desktop/"; + in '' - mkdir -p /root/Desktop - ln -sfT ${manualDesktopFile} /root/Desktop/nixos-manual.desktop - ln -sfT ${pkgs.konsole}/share/applications/org.kde.konsole.desktop /root/Desktop/org.kde.konsole.desktop - ln -sfT ${pkgs.gparted}/share/applications/gparted.desktop /root/Desktop/gparted.desktop + mkdir -p ${desktopDir} + chown nixos ${homeDir} ${desktopDir} + + ln -sfT ${manualDesktopFile} ${desktopDir + "nixos-manual.desktop"} + ln -sfT ${pkgs.gparted}/share/applications/gparted.desktop ${desktopDir + "gparted.desktop"} + ln -sfT ${pkgs.konsole}/share/applications/org.kde.konsole.desktop ${desktopDir + "org.kde.konsole.desktop"} ''; } diff --git a/nixos/modules/installer/tools/nixos-enter.sh b/nixos/modules/installer/tools/nixos-enter.sh index 518dbbbf21e..4680cd8ae95 100644 --- a/nixos/modules/installer/tools/nixos-enter.sh +++ b/nixos/modules/installer/tools/nixos-enter.sh @@ -16,7 +16,8 @@ fi mountPoint=/mnt system=/nix/var/nix/profiles/system -command=($system/sw/bin/bash "--login") +command=("$system/sw/bin/bash" "--login") +silent=0 while [ "$#" -gt 0 ]; do i="$1"; shift 1 @@ -32,9 +33,12 @@ while [ "$#" -gt 0 ]; do exit 1 ;; --command|-c) - command=($system/sw/bin/bash "-c" "$1") + command=("$system/sw/bin/bash" "-c" "$1") shift 1 ;; + --silent) + silent=1 + ;; --) command=("$@") break @@ -51,11 +55,20 @@ if [[ ! -e $mountPoint/etc/NIXOS ]]; then exit 126 fi -mkdir -m 0755 -p "$mountPoint/dev" "$mountPoint/sys" +mkdir -p "$mountPoint/dev" "$mountPoint/sys" +chmod 0755 "$mountPoint/dev" "$mountPoint/sys" mount --rbind /dev "$mountPoint/dev" mount --rbind /sys "$mountPoint/sys" +# If silent, write both stdout and stderr of activation script to /dev/null +# otherwise, write both streams to stderr of this process +if [ "$silent" -eq 0 ]; then + PIPE_TARGET="/dev/stderr" +else + PIPE_TARGET="/dev/null" +fi + # Run the activation script. Set $LOCALE_ARCHIVE to supress some Perl locale warnings. -LOCALE_ARCHIVE=$system/sw/lib/locale/locale-archive chroot "$mountPoint" "$system/activate" >&2 || true +LOCALE_ARCHIVE="$system/sw/lib/locale/locale-archive" chroot "$mountPoint" "$system/activate" >>$PIPE_TARGET 2>&1 || true exec chroot "$mountPoint" "${command[@]}" diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index c09def1fcea..cfdbdaabf5c 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -607,90 +607,7 @@ EOF } write_file($fn, <<EOF); -# Edit this configuration file to define what should be installed on -# your system. Help is available in the configuration.nix(5) man page -# and in the NixOS manual (accessible by running ‘nixos-help’). - -{ config, pkgs, ... }: - -{ - imports = - [ # Include the results of the hardware scan. - ./hardware-configuration.nix - ]; - -$bootLoaderConfig - # networking.hostName = "nixos"; # Define your hostname. - # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. - - # Configure network proxy if necessary - # networking.proxy.default = "http://user:password\@proxy:port/"; - # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; - - # Select internationalisation properties. - # i18n = { - # consoleFont = "Lat2-Terminus16"; - # consoleKeyMap = "us"; - # defaultLocale = "en_US.UTF-8"; - # }; - - # Set your time zone. - # time.timeZone = "Europe/Amsterdam"; - - # List packages installed in system profile. To search, run: - # \$ nix search wget - # environment.systemPackages = with pkgs; [ - # wget vim - # ]; - - # Some programs need SUID wrappers, can be configured further or are - # started in user sessions. - # programs.mtr.enable = true; - # programs.gnupg.agent = { enable = true; enableSSHSupport = true; }; - - # List services that you want to enable: - - # Enable the OpenSSH daemon. - # services.openssh.enable = true; - - # Open ports in the firewall. - # networking.firewall.allowedTCPPorts = [ ... ]; - # networking.firewall.allowedUDPPorts = [ ... ]; - # Or disable the firewall altogether. - # networking.firewall.enable = false; - - # Enable CUPS to print documents. - # services.printing.enable = true; - - # Enable sound. - # sound.enable = true; - # hardware.pulseaudio.enable = true; - - # Enable the X11 windowing system. - # services.xserver.enable = true; - # services.xserver.layout = "us"; - # services.xserver.xkbOptions = "eurosign:e"; - - # Enable touchpad support. - # services.xserver.libinput.enable = true; - - # Enable the KDE Desktop Environment. - # services.xserver.displayManager.sddm.enable = true; - # services.xserver.desktopManager.plasma5.enable = true; - - # Define a user account. Don't forget to set a password with ‘passwd’. - # users.users.jane = { - # isNormalUser = true; - # extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. - # }; - - # This value determines the NixOS release with which your system is to be - # compatible, in order to avoid breaking some software such as database - # servers. You should change this only after NixOS release notes say you - # should. - system.stateVersion = "${\(qw(@release@))}"; # Did you read the comment? - -} +@configuration@ EOF } else { print STDERR "warning: not overwriting existing $fn\n"; diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index 59eb4a63af4..05add59117d 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -38,7 +38,7 @@ let src = ./nixos-generate-config.pl; path = lib.optionals (lib.elem "btrfs" config.boot.supportedFilesystems) [ pkgs.btrfs-progs ]; perl = "${pkgs.perl}/bin/perl -I${pkgs.perlPackages.FileSlurp}/${pkgs.perl.libPrefix}"; - inherit (config.system.nixos) release; + inherit (config.system.nixos-generate-config) configuration; }; nixos-option = makeProg { @@ -61,8 +61,111 @@ in { + options.system.nixos-generate-config.configuration = mkOption { + internal = true; + type = types.str; + description = '' + The NixOS module that <literal>nixos-generate-config</literal> + saves to <literal>/etc/nixos/configuration.nix</literal>. + + This is an internal option. No backward compatibility is guaranteed. + Use at your own risk! + + Note that this string gets spliced into a Perl script. The perl + variable <literal>$bootLoaderConfig</literal> can be used to + splice in the boot loader configuration. + ''; + }; + config = { + system.nixos-generate-config.configuration = mkDefault '' + # Edit this configuration file to define what should be installed on + # your system. Help is available in the configuration.nix(5) man page + # and in the NixOS manual (accessible by running ‘nixos-help’). + + { config, pkgs, ... }: + + { + imports = + [ # Include the results of the hardware scan. + ./hardware-configuration.nix + ]; + + $bootLoaderConfig + # networking.hostName = "nixos"; # Define your hostname. + # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. + + # Configure network proxy if necessary + # networking.proxy.default = "http://user:password\@proxy:port/"; + # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; + + # Select internationalisation properties. + # i18n = { + # consoleFont = "Lat2-Terminus16"; + # consoleKeyMap = "us"; + # defaultLocale = "en_US.UTF-8"; + # }; + + # Set your time zone. + # time.timeZone = "Europe/Amsterdam"; + + # List packages installed in system profile. To search, run: + # \$ nix search wget + # environment.systemPackages = with pkgs; [ + # wget vim + # ]; + + # Some programs need SUID wrappers, can be configured further or are + # started in user sessions. + # programs.mtr.enable = true; + # programs.gnupg.agent = { enable = true; enableSSHSupport = true; }; + + # List services that you want to enable: + + # Enable the OpenSSH daemon. + # services.openssh.enable = true; + + # Open ports in the firewall. + # networking.firewall.allowedTCPPorts = [ ... ]; + # networking.firewall.allowedUDPPorts = [ ... ]; + # Or disable the firewall altogether. + # networking.firewall.enable = false; + + # Enable CUPS to print documents. + # services.printing.enable = true; + + # Enable sound. + # sound.enable = true; + # hardware.pulseaudio.enable = true; + + # Enable the X11 windowing system. + # services.xserver.enable = true; + # services.xserver.layout = "us"; + # services.xserver.xkbOptions = "eurosign:e"; + + # Enable touchpad support. + # services.xserver.libinput.enable = true; + + # Enable the KDE Desktop Environment. + # services.xserver.displayManager.sddm.enable = true; + # services.xserver.desktopManager.plasma5.enable = true; + + # Define a user account. Don't forget to set a password with ‘passwd’. + # users.users.jane = { + # isNormalUser = true; + # extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. + # }; + + # This value determines the NixOS release with which your system is to be + # compatible, in order to avoid breaking some software such as database + # servers. You should change this only after NixOS release notes say you + # should. + system.stateVersion = "${config.system.nixos.release}"; # Did you read the comment? + + } + ''; + environment.systemPackages = [ nixos-build-vms nixos-install diff --git a/nixos/modules/misc/crashdump.nix b/nixos/modules/misc/crashdump.nix index 6e0b49fa9af..3c47e79d051 100644 --- a/nixos/modules/misc/crashdump.nix +++ b/nixos/modules/misc/crashdump.nix @@ -58,7 +58,6 @@ in "crashkernel=${crashdump.reservedMemory}" "nmi_watchdog=panic" "softlockup_panic=1" - "idle=poll" ]; kernelPatches = [ { name = "crashdump-config"; diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index e0c192246c0..afb74581e23 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -19,7 +19,7 @@ let lhs = optCall lhs_ { inherit pkgs; }; rhs = optCall rhs_ { inherit pkgs; }; in - lhs // rhs // + recursiveUpdate lhs rhs // optionalAttrs (lhs ? packageOverrides) { packageOverrides = pkgs: optCall lhs.packageOverrides pkgs // diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 15990177d74..a167336c156 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -20,6 +20,7 @@ ./config/iproute2.nix ./config/krb5/default.nix ./config/ldap.nix + ./config/locale.nix ./config/malloc.nix ./config/networking.nix ./config/no-x-libs.nix @@ -33,7 +34,6 @@ ./config/system-environment.nix ./config/system-path.nix ./config/terminfo.nix - ./config/timezone.nix ./config/unix-odbc-drivers.nix ./config/users-groups.nix ./config/vpnc.nix @@ -46,6 +46,7 @@ ./hardware/cpu/amd-microcode.nix ./hardware/cpu/intel-microcode.nix ./hardware/digitalbitbox.nix + ./hardware/device-tree.nix ./hardware/sensor/iio.nix ./hardware/ksm.nix ./hardware/ledger.nix @@ -106,9 +107,15 @@ ./programs/digitalbitbox/default.nix ./programs/dmrconfig.nix ./programs/environment.nix + ./programs/evince.nix + ./programs/file-roller.nix ./programs/firejail.nix ./programs/fish.nix ./programs/freetds.nix + ./programs/fuse.nix + ./programs/gnome-disks.nix + ./programs/gnome-documents.nix + ./programs/gpaste.nix ./programs/gnupg.nix ./programs/gphoto2.nix ./programs/iftop.nix @@ -209,6 +216,7 @@ ./services/backup/duplicity.nix ./services/backup/mysql-backup.nix ./services/backup/postgresql-backup.nix + ./services/backup/postgresql-wal-receiver.nix ./services/backup/restic.nix ./services/backup/restic-rest-server.nix ./services/backup/rsnapshot.nix @@ -280,12 +288,8 @@ ./services/desktops/pipewire.nix ./services/desktops/gnome3/at-spi2-core.nix ./services/desktops/gnome3/chrome-gnome-shell.nix - ./services/desktops/gnome3/evince.nix ./services/desktops/gnome3/evolution-data-server.nix - ./services/desktops/gnome3/file-roller.nix ./services/desktops/gnome3/glib-networking.nix - ./services/desktops/gnome3/gnome-disks.nix - ./services/desktops/gnome3/gnome-documents.nix ./services/desktops/gnome3/gnome-keyring.nix ./services/desktops/gnome3/gnome-online-accounts.nix ./services/desktops/gnome3/gnome-remote-desktop.nix @@ -293,7 +297,6 @@ ./services/desktops/gnome3/gnome-settings-daemon.nix ./services/desktops/gnome3/gnome-terminal-server.nix ./services/desktops/gnome3/gnome-user-share.nix - ./services/desktops/gnome3/gpaste.nix ./services/desktops/gnome3/gvfs.nix ./services/desktops/gnome3/rygel.nix ./services/desktops/gnome3/seahorse.nix @@ -402,6 +405,7 @@ ./services/misc/couchpotato.nix ./services/misc/devmon.nix ./services/misc/dictd.nix + ./services/misc/dwm-status.nix ./services/misc/dysnomia.nix ./services/misc/disnix.nix ./services/misc/docker-registry.nix @@ -818,6 +822,7 @@ ./services/web-servers/varnish/default.nix ./services/web-servers/zope2.nix ./services/x11/extra-layouts.nix + ./services/x11/clight.nix ./services/x11/colord.nix ./services/x11/compton.nix ./services/x11/unclutter.nix diff --git a/nixos/modules/profiles/hardened.nix b/nixos/modules/profiles/hardened.nix index 9e9ddd4f378..3ff9a2b4fde 100644 --- a/nixos/modules/profiles/hardened.nix +++ b/nixos/modules/profiles/hardened.nix @@ -44,6 +44,9 @@ with lib; # Disable legacy virtual syscalls "vsyscall=none" + + # Enable page allocator randomization + "page_alloc.shuffle=1" ]; boot.blacklistedKernelModules = [ @@ -121,4 +124,7 @@ with lib; # Ignore outgoing ICMP redirects (this is ipv4 only) boot.kernel.sysctl."net.ipv4.conf.all.send_redirects" = mkDefault false; boot.kernel.sysctl."net.ipv4.conf.default.send_redirects" = mkDefault false; + + # Restrict userfaultfd syscalls to processes with the SYS_PTRACE capability + boot.kernel.sysctl."vm.unprivileged_userfaultfd" = mkDefault false; } diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix index 580ea4a58e5..1a6e0699560 100644 --- a/nixos/modules/profiles/installation-device.nix +++ b/nixos/modules/profiles/installation-device.nix @@ -32,19 +32,35 @@ with lib; #services.rogue.enable = true; # Disable some other stuff we don't need. - security.sudo.enable = mkDefault false; services.udisks2.enable = mkDefault false; + # Use less privileged nixos user + users.users.nixos = { + isNormalUser = true; + extraGroups = [ "wheel" "networkmanager" "video" ]; + # Allow the graphical user to login without password + initialHashedPassword = ""; + }; + + # Allow the user to log in as root without a password. + users.users.root.initialHashedPassword = ""; + + # Allow passwordless sudo from nixos user + security.sudo = { + enable = mkDefault true; + wheelNeedsPassword = mkForce false; + }; + # Automatically log in at the virtual consoles. - services.mingetty.autologinUser = "root"; + services.mingetty.autologinUser = "nixos"; # Some more help text. services.mingetty.helpLine = '' - The "root" account has an empty password. ${ + The "nixos" and "root" account have empty passwords. ${ optionalString config.services.xserver.enable - "Type `systemctl start display-manager' to\nstart the graphical user interface."} + "Type `sudo systemctl start display-manager' to\nstart the graphical user interface."} ''; # Allow sshd to be started manually through "systemctl start sshd". @@ -86,8 +102,5 @@ with lib; # because we have the firewall enabled. This makes installs from the # console less cumbersome if the machine has a public IP. networking.firewall.logRefusedConnections = mkDefault false; - - # Allow the user to log in as root without a password. - users.users.root.initialHashedPassword = ""; }; } diff --git a/nixos/modules/programs/environment.nix b/nixos/modules/programs/environment.nix index 3c6d356ef99..4d762314298 100644 --- a/nixos/modules/programs/environment.nix +++ b/nixos/modules/programs/environment.nix @@ -23,9 +23,8 @@ in XCURSOR_PATH = [ "$HOME/.icons" ]; }; - environment.profiles = - [ "$HOME/.nix-profile" - "/nix/var/nix/profiles/default" + environment.profiles = mkAfter + [ "/nix/var/nix/profiles/default" "/run/current-system/sw" ]; diff --git a/nixos/modules/services/desktops/gnome3/evince.nix b/nixos/modules/programs/evince.nix index 5f040a16f06..473fddb09d0 100644 --- a/nixos/modules/services/desktops/gnome3/evince.nix +++ b/nixos/modules/programs/evince.nix @@ -6,14 +6,21 @@ with lib; { + # Added 2019-08-09 + imports = [ + (mkRenamedOptionModule + [ "services" "gnome3" "evince" "enable" ] + [ "programs" "evince" "enable" ]) + ]; + ###### interface options = { - services.gnome3.evince = { + programs.evince = { enable = mkEnableOption - "systemd and dbus services for Evince, the GNOME document viewer"; + "Evince, the GNOME document viewer"; }; @@ -22,7 +29,7 @@ with lib; ###### implementation - config = mkIf config.services.gnome3.evince.enable { + config = mkIf config.programs.evince.enable { environment.systemPackages = [ pkgs.evince ]; diff --git a/nixos/modules/services/desktops/gnome3/file-roller.nix b/nixos/modules/programs/file-roller.nix index 7fb558a9895..64f6a94e764 100644 --- a/nixos/modules/services/desktops/gnome3/file-roller.nix +++ b/nixos/modules/programs/file-roller.nix @@ -6,11 +6,18 @@ with lib; { + # Added 2019-08-09 + imports = [ + (mkRenamedOptionModule + [ "services" "gnome3" "file-roller" "enable" ] + [ "programs" "file-roller" "enable" ]) + ]; + ###### interface options = { - services.gnome3.file-roller = { + programs.file-roller = { enable = mkEnableOption "File Roller, an archive manager for GNOME"; @@ -21,7 +28,7 @@ with lib; ###### implementation - config = mkIf config.services.gnome3.file-roller.enable { + config = mkIf config.programs.file-roller.enable { environment.systemPackages = [ pkgs.gnome3.file-roller ]; diff --git a/nixos/modules/programs/fuse.nix b/nixos/modules/programs/fuse.nix new file mode 100644 index 00000000000..c15896efbb5 --- /dev/null +++ b/nixos/modules/programs/fuse.nix @@ -0,0 +1,37 @@ +{ config, lib, ... }: + +with lib; + +let + cfg = config.programs.fuse; +in { + meta.maintainers = with maintainers; [ primeos ]; + + options.programs.fuse = { + mountMax = mkOption { + # In the C code it's an "int" (i.e. signed and at least 16 bit), but + # negative numbers obviously make no sense: + type = types.ints.between 0 32767; # 2^15 - 1 + default = 1000; + description = '' + Set the maximum number of FUSE mounts allowed to non-root users. + ''; + }; + + userAllowOther = mkOption { + type = types.bool; + default = false; + description = '' + Allow non-root users to specify the allow_other or allow_root mount + options, see mount.fuse3(8). + ''; + }; + }; + + config = { + environment.etc."fuse.conf".text = '' + ${optionalString (!cfg.userAllowOther) "#"}user_allow_other + mount_max = ${toString cfg.mountMax} + ''; + }; +} diff --git a/nixos/modules/services/desktops/gnome3/gnome-disks.nix b/nixos/modules/programs/gnome-disks.nix index 139534cdb89..1cf839a6ddb 100644 --- a/nixos/modules/services/desktops/gnome3/gnome-disks.nix +++ b/nixos/modules/programs/gnome-disks.nix @@ -1,4 +1,4 @@ -# GNOME Disks daemon. +# GNOME Disks. { config, pkgs, lib, ... }: @@ -6,17 +6,24 @@ with lib; { + # Added 2019-08-09 + imports = [ + (mkRenamedOptionModule + [ "services" "gnome3" "gnome-disks" "enable" ] + [ "programs" "gnome-disks" "enable" ]) + ]; + ###### interface options = { - services.gnome3.gnome-disks = { + programs.gnome-disks = { enable = mkOption { type = types.bool; default = false; description = '' - Whether to enable GNOME Disks daemon, a service designed to + Whether to enable GNOME Disks daemon, a program designed to be a UDisks2 graphical front-end. ''; }; @@ -28,7 +35,7 @@ with lib; ###### implementation - config = mkIf config.services.gnome3.gnome-disks.enable { + config = mkIf config.programs.gnome-disks.enable { environment.systemPackages = [ pkgs.gnome3.gnome-disk-utility ]; diff --git a/nixos/modules/services/desktops/gnome3/gnome-documents.nix b/nixos/modules/programs/gnome-documents.nix index f6efb668424..bfa3d409ee3 100644 --- a/nixos/modules/services/desktops/gnome3/gnome-documents.nix +++ b/nixos/modules/programs/gnome-documents.nix @@ -1,4 +1,4 @@ -# GNOME Documents daemon. +# GNOME Documents. { config, pkgs, lib, ... }: @@ -6,17 +6,24 @@ with lib; { + # Added 2019-08-09 + imports = [ + (mkRenamedOptionModule + [ "services" "gnome3" "gnome-documents" "enable" ] + [ "programs" "gnome-documents" "enable" ]) + ]; + ###### interface options = { - services.gnome3.gnome-documents = { + programs.gnome-documents = { enable = mkOption { type = types.bool; default = false; description = '' - Whether to enable GNOME Documents services, a document + Whether to enable GNOME Documents, a document manager application for GNOME. ''; }; @@ -28,7 +35,7 @@ with lib; ###### implementation - config = mkIf config.services.gnome3.gnome-documents.enable { + config = mkIf config.programs.gnome-documents.enable { environment.systemPackages = [ pkgs.gnome3.gnome-documents ]; diff --git a/nixos/modules/services/desktops/gnome3/gpaste.nix b/nixos/modules/programs/gpaste.nix index 5a8258775e0..4f6deb77e5e 100644 --- a/nixos/modules/services/desktops/gnome3/gpaste.nix +++ b/nixos/modules/programs/gpaste.nix @@ -1,12 +1,20 @@ -# GPaste daemon. +# GPaste. { config, lib, pkgs, ... }: with lib; { + + # Added 2019-08-09 + imports = [ + (mkRenamedOptionModule + [ "services" "gnome3" "gpaste" "enable" ] + [ "programs" "gpaste" "enable" ]) + ]; + ###### interface options = { - services.gnome3.gpaste = { + programs.gpaste = { enable = mkOption { type = types.bool; default = false; @@ -18,10 +26,9 @@ with lib; }; ###### implementation - config = mkIf config.services.gnome3.gpaste.enable { + config = mkIf config.programs.gpaste.enable { environment.systemPackages = [ pkgs.gnome3.gpaste ]; services.dbus.packages = [ pkgs.gnome3.gpaste ]; - services.xserver.desktopManager.gnome3.sessionPath = [ pkgs.gnome3.gpaste ]; systemd.packages = [ pkgs.gnome3.gpaste ]; }; } diff --git a/nixos/modules/programs/nylas-mail.nix b/nixos/modules/programs/nylas-mail.nix deleted file mode 100644 index 08a6cd0a604..00000000000 --- a/nixos/modules/programs/nylas-mail.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.services.nylas-mail; -in { - ###### interface - options = { - services.nylas-mail = { - - enable = mkEnableOption '' - nylas-mail - Open-source mail client built on the modern web with Electron, React, and Flux - ''; - - gnome3-keyring = mkOption { - type = types.bool; - default = true; - description = "Enable gnome3 keyring for nylas-mail."; - }; - }; - }; - - - ###### implementation - - config = mkIf cfg.enable { - - environment.systemPackages = [ pkgs.nylas-mail-bin ]; - - services.gnome3.gnome-keyring = mkIf cfg.gnome3-keyring { - enable = true; - }; - - }; -} diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 04aed617366..3ea139fc5ce 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -51,6 +51,10 @@ with lib; (mkRemovedOptionModule [ "services" "misc" "nzbget" "openFirewall" ] "The port used by nzbget is managed through the web interface so you should adjust your firewall rules accordingly.") (mkRemovedOptionModule [ "services" "prometheus" "alertmanager" "user" ] "The alertmanager service is now using systemd's DynamicUser mechanism which obviates a user setting.") (mkRemovedOptionModule [ "services" "prometheus" "alertmanager" "group" ] "The alertmanager service is now using systemd's DynamicUser mechanism which obviates a group setting.") + (mkRemovedOptionModule [ "services" "prometheus2" "alertmanagerURL" ] '' + Due to incompatibility, the alertmanagerURL option has been removed, + please use 'services.prometheus2.alertmanagers' instead. + '') (mkRenamedOptionModule [ "services" "tor" "relay" "portSpec" ] [ "services" "tor" "relay" "port" ]) (mkRenamedOptionModule [ "services" "vmwareGuest" ] [ "virtualisation" "vmware" "guest" ]) (mkRenamedOptionModule [ "jobs" ] [ "systemd" "services" ]) @@ -221,6 +225,7 @@ with lib; (mkRemovedOptionModule [ "services" "mysql" "pidDir" ] "Don't wait for pidfiles, describe dependencies through systemd") (mkRemovedOptionModule [ "services" "mysql" "rootPassword" ] "Use socket authentication or set the password outside of the nix store.") (mkRemovedOptionModule [ "services" "zabbixServer" "dbPassword" ] "Use services.zabbixServer.database.passwordFile instead.") + (mkRemovedOptionModule [ "systemd" "generator-packages" ] "Use systemd.packages instead.") # ZSH (mkRenamedOptionModule [ "programs" "zsh" "enableSyntaxHighlighting" ] [ "programs" "zsh" "syntaxHighlighting" "enable" ]) @@ -257,6 +262,20 @@ with lib; (mkRenamedOptionModule [ "networking" "extraResolvconfConf" ] [ "networking" "resolvconf" "extraConfig" ]) (mkRenamedOptionModule [ "networking" "resolvconfOptions" ] [ "networking" "resolvconf" "extraOptions" ]) + # Redshift + (mkChangedOptionModule [ "services" "redshift" "latitude" ] [ "location" "latitude" ] + (config: + let value = getAttrFromPath [ "services" "redshift" "latitude" ] config; + in if value == null then + throw "services.redshift.latitude is set to null, you can remove this" + else builtins.fromJSON value)) + (mkChangedOptionModule [ "services" "redshift" "longitude" ] [ "location" "longitude" ] + (config: + let value = getAttrFromPath [ "services" "redshift" "longitude" ] config; + in if value == null then + throw "services.redshift.longitude is set to null, you can remove this" + else builtins.fromJSON value)) + ] ++ (forEach [ "blackboxExporter" "collectdExporter" "fritzboxExporter" "jsonExporter" "minioExporter" "nginxExporter" "nodeExporter" "snmpExporter" "unifiExporter" "varnishExporter" ] diff --git a/nixos/modules/services/admin/oxidized.nix b/nixos/modules/services/admin/oxidized.nix index 687cdfb5ba5..39112c3970d 100644 --- a/nixos/modules/services/admin/oxidized.nix +++ b/nixos/modules/services/admin/oxidized.nix @@ -97,8 +97,8 @@ in preStart = '' mkdir -p ${cfg.dataDir}/.config/oxidized - cp -v ${cfg.routerDB} ${cfg.dataDir}/.config/oxidized/router.db - cp -v ${cfg.configFile} ${cfg.dataDir}/.config/oxidized/config + ln -f -s ${cfg.routerDB} ${cfg.dataDir}/.config/oxidized/router.db + ln -f -s ${cfg.configFile} ${cfg.dataDir}/.config/oxidized/config ''; serviceConfig = { diff --git a/nixos/modules/services/backup/automysqlbackup.nix b/nixos/modules/services/backup/automysqlbackup.nix index b845f370fb7..1884f3536a9 100644 --- a/nixos/modules/services/backup/automysqlbackup.nix +++ b/nixos/modules/services/backup/automysqlbackup.nix @@ -41,7 +41,7 @@ in }; config = mkOption { - type = with types; attrsOf (either (either str (either int bool)) (listOf str)); + type = with types; attrsOf (oneOf [ str int bool (listOf str) ]); default = {}; description = '' automysqlbackup configuration. Refer to diff --git a/nixos/modules/services/backup/postgresql-wal-receiver.nix b/nixos/modules/services/backup/postgresql-wal-receiver.nix new file mode 100644 index 00000000000..d9a37037992 --- /dev/null +++ b/nixos/modules/services/backup/postgresql-wal-receiver.nix @@ -0,0 +1,203 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + receiverSubmodule = { + options = { + postgresqlPackage = mkOption { + type = types.package; + example = literalExample "pkgs.postgresql_11"; + description = '' + PostgreSQL package to use. + ''; + }; + + directory = mkOption { + type = types.path; + example = literalExample "/mnt/pg_wal/main/"; + description = '' + Directory to write the output to. + ''; + }; + + statusInterval = mkOption { + type = types.int; + default = 10; + description = '' + Specifies the number of seconds between status packets sent back to the server. + This allows for easier monitoring of the progress from server. + A value of zero disables the periodic status updates completely, + although an update will still be sent when requested by the server, to avoid timeout disconnect. + ''; + }; + + slot = mkOption { + type = types.str; + default = ""; + example = "some_slot_name"; + description = '' + Require <command>pg_receivewal</command> to use an existing replication slot (see + <link xlink:href="https://www.postgresql.org/docs/current/warm-standby.html#STREAMING-REPLICATION-SLOTS">Section 26.2.6 of the PostgreSQL manual</link>). + When this option is used, <command>pg_receivewal</command> will report a flush position to the server, + indicating when each segment has been synchronized to disk so that the server can remove that segment if it is not otherwise needed. + + When the replication client of <command>pg_receivewal</command> is configured on the server as a synchronous standby, + then using a replication slot will report the flush position to the server, but only when a WAL file is closed. + Therefore, that configuration will cause transactions on the primary to wait for a long time and effectively not work satisfactorily. + The option <option>synchronous</option> must be specified in addition to make this work correctly. + ''; + }; + + synchronous = mkOption { + type = types.bool; + default = false; + description = '' + Flush the WAL data to disk immediately after it has been received. + Also send a status packet back to the server immediately after flushing, regardless of <option>statusInterval</option>. + + This option should be specified if the replication client of <command>pg_receivewal</command> is configured on the server as a synchronous standby, + to ensure that timely feedback is sent to the server. + ''; + }; + + compress = mkOption { + type = types.ints.between 0 9; + default = 0; + description = '' + Enables gzip compression of write-ahead logs, and specifies the compression level + (<literal>0</literal> through <literal>9</literal>, <literal>0</literal> being no compression and <literal>9</literal> being best compression). + The suffix <literal>.gz</literal> will automatically be added to all filenames. + + This option requires PostgreSQL >= 10. + ''; + }; + + connection = mkOption { + type = types.str; + example = "postgresql://user@somehost"; + description = '' + Specifies parameters used to connect to the server, as a connection string. + See <link xlink:href="https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-CONNSTRING">Section 34.1.1 of the PostgreSQL manual</link> for more information. + + Because <command>pg_receivewal</command> doesn't connect to any particular database in the cluster, + database name in the connection string will be ignored. + ''; + }; + + extraArgs = mkOption { + type = with types; listOf str; + default = [ ]; + example = literalExample '' + [ + "--no-sync" + ] + ''; + description = '' + A list of extra arguments to pass to the <command>pg_receivewal</command> command. + ''; + }; + + environment = mkOption { + type = with types; attrsOf str; + default = { }; + example = literalExample '' + { + PGPASSFILE = "/private/passfile"; + PGSSLMODE = "require"; + } + ''; + description = '' + Environment variables passed to the service. + Usable parameters are listed in <link xlink:href="https://www.postgresql.org/docs/current/libpq-envars.html">Section 34.14 of the PostgreSQL manual</link>. + ''; + }; + }; + }; + +in { + options = { + services.postgresqlWalReceiver = { + receivers = mkOption { + type = with types; attrsOf (submodule receiverSubmodule); + default = { }; + example = literalExample '' + { + main = { + postgresqlPackage = pkgs.postgresql_11; + directory = /mnt/pg_wal/main/; + slot = "main_wal_receiver"; + connection = "postgresql://user@somehost"; + }; + } + ''; + description = '' + PostgreSQL WAL receivers. + Stream write-ahead logs from a PostgreSQL server using <command>pg_receivewal</command> (formerly <command>pg_receivexlog</command>). + See <link xlink:href="https://www.postgresql.org/docs/current/app-pgreceivewal.html">the man page</link> for more information. + ''; + }; + }; + }; + + config = let + receivers = config.services.postgresqlWalReceiver.receivers; + in mkIf (receivers != { }) { + users = { + users.postgres = { + uid = config.ids.uids.postgres; + group = "postgres"; + description = "PostgreSQL server user"; + }; + + groups.postgres = { + gid = config.ids.gids.postgres; + }; + }; + + assertions = concatLists (attrsets.mapAttrsToList (name: config: [ + { + assertion = config.compress > 0 -> versionAtLeast config.postgresqlPackage.version "10"; + message = "Invalid configuration for WAL receiver \"${name}\": compress requires PostgreSQL version >= 10."; + } + ]) receivers); + + systemd.tmpfiles.rules = mapAttrsToList (name: config: '' + d ${escapeShellArg config.directory} 0750 postgres postgres - - + '') receivers; + + systemd.services = with attrsets; mapAttrs' (name: config: nameValuePair "postgresql-wal-receiver-${name}" { + description = "PostgreSQL WAL receiver (${name})"; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + User = "postgres"; + Group = "postgres"; + KillSignal = "SIGINT"; + Restart = "always"; + RestartSec = 30; + }; + + inherit (config) environment; + + script = let + receiverCommand = postgresqlPackage: + if (versionAtLeast postgresqlPackage.version "10") + then "${postgresqlPackage}/bin/pg_receivewal" + else "${postgresqlPackage}/bin/pg_receivexlog"; + in '' + ${receiverCommand config.postgresqlPackage} \ + --no-password \ + --directory=${escapeShellArg config.directory} \ + --status-interval=${toString config.statusInterval} \ + --dbname=${escapeShellArg config.connection} \ + ${optionalString (config.compress > 0) "--compress=${toString config.compress}"} \ + ${optionalString (config.slot != "") "--slot=${escapeShellArg config.slot}"} \ + ${optionalString config.synchronous "--synchronous"} \ + ${concatStringsSep " " config.extraArgs} + ''; + }) receivers; + }; + + meta.maintainers = with maintainers; [ pacien ]; +} diff --git a/nixos/modules/services/databases/couchdb.nix b/nixos/modules/services/databases/couchdb.nix index 5ddf8ba4bfb..77e404116c8 100644 --- a/nixos/modules/services/databases/couchdb.nix +++ b/nixos/modules/services/databases/couchdb.nix @@ -160,7 +160,7 @@ in { systemd.tmpfiles.rules = [ "d '${dirOf cfg.uriFile}' - ${cfg.user} ${cfg.group} - -" - "d '${dirOf cfg.logFile}' - ${cfg.user} ${cfg.group} - -" + "f '${cfg.logFile}' - ${cfg.user} ${cfg.group} - -" "d '${cfg.databaseDir}' - ${cfg.user} ${cfg.group} - -" "d '${cfg.viewIndexDir}' - ${cfg.user} ${cfg.group} - -" ]; @@ -169,11 +169,9 @@ in { description = "CouchDB Server"; wantedBy = [ "multi-user.target" ]; - preStart = - '' + preStart = '' touch ${cfg.configFile} - touch -a ${cfg.logFile} - ''; + ''; environment = mkIf useVersion2 { # we are actually specifying 4 configuration files: diff --git a/nixos/modules/services/databases/memcached.nix b/nixos/modules/services/databases/memcached.nix index 052ff1f308e..f9e403dfc0c 100644 --- a/nixos/modules/services/databases/memcached.nix +++ b/nixos/modules/services/databases/memcached.nix @@ -86,7 +86,25 @@ in in "${memcached}/bin/memcached ${networking} -m ${toString cfg.maxMemory} -c ${toString cfg.maxConnections} ${concatStringsSep " " cfg.extraOptions}"; User = cfg.user; + + # Filesystem access + ProtectSystem = "strict"; + ProtectHome = true; + PrivateTmp = true; + PrivateDevices = true; + ProtectKernelTunables = true; + ProtectKernelModules = true; + ProtectControlGroups = true; RuntimeDirectory = "memcached"; + # Caps + CapabilityBoundingSet = ""; + NoNewPrivileges = true; + # Misc. + LockPersonality = true; + RestrictRealtime = true; + PrivateMounts = true; + PrivateUsers = true; + MemoryDenyWriteExecute = true; }; }; }; diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index 37d44e30fbe..10250bb5193 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -251,6 +251,10 @@ in environment.systemPackages = [ postgresql ]; + environment.pathsToLink = [ + "/share/postgresql" + ]; + systemd.services.postgresql = { description = "PostgreSQL Server"; @@ -326,13 +330,13 @@ in fi '' + optionalString (cfg.ensureDatabases != []) '' ${concatMapStrings (database: '' - $PSQL -tAc "SELECT 1 FROM pg_database WHERE datname = '${database}'" | grep -q 1 || $PSQL -tAc "CREATE DATABASE ${database}" + $PSQL -tAc "SELECT 1 FROM pg_database WHERE datname = '${database}'" | grep -q 1 || $PSQL -tAc 'CREATE DATABASE "${database}"' '') cfg.ensureDatabases} '' + '' ${concatMapStrings (user: '' $PSQL -tAc "SELECT 1 FROM pg_roles WHERE rolname='${user.name}'" | grep -q 1 || $PSQL -tAc "CREATE USER ${user.name}" ${concatStringsSep "\n" (mapAttrsToList (database: permission: '' - $PSQL -tAc "GRANT ${permission} ON ${database} TO ${user.name}" + $PSQL -tAc 'GRANT ${permission} ON ${database} TO ${user.name}' '') user.ensurePermissions)} '') cfg.ensureUsers} ''; diff --git a/nixos/modules/services/desktops/flatpak.nix b/nixos/modules/services/desktops/flatpak.nix index 1492d855aa0..7fb0024f37d 100644 --- a/nixos/modules/services/desktops/flatpak.nix +++ b/nixos/modules/services/desktops/flatpak.nix @@ -38,5 +38,16 @@ in { "$HOME/.local/share/flatpak/exports" "/var/lib/flatpak/exports" ]; + + # It has been possible since https://github.com/flatpak/flatpak/releases/tag/1.3.2 + # to build a SELinux policy module. + + users.users.flatpak = { + description = "Flatpak system helper"; + group = "flatpak"; + isSystemUser = true; + }; + + users.groups.flatpak = { }; }; } diff --git a/nixos/modules/services/editors/emacs.xml b/nixos/modules/services/editors/emacs.xml index a3041ae22e7..acd69f18376 100644 --- a/nixos/modules/services/editors/emacs.xml +++ b/nixos/modules/services/editors/emacs.xml @@ -552,7 +552,7 @@ emacsclient --create-frame --tty # opens a new frame on the current terminal <xref linkend="opt-environment.systemPackages"/> (<link linkend="sec-declarative-package-mgmt">NixOS</link>), or run - <literal>nix-env -i pkgs.docbook5</literal> + <literal>nix-env -f '<nixpkgs>' -iA docbook5</literal> (<link linkend="sec-ad-hoc-packages">Nix</link>). </para> diff --git a/nixos/modules/services/games/minecraft-server.nix b/nixos/modules/services/games/minecraft-server.nix index 39a68f4b553..eb9288fca58 100644 --- a/nixos/modules/services/games/minecraft-server.nix +++ b/nixos/modules/services/games/minecraft-server.nix @@ -118,7 +118,7 @@ in { }; serverProperties = mkOption { - type = with types; attrsOf (either bool (either int str)); + type = with types; attrsOf (oneOf [ bool int str ]); default = {}; example = literalExample '' { diff --git a/nixos/modules/services/hardware/throttled.nix b/nixos/modules/services/hardware/throttled.nix index cd5b01450e4..13fc5e4792e 100644 --- a/nixos/modules/services/hardware/throttled.nix +++ b/nixos/modules/services/hardware/throttled.nix @@ -8,6 +8,12 @@ in { options = { services.throttled = { enable = mkEnableOption "fix for Intel CPU throttling"; + + extraConfig = mkOption { + type = types.str; + default = ""; + description = "Alternative configuration"; + }; }; }; @@ -16,6 +22,9 @@ in { # The upstream package has this in Install, but that's not enough, see the NixOS manual systemd.services."lenovo_fix".wantedBy = [ "multi-user.target" ]; - environment.etc."lenovo_fix.conf".source = "${pkgs.throttled}/etc/lenovo_fix.conf"; + environment.etc."lenovo_fix.conf".source = + if cfg.extraConfig != "" + then pkgs.writeText "lenovo_fix.conf" cfg.extraConfig + else "${pkgs.throttled}/etc/lenovo_fix.conf"; }; } diff --git a/nixos/modules/services/mail/davmail.nix b/nixos/modules/services/mail/davmail.nix index 5b5cc294e5c..374a3dd75c1 100644 --- a/nixos/modules/services/mail/davmail.nix +++ b/nixos/modules/services/mail/davmail.nix @@ -7,7 +7,7 @@ let cfg = config.services.davmail; configType = with types; - either (either (attrsOf configType) str) (either int bool) // { + oneOf [ (attrsOf configType) str int bool ] // { description = "davmail config type (str, int, bool or attribute set thereof)"; }; diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index dab1b29aa4b..2b08ab1e6aa 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -447,7 +447,7 @@ in }; config = mkOption { - type = with types; attrsOf (either bool (either str (listOf str))); + type = with types; attrsOf (oneOf [ bool str (listOf str) ]); description = '' The main.cf configuration file as key value set. ''; diff --git a/nixos/modules/services/mail/rspamd.nix b/nixos/modules/services/mail/rspamd.nix index 5541b8b79b7..e59d5715de0 100644 --- a/nixos/modules/services/mail/rspamd.nix +++ b/nixos/modules/services/mail/rspamd.nix @@ -331,7 +331,7 @@ in }; config = mkOption { - type = with types; attrsOf (either bool (either str (listOf str))); + type = with types; attrsOf (oneOf [ bool str (listOf str) ]); description = '' Addon to postfix configuration ''; diff --git a/nixos/modules/services/mail/rss2email.nix b/nixos/modules/services/mail/rss2email.nix index a123736005a..df454abc826 100644 --- a/nixos/modules/services/mail/rss2email.nix +++ b/nixos/modules/services/mail/rss2email.nix @@ -30,7 +30,7 @@ in { }; config = mkOption { - type = with types; attrsOf (either str (either int bool)); + type = with types; attrsOf (oneOf [ str int bool ]); default = {}; description = '' The configuration to give rss2email. diff --git a/nixos/modules/services/misc/dwm-status.nix b/nixos/modules/services/misc/dwm-status.nix new file mode 100644 index 00000000000..b98a42e6a6d --- /dev/null +++ b/nixos/modules/services/misc/dwm-status.nix @@ -0,0 +1,73 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.dwm-status; + + order = concatMapStringsSep "," (feature: ''"${feature}"'') cfg.order; + + configFile = pkgs.writeText "dwm-status.toml" '' + order = [${order}] + + ${cfg.extraConfig} + ''; +in + +{ + + ###### interface + + options = { + + services.dwm-status = { + + enable = mkEnableOption "dwm-status user service"; + + package = mkOption { + type = types.package; + default = pkgs.dwm-status; + defaultText = "pkgs.dwm-status"; + example = "pkgs.dwm-status.override { enableAlsaUtils = false; }"; + description = '' + Which dwm-status package to use. + ''; + }; + + order = mkOption { + type = types.listOf (types.enum [ "audio" "backlight" "battery" "cpu_load" "network" "time" ]); + description = '' + List of enabled features in order. + ''; + }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Extra config in TOML format. + ''; + }; + + }; + + }; + + + ###### implementation + + config = mkIf cfg.enable { + + services.upower.enable = elem "battery" cfg.order; + + systemd.user.services.dwm-status = { + description = "Highly performant and configurable DWM status service"; + wantedBy = [ "graphical-session.target" ]; + partOf = [ "graphical-session.target" ]; + + serviceConfig.ExecStart = "${cfg.package}/bin/dwm-status ${configFile}"; + }; + + }; + +} diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 2f3f76d79ff..09c3a89d6a6 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -502,7 +502,7 @@ in { "d ${cfg.statePath} 0750 ${cfg.user} ${cfg.group} -" "d ${cfg.statePath}/builds 0750 ${cfg.user} ${cfg.group} -" "d ${cfg.statePath}/config 0750 ${cfg.user} ${cfg.group} -" - "d ${cfg.statePath}/config/initializers 0750 ${cfg.user} ${cfg.group} -" + "D ${cfg.statePath}/config/initializers 0750 ${cfg.user} ${cfg.group} -" "d ${cfg.statePath}/db 0750 ${cfg.user} ${cfg.group} -" "d ${cfg.statePath}/log 0750 ${cfg.user} ${cfg.group} -" "d ${cfg.statePath}/repositories 2770 ${cfg.user} ${cfg.group} -" @@ -659,7 +659,7 @@ in { fi # We remove potentially broken links to old gitlab-shell versions - rm -f ${cfg.statePath}/repositories/**/*.git/hooks + rm -Rf ${cfg.statePath}/repositories/**/*.git/hooks ${pkgs.sudo}/bin/sudo -u ${cfg.user} -H ${pkgs.git}/bin/git config --global core.autocrlf "input" ''; diff --git a/nixos/modules/services/monitoring/datadog-agent.nix b/nixos/modules/services/monitoring/datadog-agent.nix index ce3d53fb2c1..7f78db74677 100644 --- a/nixos/modules/services/monitoring/datadog-agent.nix +++ b/nixos/modules/services/monitoring/datadog-agent.nix @@ -42,9 +42,9 @@ let # Apply the configured extraIntegrations to the provided agent # package. See the documentation of `dd-agent/integrations-core.nix` # for detailed information on this. - datadogPkg = cfg.package.overrideAttrs(_: { - python = (pkgs.datadog-integrations-core cfg.extraIntegrations).python; - }); + datadogPkg = cfg.package.override { + pythonPackages = pkgs.datadog-integrations-core cfg.extraIntegrations; + }; in { options.services.datadog-agent = { enable = mkOption { @@ -60,7 +60,7 @@ in { defaultText = "pkgs.datadog-agent"; description = '' Which DataDog v6 agent package to use. Note that the provided - package is expected to have an overridable `python`-attribute + package is expected to have an overridable `pythonPackages`-attribute which configures the Python environment with the Datadog checks. ''; diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index c2f6b585d49..bf1084eecc3 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -503,12 +503,12 @@ in { message = "Cannot set both adminPassword and adminPasswordFile"; } { - assertion = cfg.security.secretKeyFile != opt.security.secretKeyFile.default -> cfg.security.secretKeyFile == null; + assertion = cfg.security.secretKey != opt.security.secretKey.default -> cfg.security.secretKeyFile == null; message = "Cannot set both secretKey and secretKeyFile"; } { assertion = cfg.smtp.password != opt.smtp.password.default -> cfg.smtp.passwordFile == null; - message = "Cannot set both password and secretKeyFile"; + message = "Cannot set both password and passwordFile"; } ]; diff --git a/nixos/modules/services/monitoring/loki.nix b/nixos/modules/services/monitoring/loki.nix index 4d11360d07e..f4eec7e0d28 100644 --- a/nixos/modules/services/monitoring/loki.nix +++ b/nixos/modules/services/monitoring/loki.nix @@ -103,7 +103,7 @@ in { PrivateTmp = true; ProtectHome = true; ProtectSystem = "full"; - DecvicePolicy = "closed"; + DevicePolicy = "closed"; NoNewPrivileges = true; WorkingDirectory = cfg.dataDir; }; diff --git a/nixos/modules/services/monitoring/prometheus/default.nix b/nixos/modules/services/monitoring/prometheus/default.nix index d8384e0d35b..647d67533b8 100644 --- a/nixos/modules/services/monitoring/prometheus/default.nix +++ b/nixos/modules/services/monitoring/prometheus/default.nix @@ -79,12 +79,8 @@ let (pkgs.writeText "prometheus.rules" (concatStringsSep "\n" cfg2.rules)) ]); scrape_configs = filterValidPrometheus cfg2.scrapeConfigs; - alerting = optionalAttrs (cfg2.alertmanagerURL != []) { - alertmanagers = [{ - static_configs = [{ - targets = cfg2.alertmanagerURL; - }]; - }]; + alerting = { + inherit (cfg2) alertmanagers; }; }; @@ -738,11 +734,23 @@ in { ''; }; - alertmanagerURL = mkOption { - type = types.listOf types.str; + alertmanagers = mkOption { + type = types.listOf types.attrs; + example = literalExample '' + [ { + scheme = "https"; + path_prefix = "/alertmanager"; + static_configs = [ { + targets = [ + "prometheus.domain.tld" + ]; + } ]; + } ] + ''; default = []; description = '' - List of Alertmanager URLs to send notifications to. + A list of alertmanagers to send alerts to. + See <link xlink:href="https://prometheus.io/docs/prometheus/latest/configuration/configuration/#alertmanager_config">the official documentation</link> for more information. ''; }; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/blackbox.nix b/nixos/modules/services/monitoring/prometheus/exporters/blackbox.nix index f69b389760f..ca4366121e1 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/blackbox.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/blackbox.nix @@ -4,6 +4,13 @@ with lib; let cfg = config.services.prometheus.exporters.blackbox; + + checkConfig = file: pkgs.runCommand "checked-blackbox-exporter.conf" { + preferLocalBuild = true; + buildInputs = [ pkgs.buildPackages.prometheus-blackbox-exporter ]; } '' + ln -s ${file} $out + blackbox_exporter --config.check --config.file $out + ''; in { port = 9115; @@ -21,7 +28,7 @@ in ExecStart = '' ${pkgs.prometheus-blackbox-exporter}/bin/blackbox_exporter \ --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ - --config.file ${cfg.configFile} \ + --config.file ${checkConfig cfg.configFile} \ ${concatStringsSep " \\\n " cfg.extraFlags} ''; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix b/nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix index aee7cba2638..8ae2c927b58 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix @@ -34,6 +34,14 @@ in { <literal>allowed_ip_1</literal> and so on. ''; }; + + withRemoteIp = mkOption { + type = types.bool; + default = false; + description = '' + Whether or not the remote IP of a WireGuard peer should be exposed via prometheus. + ''; + }; }; serviceOpts = { path = [ pkgs.wireguard-tools ]; @@ -45,6 +53,7 @@ in { -p ${toString cfg.port} \ ${optionalString cfg.verbose "-v"} \ ${optionalString cfg.singleSubnetPerField "-s"} \ + ${optionalString cfg.withRemoteIp "-r"} \ ${optionalString (cfg.wireguardConfig != null) "-n ${cfg.wireguardConfig}"} ''; }; diff --git a/nixos/modules/services/monitoring/zabbix-proxy.nix b/nixos/modules/services/monitoring/zabbix-proxy.nix index 9cfcd1697c1..90abed30db5 100644 --- a/nixos/modules/services/monitoring/zabbix-proxy.nix +++ b/nixos/modules/services/monitoring/zabbix-proxy.nix @@ -120,7 +120,8 @@ in name = mkOption { type = types.str; - default = "zabbix"; + default = if cfg.database.type == "sqlite" then "${stateDir}/zabbix.db" else "zabbix"; + defaultText = "zabbix"; description = "Database name."; }; @@ -261,17 +262,17 @@ in preStart = optionalString pgsqlLocal '' if ! test -e "${stateDir}/db-created"; then cat ${cfg.package}/share/zabbix/database/postgresql/schema.sql | ${pgsql.package}/bin/psql ${cfg.database.name} - cat ${cfg.package}/share/zabbix/database/postgresql/images.sql | ${pgsql.package}/bin/psql ${cfg.database.name} - cat ${cfg.package}/share/zabbix/database/postgresql/data.sql | ${pgsql.package}/bin/psql ${cfg.database.name} touch "${stateDir}/db-created" fi '' + optionalString mysqlLocal '' if ! test -e "${stateDir}/db-created"; then cat ${cfg.package}/share/zabbix/database/mysql/schema.sql | ${mysql.package}/bin/mysql ${cfg.database.name} - cat ${cfg.package}/share/zabbix/database/mysql/images.sql | ${mysql.package}/bin/mysql ${cfg.database.name} - cat ${cfg.package}/share/zabbix/database/mysql/data.sql | ${mysql.package}/bin/mysql ${cfg.database.name} touch "${stateDir}/db-created" fi + '' + optionalString (cfg.database.type == "sqlite") '' + if ! test -e "${cfg.database.name}"; then + ${pkgs.sqlite}/bin/sqlite3 "${cfg.database.name}" < ${cfg.package}/share/zabbix/database/sqlite3/schema.sql + fi '' + optionalString (cfg.database.passwordFile != null) '' # create a copy of the supplied password file in a format zabbix can consume touch ${passwordFile} diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix index f19bf9d8139..bbbfcf6a473 100644 --- a/nixos/modules/services/network-filesystems/ipfs.nix +++ b/nixos/modules/services/network-filesystems/ipfs.nix @@ -208,9 +208,9 @@ in { config = mkIf cfg.enable { environment.systemPackages = [ wrapped ]; - environment.etc."fuse.conf" = mkIf cfg.autoMount { text = '' - user_allow_other - ''; }; + programs.fuse = mkIf cfg.autoMount { + userAllowOther = true; + }; users.users = mkIf (cfg.user == "ipfs") { ipfs = { diff --git a/nixos/modules/services/networking/unifi.nix b/nixos/modules/services/networking/unifi.nix index 9057a1e12b3..6239c88b7e4 100644 --- a/nixos/modules/services/networking/unifi.nix +++ b/nixos/modules/services/networking/unifi.nix @@ -148,7 +148,7 @@ in systemd.tmpfiles.rules = [ "e '${stateDir}' 0700 unifi - - -" - "e '${stateDir}/data' 0700 unifi - - -" + "d '${stateDir}/data' 0700 unifi - - -" ]; systemd.services.unifi = { diff --git a/nixos/modules/services/networking/znc/default.nix b/nixos/modules/services/networking/znc/default.nix index 46bff6954cd..05f97bfa539 100644 --- a/nixos/modules/services/networking/znc/default.nix +++ b/nixos/modules/services/networking/znc/default.nix @@ -62,9 +62,9 @@ let concatStringsSep "\n" (toLines cfg.config); semanticTypes = with types; rec { - zncAtom = nullOr (either (either int bool) str); + zncAtom = nullOr (oneOf [ int bool str ]); zncAttr = attrsOf (nullOr zncConf); - zncAll = either (either zncAtom (listOf zncAtom)) zncAttr; + zncAll = oneOf [ zncAtom (listOf zncAtom) zncAttr ]; zncConf = attrsOf (zncAll // { # Since this is a recursive type and the description by default contains # the description of its subtypes, infinite recursion would occur without diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix index 86b0c8d69be..42c1b9482cb 100644 --- a/nixos/modules/services/printing/cupsd.nix +++ b/nixos/modules/services/printing/cupsd.nix @@ -127,7 +127,7 @@ in startWhenNeeded = mkOption { type = types.bool; - default = false; + default = true; description = '' If set, CUPS is socket-activated; that is, instead of having it permanently running as a daemon, @@ -296,11 +296,16 @@ in # gets loaded, and then cups cannot access the printers. boot.blacklistedKernelModules = [ "usblp" ]; + # Some programs like print-manager rely on this value to get + # printer test pages. + environment.sessionVariables.CUPS_DATADIR = "${bindir}/share/cups"; + systemd.packages = [ cups.out ]; systemd.sockets.cups = mkIf cfg.startWhenNeeded { wantedBy = [ "sockets.target" ]; - listenStreams = map (x: replaceStrings ["localhost"] ["127.0.0.1"] (removePrefix "*:" x)) cfg.listenAddresses; + listenStreams = [ "/run/cups/cups.sock" ] + ++ map (x: replaceStrings ["localhost"] ["127.0.0.1"] (removePrefix "*:" x)) cfg.listenAddresses; }; systemd.services.cups = @@ -362,10 +367,10 @@ in { description = "CUPS Remote Printer Discovery"; wantedBy = [ "multi-user.target" ]; - wants = [ "cups.service" "avahi-daemon.service" ]; - bindsTo = [ "cups.service" "avahi-daemon.service" ]; - partOf = [ "cups.service" "avahi-daemon.service" ]; - after = [ "cups.service" "avahi-daemon.service" ]; + wants = [ "avahi-daemon.service" ] ++ optional (!cfg.startWhenNeeded) "cups.service"; + bindsTo = [ "avahi-daemon.service" ] ++ optional (!cfg.startWhenNeeded) "cups.service"; + partOf = [ "avahi-daemon.service" ] ++ optional (!cfg.startWhenNeeded) "cups.service"; + after = [ "avahi-daemon.service" ] ++ optional (!cfg.startWhenNeeded) "cups.service"; path = [ cups ]; @@ -421,4 +426,7 @@ in security.pam.services.cups = {}; }; + + meta.maintainers = with lib.maintainers; [ matthewbauer ]; + } diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix index 6b688c640d5..91d8f544e16 100644 --- a/nixos/modules/services/search/elasticsearch.nix +++ b/nixos/modules/services/search/elasticsearch.nix @@ -131,6 +131,7 @@ in { description = "Extra elasticsearch plugins"; default = []; type = types.listOf types.package; + example = lib.literalExample "[ pkgs.elasticsearchPlugins.discovery-ec2 ]"; }; }; diff --git a/nixos/modules/services/security/bitwarden_rs/default.nix b/nixos/modules/services/security/bitwarden_rs/default.nix index bb036ee020f..80fd65891ff 100644 --- a/nixos/modules/services/security/bitwarden_rs/default.nix +++ b/nixos/modules/services/security/bitwarden_rs/default.nix @@ -36,7 +36,7 @@ in { }; config = mkOption { - type = attrsOf (nullOr (either (either bool int) str)); + type = attrsOf (nullOr (oneOf [ bool int str ])); default = {}; example = literalExample '' { diff --git a/nixos/modules/services/web-apps/limesurvey.nix b/nixos/modules/services/web-apps/limesurvey.nix index 5b2f3875aaa..84a94fc446e 100644 --- a/nixos/modules/services/web-apps/limesurvey.nix +++ b/nixos/modules/services/web-apps/limesurvey.nix @@ -14,7 +14,7 @@ let pkg = pkgs.limesurvey; - configType = with types; either (either (attrsOf configType) str) (either int bool) // { + configType = with types; oneOf [ (attrsOf configType) str int bool ] // { description = "limesurvey config type (str, int, bool or attribute set thereof)"; }; diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index ea9476a7c91..12200c879be 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -336,7 +336,7 @@ let ++ optional enablePerl { name = "perl"; path = "${mod_perl}/modules/mod_perl.so"; } ++ concatMap (svc: svc.extraModules) allSubservices ++ extraForeignModules; - in concatMapStrings load allModules + in concatMapStrings load (unique allModules) } AddHandler type-map var diff --git a/nixos/modules/services/x11/clight.nix b/nixos/modules/services/x11/clight.nix new file mode 100644 index 00000000000..6ec395bb05e --- /dev/null +++ b/nixos/modules/services/x11/clight.nix @@ -0,0 +1,115 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.clight; + + toConf = v: + if builtins.isFloat v then toString v + else if isInt v then toString v + else if isBool v then boolToString v + else if isString v then ''"${escape [''"''] v}"'' + else if isList v then "[ " + concatMapStringsSep ", " toConf v + " ]" + else abort "clight.toConf: unexpected type (v = ${v})"; + + clightConf = pkgs.writeText "clight.conf" + (concatStringsSep "\n" (mapAttrsToList + (name: value: "${toString name} = ${toConf value};") + (filterAttrs + (_: value: value != null) + cfg.settings))); +in { + options.services.clight = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable clight or not. + ''; + }; + + temperature = { + day = mkOption { + type = types.int; + default = 5500; + description = '' + Colour temperature to use during the day, between + <literal>1000</literal> and <literal>25000</literal> K. + ''; + }; + night = mkOption { + type = types.int; + default = 3700; + description = '' + Colour temperature to use at night, between + <literal>1000</literal> and <literal>25000</literal> K. + ''; + }; + }; + + settings = let + validConfigTypes = with types; either int (either str (either bool float)); + in mkOption { + type = with types; attrsOf (nullOr (either validConfigTypes (listOf validConfigTypes))); + default = {}; + example = { captures = 20; gamma_long_transition = true; ac_capture_timeouts = [ 120 300 60 ]; }; + description = '' + Additional configuration to extend clight.conf. See + <link xlink:href="https://github.com/FedeDP/Clight/blob/master/Extra/clight.conf"/> for a + sample configuration file. + ''; + }; + }; + + config = mkIf cfg.enable { + boot.kernelModules = [ "i2c_dev" ]; + environment.systemPackages = with pkgs; [ clight clightd ]; + services.dbus.packages = with pkgs; [ clight clightd ]; + services.upower.enable = true; + + services.clight.settings = { + gamma_temp = with cfg.temperature; mkDefault [ day night ]; + } // (optionalAttrs (config.location.provider == "manual") { + latitude = mkDefault config.location.latitude; + longitude = mkDefault config.location.longitude; + }); + + services.geoclue2.appConfig."clightc" = { + isAllowed = true; + isSystem = true; + }; + + systemd.services.clightd = { + requires = [ "polkit.service" ]; + wantedBy = [ "multi-user.target" ]; + + description = "Bus service to manage various screen related properties (gamma, dpms, backlight)"; + serviceConfig = { + Type = "dbus"; + BusName = "org.clightd.clightd"; + Restart = "on-failure"; + RestartSec = 5; + ExecStart = '' + ${pkgs.clightd}/bin/clightd + ''; + }; + }; + + systemd.user.services.clight = { + after = [ "upower.service" "clightd.service" ]; + wants = [ "upower.service" "clightd.service" ]; + partOf = [ "graphical-session.target" ]; + wantedBy = [ "graphical-session.target" ]; + + description = "C daemon to adjust screen brightness to match ambient brightness, as computed capturing frames from webcam"; + serviceConfig = { + Restart = "on-failure"; + RestartSec = 5; + ExecStart = '' + ${pkgs.clight}/bin/clight --conf-file ${clightConf} + ''; + }; + }; + }; +} diff --git a/nixos/modules/services/x11/compton.nix b/nixos/modules/services/x11/compton.nix index c02c9bfd94e..a94a76ff0c0 100644 --- a/nixos/modules/services/x11/compton.nix +++ b/nixos/modules/services/x11/compton.nix @@ -215,7 +215,7 @@ in { }; settings = let - configTypes = with types; either bool (either int (either float str)); + configTypes = with types; oneOf [ bool int float str ]; # types.loaOf converts lists to sets loaOf = t: with types; either (listOf t) (attrsOf t); in mkOption { diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix index 2b1e9169e5f..671a959cdde 100644 --- a/nixos/modules/services/x11/desktop-managers/default.nix +++ b/nixos/modules/services/x11/desktop-managers/default.nix @@ -20,7 +20,7 @@ in imports = [ ./none.nix ./xterm.nix ./xfce.nix ./plasma5.nix ./lumina.nix ./lxqt.nix ./enlightenment.nix ./gnome3.nix ./kodi.nix ./maxx.nix - ./mate.nix ./pantheon.nix + ./mate.nix ./pantheon.nix ./surf-display.nix ]; options = { diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index cd750242125..cbfd2d3c2ea 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -15,12 +15,16 @@ let ''; }; - nixos-gsettings-desktop-schemas = pkgs.runCommand "nixos-gsettings-desktop-schemas" { preferLocalBuild = true; } + nixos-gsettings-desktop-schemas = let + defaultPackages = with pkgs; [ gsettings-desktop-schemas gnome3.gnome-shell ]; + in + pkgs.runCommand "nixos-gsettings-desktop-schemas" { preferLocalBuild = true; } '' mkdir -p $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas - cp -rf ${pkgs.gsettings-desktop-schemas}/share/gsettings-schemas/gsettings-desktop-schemas*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas - ${concatMapStrings (pkg: "cp -rf ${pkg}/share/gsettings-schemas/*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas\n") cfg.extraGSettingsOverridePackages} + ${concatMapStrings + (pkg: "cp -rf ${pkg}/share/gsettings-schemas/*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas\n") + (defaultPackages ++ cfg.extraGSettingsOverridePackages)} chmod -R a+w $out/share/gsettings-schemas/nixos-gsettings-overrides cat - > $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas/nixos-defaults.gschema.override <<- EOF @@ -30,6 +34,9 @@ let [org.gnome.desktop.screensaver] picture-uri='${pkgs.nixos-artwork.wallpapers.simple-dark-gray-bottom}/share/artwork/gnome/nix-wallpaper-simple-dark-gray_bottom.png' + [org.gnome.shell] + favorite-apps=[ 'org.gnome.Epiphany.desktop', 'evolution.desktop', 'org.gnome.Music.desktop', 'org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' ] + ${cfg.extraGSettingsOverrides} EOF @@ -123,12 +130,8 @@ in { services.dleyna-renderer.enable = mkDefault true; services.dleyna-server.enable = mkDefault true; services.gnome3.at-spi2-core.enable = true; - services.gnome3.evince.enable = mkDefault true; services.gnome3.evolution-data-server.enable = true; - services.gnome3.file-roller.enable = mkDefault true; services.gnome3.glib-networking.enable = true; - services.gnome3.gnome-disks.enable = mkDefault true; - services.gnome3.gnome-documents.enable = mkDefault true; services.gnome3.gnome-keyring.enable = true; services.gnome3.gnome-online-accounts.enable = mkDefault true; services.gnome3.gnome-remote-desktop.enable = mkDefault true; @@ -157,6 +160,12 @@ in { xdg.portal.enable = true; xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; + # Enable default programs + programs.evince.enable = mkDefault true; + programs.file-roller.enable = mkDefault true; + programs.gnome-disks.enable = mkDefault true; + programs.gnome-documents.enable = mkDefault true; + # If gnome3 is installed, build vim for gtk3 too. nixpkgs.config.vim.gui = "gtk3"; diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index e27a479adad..f0cafc37758 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -102,6 +102,10 @@ in # Makes qt applications look less alien export QT_QPA_PLATFORMTHEME=gtk3 export QT_STYLE_OVERRIDE=adwaita + + # Settings from elementary-default-settings + export GTK_CSD=1 + export GTK_MODULES=$GTK_MODULES:pantheon-filechooser-module fi ''; @@ -119,11 +123,9 @@ in ]; services.pantheon.contractor.enable = mkDefault true; services.gnome3.at-spi2-core.enable = true; - services.gnome3.evince.enable = mkDefault true; services.gnome3.evolution-data-server.enable = true; - services.gnome3.file-roller.enable = mkDefault true; - # TODO: gnome-keyring's xdg autostarts will still be in the environment (from elementary-session-settings) if disabled forcefully services.gnome3.glib-networking.enable = true; + # TODO: gnome-keyring's xdg autostarts will still be in the environment (from elementary-session-settings) if disabled forcefully services.gnome3.gnome-keyring.enable = true; services.gnome3.gnome-settings-daemon.enable = true; services.gnome3.gnome-settings-daemon.package = pkgs.pantheon.elementary-settings-daemon; @@ -136,7 +138,6 @@ in services.xserver.libinput.enable = mkDefault true; services.xserver.updateDbusEnvironment = true; services.zeitgeist.enable = mkDefault true; - services.geoclue2.enable = mkDefault true; # pantheon has pantheon-agent-geoclue2 services.geoclue2.enableDemoAgent = false; @@ -145,6 +146,9 @@ in isSystem = true; }; + programs.evince.enable = mkDefault true; + programs.file-roller.enable = mkDefault true; + networking.networkmanager.enable = mkDefault true; networking.networkmanager.basePackages = { inherit (pkgs) networkmanager modemmanager wpa_supplicant crda; diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index 6d148fba895..94a307ae100 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -178,7 +178,7 @@ in ++ lib.optional (cfg.phononBackend == "vlc" && cfg.enableQt4Support) pkgs.phonon-backend-vlc # Optional hardware support features - ++ lib.optional config.hardware.bluetooth.enable bluedevil + ++ lib.optionals config.hardware.bluetooth.enable [ bluedevil bluez-qt ] ++ lib.optional config.networking.networkmanager.enable plasma-nm ++ lib.optional config.hardware.pulseaudio.enable plasma-pa ++ lib.optional config.powerManagement.enable powerdevil diff --git a/nixos/modules/services/x11/desktop-managers/surf-display.nix b/nixos/modules/services/x11/desktop-managers/surf-display.nix new file mode 100644 index 00000000000..232bbf5c55d --- /dev/null +++ b/nixos/modules/services/x11/desktop-managers/surf-display.nix @@ -0,0 +1,127 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.xserver.desktopManager.surf-display; + + surfDisplayConf = '' + # Surf Kiosk Display: Wrap around surf browser and turn your + # system into a browser screen in KIOSK-mode. + + # default download URI for all display screens if not configured individually + DEFAULT_WWW_URI="${cfg.defaultWwwUri}" + + # Enforce fixed resolution for all displays (default: not set): + #DEFAULT_RESOLUTION="1920x1080" + + # HTTP proxy URL, if needed (default: not set). + #HTTP_PROXY_URL="http://webcache:3128" + + # Setting for internal inactivity timer to restart surf-display + # if the user goes inactive/idle. + INACTIVITY_INTERVAL="${builtins.toString cfg.inactivityInterval}" + + # log to syslog instead of .xsession-errors + LOG_TO_SYSLOG="yes" + + # Launch pulseaudio daemon if not already running. + WITH_PULSEAUDIO="yes" + + # screensaver settings, see "man 1 xset" for possible options + SCREENSAVER_SETTINGS="${cfg.screensaverSettings}" + + # disable right and middle pointer device click in browser sessions while keeping + # scrolling wheels' functionality intact... (consider "pointer" subcommand on + # xmodmap man page for details). + POINTER_BUTTON_MAP="${cfg.pointerButtonMap}" + + # Hide idle mouse pointer. + HIDE_IDLE_POINTER="${cfg.hideIdlePointer}" + + ${cfg.extraConfig} + ''; + +in { + options = { + services.xserver.desktopManager.surf-display = { + enable = mkEnableOption "surf-display as a kiosk browser session"; + + defaultWwwUri = mkOption { + type = types.string; + default = "${pkgs.surf-display}/share/surf-display/empty-page.html"; + example = "https://www.example.com/"; + description = "Default URI to display."; + }; + + inactivityInterval = mkOption { + type = types.int; + default = 300; + example = "0"; + description = '' + Setting for internal inactivity timer to restart surf-display if the + user goes inactive/idle to get a fresh session for the next user of + the kiosk. + + If this value is set to zero, the whole feature of restarting due to + inactivity is disabled. + ''; + }; + + screensaverSettings = mkOption { + type = types.string; + default = ""; + description = '' + Screensaver settings, see <literal>man 1 xset</literal> for possible options. + ''; + }; + + pointerButtonMap = mkOption { + type = types.string; + default = "1 0 0 4 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0"; + description = '' + Disable right and middle pointer device click in browser sessions + while keeping scrolling wheels' functionality intact. See pointer + subcommand on <literal>man xmodmap</literal> for details. + ''; + }; + + hideIdlePointer = mkOption { + type = types.string; + default = "yes"; + example = "no"; + description = "Hide idle mouse pointer."; + }; + + extraConfig = mkOption { + type = types.string; + default = ""; + example = '' + # Enforce fixed resolution for all displays (default: not set): + DEFAULT_RESOLUTION="1920x1080" + + # HTTP proxy URL, if needed (default: not set). + HTTP_PROXY_URL="http://webcache:3128" + + # Configure individual display screens with host specific parameters: + DISPLAYS['display-host-0']="www_uri=https://www.displayserver.comany.net/display-1/index.html" + DISPLAYS['display-host-1']="www_uri=https://www.displayserver.comany.net/display-2/index.html" + DISPLAYS['display-host-2']="www_uri=https://www.displayserver.comany.net/display-3/index.html|res=1920x1280" + DISPLAYS['display-host-3']="www_uri=https://www.displayserver.comany.net/display-4/index.html"|res=1280x1024" + DISPLAYS['display-host-local-file']="www_uri=file:///usr/share/doc/surf-display/empty-page.html" + ''; + description = '' + Extra configuration options to append to <literal>/etc/default/surf-display</literal>. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + services.xserver.displayManager.extraSessionFilePackages = [ + pkgs.surf-display + ]; + + environment.etc."default/surf-display".text = surfDisplayConf; + }; +} diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index ff4b91923e0..3f1669d0851 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -96,6 +96,14 @@ in type = types.bool; }; + autoSuspend = mkOption { + default = true; + description = '' + Suspend the machine after inactivity. + ''; + type = types.bool; + }; + }; }; @@ -176,10 +184,40 @@ in systemd.user.services.dbus.wantedBy = [ "default.target" ]; - programs.dconf.profiles.gdm = pkgs.writeText "dconf-gdm-profile" '' - system-db:local - ${gdm}/share/dconf/profile/gdm - ''; + programs.dconf.profiles.gdm = + let + customDconf = pkgs.writeTextFile { + name = "gdm-dconf"; + destination = "/dconf/gdm-custom"; + text = '' + ${optionalString (!cfg.gdm.autoSuspend) '' + [org/gnome/settings-daemon/plugins/power] + sleep-inactive-ac-type='nothing' + sleep-inactive-battery-type='nothing' + sleep-inactive-ac-timeout=0 + sleep-inactive-battery-timeout=0 + ''} + ''; + }; + + customDconfDb = pkgs.stdenv.mkDerivation { + name = "gdm-dconf-db"; + buildCommand = '' + ${pkgs.gnome3.dconf}/bin/dconf compile $out ${customDconf}/dconf + ''; + }; + in pkgs.stdenv.mkDerivation { + name = "dconf-gdm-profile"; + buildCommand = '' + # Check that the GDM profile starts with what we expect. + if [ $(head -n 1 ${gdm}/share/dconf/profile/gdm) != "user-db:user" ]; then + echo "GDM dconf profile changed, please update gdm.nix" + exit 1 + fi + # Insert our custom DB behind it. + sed '2ifile-db:${customDconfDb}' ${gdm}/share/dconf/profile/gdm > $out + ''; + }; # Use AutomaticLogin if delay is zero, because it's immediate. # Otherwise with TimedLogin with zero seconds the prompt is still diff --git a/nixos/modules/services/x11/redshift.nix b/nixos/modules/services/x11/redshift.nix index 4345a334808..55f8f75021b 100644 --- a/nixos/modules/services/x11/redshift.nix +++ b/nixos/modules/services/x11/redshift.nix @@ -5,6 +5,7 @@ with lib; let cfg = config.services.redshift; + lcfg = config.location; in { @@ -18,35 +19,6 @@ in { ''; }; - latitude = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - Your current latitude, between - <literal>-90.0</literal> and <literal>90.0</literal>. Must be provided - along with longitude. - ''; - }; - - longitude = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - Your current longitude, between - between <literal>-180.0</literal> and <literal>180.0</literal>. Must be - provided along with latitude. - ''; - }; - - provider = mkOption { - type = types.enum [ "manual" "geoclue2" ]; - default = "manual"; - description = '' - The location provider to use for determining your location. If set to - <literal>manual</literal> you must also provide latitude/longitude. - ''; - }; - temperature = { day = mkOption { type = types.int; @@ -106,33 +78,19 @@ in { }; config = mkIf cfg.enable { - assertions = [ - { - assertion = - if cfg.provider == "manual" - then (cfg.latitude != null && cfg.longitude != null) - else (cfg.latitude == null && cfg.longitude == null); - message = "Latitude and longitude must be provided together, and with provider set to null."; - } - ]; - # needed so that .desktop files are installed, which geoclue cares about environment.systemPackages = [ cfg.package ]; - services.geoclue2 = mkIf (cfg.provider == "geoclue2") { - enable = true; - appConfig."redshift" = { - isAllowed = true; - isSystem = true; - }; + services.geoclue2.appConfig."redshift" = { + isAllowed = true; + isSystem = true; }; - systemd.user.services.redshift = + systemd.user.services.redshift = let - providerString = - if cfg.provider == "manual" - then "${cfg.latitude}:${cfg.longitude}" - else cfg.provider; + providerString = if lcfg.provider == "manual" + then "${toString lcfg.latitude}:${toString lcfg.longitude}" + else lcfg.provider; in { description = "Redshift colour temperature adjuster"; diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index fab0034d3fd..c94a0643831 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -714,7 +714,7 @@ in nativeBuildInputs = [ pkgs.xkbvalidate ]; preferLocalBuild = true; } '' - validate "$xkbModel" "$layout" "$xkbVariant" "$xkbOptions" + xkbvalidate "$xkbModel" "$layout" "$xkbVariant" "$xkbOptions" touch "$out" ''); diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index 5c88d27b6c6..f67d2900561 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -46,8 +46,8 @@ let ln -s ${kernelPath} $out/kernel ln -s ${config.system.modulesTree} $out/kernel-modules - ${optionalString (pkgs.stdenv.hostPlatform.platform.kernelDTB or false) '' - ln -s ${config.boot.kernelPackages.kernel}/dtbs $out/dtbs + ${optionalString (config.hardware.deviceTree.package != null) '' + ln -s ${config.hardware.deviceTree.package} $out/dtbs ''} echo -n "$kernelParams" > $out/kernel-params diff --git a/nixos/modules/system/boot/binfmt.nix b/nixos/modules/system/boot/binfmt.nix index d6c0f050486..a550ffd6320 100644 --- a/nixos/modules/system/boot/binfmt.nix +++ b/nixos/modules/system/boot/binfmt.nix @@ -115,6 +115,14 @@ let magicOrExtension = ''\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xf3\x00''; mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff''; }; + wasm32-wasi = { + magicOrExtension = ''\x00asm''; + mask = ''\xff\xff\xff\xff''; + }; + wasm64-wasi = { + magicOrExtension = ''\x00asm''; + mask = ''\xff\xff\xff\xff''; + }; x86_64-windows = { magicOrExtension = ".exe"; recognitionType = "extension"; @@ -226,6 +234,7 @@ in { emulatedSystems = mkOption { default = []; + example = [ "wasm32-wasi" "x86_64-windows" "aarch64-linux" ]; description = '' List of systems to emulate. Will also configure Nix to support your new systems. diff --git a/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh b/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh index c780a89b102..0092ee92b62 100644 --- a/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh +++ b/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh @@ -75,9 +75,8 @@ addEntry() { copyToKernelsDir "$path/kernel"; kernel=$result copyToKernelsDir "$path/initrd"; initrd=$result - # XXX UGLY: maybe the system config should have a top-level "dtbs" entry? - dtbDir=$(readlink -m "$path/kernel/../dtbs") - if [ -d "$dtbDir" ]; then + dtbDir=$(readlink -m "$path/dtbs") + if [ -e "$dtbDir" ]; then copyToKernelsDir "$dtbDir"; dtbs=$result fi diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index f1aa9064bef..d6b446e9ac2 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -10,7 +10,7 @@ let checkLink = checkUnitConfig "Link" [ (assertOnlyFields [ - "Description" "Alias" "MACAddressPolicy" "MACAddress" "NamePolicy" "Name" + "Description" "Alias" "MACAddressPolicy" "MACAddress" "NamePolicy" "OriginalName" "MTUBytes" "BitsPerSecond" "Duplex" "AutoNegotiation" "WakeOnLan" "Port" "TCPSegmentationOffload" "TCP6SegmentationOffload" "GenericSegmentationOffload" "GenericReceiveOffload" "LargeReceiveOffload" "RxChannels" "TxChannels" diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 788e3f4a2ab..4c2d130d5a5 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -217,13 +217,11 @@ let --replace ata_id ${extraUtils}/bin/ata_id \ --replace scsi_id ${extraUtils}/bin/scsi_id \ --replace cdrom_id ${extraUtils}/bin/cdrom_id \ - --replace ${pkgs.utillinux}/sbin/blkid ${extraUtils}/bin/blkid \ - --replace /sbin/blkid ${extraUtils}/bin/blkid \ + --replace ${pkgs.coreutils}/bin/basename ${extraUtils}/bin/basename \ + --replace ${pkgs.utillinux}/bin/blkid ${extraUtils}/bin/blkid \ --replace ${pkgs.lvm2}/sbin ${extraUtils}/bin \ - --replace /sbin/mdadm ${extraUtils}/bin/mdadm \ + --replace ${pkgs.mdadm}/sbin ${extraUtils}/sbin \ --replace ${pkgs.bash}/bin/sh ${extraUtils}/bin/sh \ - --replace /usr/bin/readlink ${extraUtils}/bin/readlink \ - --replace /usr/bin/basename ${extraUtils}/bin/basename \ --replace ${udev}/bin/udevadm ${extraUtils}/bin/udevadm done diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix index ee4ae845a7d..c1f2c98afcd 100644 --- a/nixos/modules/system/boot/systemd-unit-options.nix +++ b/nixos/modules/system/boot/systemd-unit-options.nix @@ -226,7 +226,7 @@ in rec { environment = mkOption { default = {}; - type = with types; attrsOf (nullOr (either str (either path package))); + type = with types; attrsOf (nullOr (oneOf [ str path package ])); example = { PATH = "/foo/bar/bin"; LANG = "nl_NL.UTF-8"; }; description = "Environment variables passed to the service's processes."; }; diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index cf35504e518..1914827d0e5 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -427,7 +427,8 @@ in systemd.packages = mkOption { default = []; type = types.listOf types.package; - description = "Packages providing systemd units."; + example = literalExample "[ pkgs.systemd-cryptsetup-generator ]"; + description = "Packages providing systemd units and hooks."; }; systemd.targets = mkOption { @@ -497,11 +498,14 @@ in ''; }; - systemd.generator-packages = mkOption { - default = []; - type = types.listOf types.package; - example = literalExample "[ pkgs.systemd-cryptsetup-generator ]"; - description = "Packages providing systemd generators."; + systemd.shutdown = mkOption { + type = types.attrsOf types.path; + default = {}; + description = '' + Definition of systemd shutdown executables. + For each <literal>NAME = VALUE</literal> pair of the attrSet, a link is generated from + <literal>/etc/systemd/system-shutdown/NAME</literal> to <literal>VALUE</literal>. + ''; }; systemd.defaultUnit = mkOption { @@ -520,7 +524,7 @@ in }; systemd.globalEnvironment = mkOption { - type = with types; attrsOf (nullOr (either str (either path package))); + type = with types; attrsOf (nullOr (oneOf [ str path package ])); default = {}; example = { TZ = "CET"; }; description = '' @@ -761,18 +765,21 @@ in environment.systemPackages = [ systemd ]; environment.etc = let - # generate contents for /etc/systemd/system-generators from - # systemd.generators and systemd.generator-packages - generators = pkgs.runCommand "system-generators" { + # generate contents for /etc/systemd/system-${type} from attrset of links and packages + hooks = type: links: pkgs.runCommand "system-${type}" { preferLocalBuild = true; - packages = cfg.generator-packages; - } '' + packages = cfg.packages; + } '' + set -e 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)} + for hook in $package/lib/systemd/system-${type}/* + do + ln -s $hook $out/ + done + done + ${concatStrings (mapAttrsToList (exec: target: "ln -s ${target} $out/${exec};\n") links)} ''; in ({ "systemd/system".source = generateUnits "system" cfg.units upstreamSystemUnits upstreamSystemWants; @@ -834,7 +841,8 @@ in ${concatStringsSep "\n" cfg.tmpfiles.rules} ''; - "systemd/system-generators" = { source = generators; }; + "systemd/system-generators" = { source = hooks "generators" cfg.generators; }; + "systemd/system-shutdown" = { source = hooks "shutdown" cfg.shutdown; }; }); services.dbus.enable = true; diff --git a/nixos/modules/tasks/filesystems/nfs.nix b/nixos/modules/tasks/filesystems/nfs.nix index d3a558738f4..e0e8bb1f03d 100644 --- a/nixos/modules/tasks/filesystems/nfs.nix +++ b/nixos/modules/tasks/filesystems/nfs.nix @@ -56,7 +56,6 @@ in boot.initrd.kernelModules = mkIf inInitrd [ "nfs" ]; systemd.packages = [ pkgs.nfs-utils ]; - systemd.generator-packages = [ pkgs.nfs-utils ]; environment.etc = { "idmapd.conf".source = idmapdConfFile; diff --git a/nixos/modules/tasks/swraid.nix b/nixos/modules/tasks/swraid.nix index 93e03c44c86..8fa19194bed 100644 --- a/nixos/modules/tasks/swraid.nix +++ b/nixos/modules/tasks/swraid.nix @@ -6,51 +6,12 @@ services.udev.packages = [ pkgs.mdadm ]; + systemd.packages = [ pkgs.mdadm ]; + boot.initrd.availableKernelModules = [ "md_mod" "raid0" "raid1" "raid10" "raid456" ]; boot.initrd.extraUdevRulesCommands = '' cp -v ${pkgs.mdadm}/lib/udev/rules.d/*.rules $out/ ''; - systemd.services.mdadm-shutdown = { - wantedBy = [ "final.target"]; - after = [ "umount.target" ]; - - unitConfig = { - DefaultDependencies = false; - }; - - serviceConfig = { - Type = "oneshot"; - ExecStart = ''${pkgs.mdadm}/bin/mdadm --wait-clean --scan''; - }; - }; - - systemd.services."mdmon@" = { - description = "MD Metadata Monitor on /dev/%I"; - - unitConfig.DefaultDependencies = false; - - serviceConfig = { - Type = "forking"; - Environment = "IMSM_NO_PLATFORM=1"; - ExecStart = ''${pkgs.mdadm}/bin/mdmon --offroot --takeover %I''; - KillMode = "none"; - }; - }; - - systemd.services."mdadm-grow-continue@" = { - description = "Manage MD Reshape on /dev/%I"; - - unitConfig.DefaultDependencies = false; - - serviceConfig = { - ExecStart = ''${pkgs.mdadm}/bin/mdadm --grow --continue /dev/%I''; - StandardInput = "null"; - StandardOutput = "null"; - StandardError = "null"; - KillMode = "none"; - }; - }; - } diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix index d67790702f1..0c4ad90b4eb 100644 --- a/nixos/modules/virtualisation/amazon-image.nix +++ b/nixos/modules/virtualisation/amazon-image.nix @@ -35,10 +35,9 @@ in autoResize = true; }; - boot.extraModulePackages = - [ config.boot.kernelPackages.ixgbevf - config.boot.kernelPackages.ena - ]; + boot.extraModulePackages = [ + config.boot.kernelPackages.ena + ]; boot.initrd.kernelModules = [ "xen-blkfront" "xen-netfront" ]; boot.initrd.availableKernelModules = [ "ixgbevf" "ena" "nvme" ]; boot.kernelParams = mkIf cfg.hvm [ "console=ttyS0" ]; diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index b9a9515f94e..7146aebf54b 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -68,8 +68,9 @@ in rec { nixos.tests.chromium.x86_64-linux or [] (all nixos.tests.firefox) (all nixos.tests.firewall) - (except ["aarch64-linux"] nixos.tests.gnome3) - (except ["aarch64-linux"] nixos.tests.pantheon) + (all nixos.tests.gnome3-xorg) + (all nixos.tests.gnome3) + (all nixos.tests.pantheon) nixos.tests.installer.zfsroot.x86_64-linux or [] # ZFS is 64bit only (except ["aarch64-linux"] nixos.tests.installer.lvm) (except ["aarch64-linux"] nixos.tests.installer.luksroot) @@ -103,7 +104,7 @@ in rec { #(all nixos.tests.keymap.neo) #(all nixos.tests.keymap.qwertz) (all nixos.tests.plasma5) - #(all nixos.tests.lightdm) + (all nixos.tests.lightdm) (all nixos.tests.login) (all nixos.tests.misc) (all nixos.tests.mutableUsers) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index c3fa53ac544..c24c8ae61a5 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -56,7 +56,7 @@ in containers-physical_interfaces = handleTest ./containers-physical_interfaces.nix {}; containers-restart_networking = handleTest ./containers-restart_networking.nix {}; containers-tmpfs = handleTest ./containers-tmpfs.nix {}; - #couchdb = handleTest ./couchdb.nix {}; # spidermonkey-1.8.5 is marked as broken + couchdb = handleTest ./couchdb.nix {}; deluge = handleTest ./deluge.nix {}; dhparams = handleTest ./dhparams.nix {}; dnscrypt-proxy = handleTestOn ["x86_64-linux"] ./dnscrypt-proxy.nix {}; @@ -93,8 +93,8 @@ in gitlab = handleTest ./gitlab.nix {}; gitolite = handleTest ./gitolite.nix {}; gjs = handleTest ./gjs.nix {}; - gnome3 = handleTestOn ["x86_64-linux"] ./gnome3.nix {}; # libsmbios is unsupported on aarch64 - gnome3-gdm = handleTestOn ["x86_64-linux"] ./gnome3-gdm.nix {}; # libsmbios is unsupported on aarch64 + gnome3-xorg = handleTest ./gnome3-xorg.nix {}; + gnome3 = handleTest ./gnome3.nix {}; gocd-agent = handleTest ./gocd-agent.nix {}; gocd-server = handleTest ./gocd-server.nix {}; google-oslogin = handleTest ./google-oslogin {}; @@ -139,7 +139,7 @@ in ldap = handleTest ./ldap.nix {}; leaps = handleTest ./leaps.nix {}; lidarr = handleTest ./lidarr.nix {}; - #lightdm = handleTest ./lightdm.nix {}; + lightdm = handleTest ./lightdm.nix {}; limesurvey = handleTest ./limesurvey.nix {}; login = handleTest ./login.nix {}; loki = handleTest ./loki.nix {}; @@ -183,6 +183,7 @@ in nginx = handleTest ./nginx.nix {}; nginx-sso = handleTest ./nginx-sso.nix {}; nix-ssh-serve = handleTest ./nix-ssh-serve.nix {}; + nixos-generate-config = handleTest ./nixos-generate-config.nix {}; novacomd = handleTestOn ["x86_64-linux"] ./novacomd.nix {}; nsd = handleTest ./nsd.nix {}; nzbget = handleTest ./nzbget.nix {}; @@ -209,6 +210,7 @@ in plotinus = handleTest ./plotinus.nix {}; postgis = handleTest ./postgis.nix {}; postgresql = handleTest ./postgresql.nix {}; + postgresql-wal-receiver = handleTest ./postgresql-wal-receiver.nix {}; powerdns = handleTest ./powerdns.nix {}; predictable-interface-names = handleTest ./predictable-interface-names.nix {}; printing = handleTest ./printing.nix {}; diff --git a/nixos/tests/gnome3-gdm.nix b/nixos/tests/gnome3-gdm.nix deleted file mode 100644 index c2808d87d99..00000000000 --- a/nixos/tests/gnome3-gdm.nix +++ /dev/null @@ -1,63 +0,0 @@ -import ./make-test.nix ({ pkgs, ...} : { - name = "gnome3-gdm"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ lethalman ]; - }; - - machine = - { ... }: - - { imports = [ ./common/user-account.nix ]; - - services.xserver.enable = true; - - services.xserver.displayManager.gdm = { - enable = true; - autoLogin = { - enable = true; - user = "alice"; - }; - }; - services.xserver.desktopManager.gnome3.enable = true; - - virtualisation.memorySize = 1024; - }; - - testScript = let - # Keep line widths somewhat managable - bus = "DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/1000/bus"; - gdbus = "${bus} gdbus"; - # Call javascript in gnome shell, returns a tuple (success, output), where - # `success` is true if the dbus call was successful and output is what the - # javascript evaluates to. - eval = "call --session -d org.gnome.Shell -o /org/gnome/Shell -m org.gnome.Shell.Eval"; - # False when startup is done - startingUp = "${gdbus} ${eval} Main.layoutManager._startingUp"; - # Hopefully gnome-terminal's wm class - wmClass = "${gdbus} ${eval} global.display.focus_window.wm_class"; - in '' - # wait for gdm to start - $machine->waitForUnit("display-manager.service"); - - # wait for alice to be logged in - $machine->waitForUnit("default.target","alice"); - - # Check that logging in has given the user ownership of devices. - $machine->succeed("getfacl /dev/snd/timer | grep -q alice"); - - # Wait for the wayland server - $machine->waitForFile("/run/user/1000/wayland-0"); - - # Wait for gnome shell, correct output should be "(true, 'false')" - $machine->waitUntilSucceeds("su - alice -c '${startingUp} | grep -q true,..false'"); - - # open a terminal - $machine->succeed("su - alice -c '${bus} gnome-terminal'"); - # and check it's there - $machine->waitUntilSucceeds("su - alice -c '${wmClass} | grep -q gnome-terminal-server'"); - - # wait to get a nice screenshot - $machine->sleep(20); - $machine->screenshot("screen"); - ''; -}) diff --git a/nixos/tests/gnome3-xorg.nix b/nixos/tests/gnome3-xorg.nix new file mode 100644 index 00000000000..f12361da037 --- /dev/null +++ b/nixos/tests/gnome3-xorg.nix @@ -0,0 +1,41 @@ +import ./make-test.nix ({ pkgs, ...} : { + name = "gnome3-xorg"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = pkgs.gnome3.maintainers; + }; + + machine = + { ... }: + + { imports = [ ./common/user-account.nix ]; + + services.xserver.enable = true; + + services.xserver.displayManager.gdm.enable = false; + services.xserver.displayManager.lightdm.enable = true; + services.xserver.displayManager.lightdm.autoLogin.enable = true; + services.xserver.displayManager.lightdm.autoLogin.user = "alice"; + services.xserver.desktopManager.gnome3.enable = true; + services.xserver.desktopManager.default = "gnome-xorg"; + + virtualisation.memorySize = 1024; + }; + + testScript = + '' + $machine->waitForX; + + # wait for alice to be logged in + $machine->waitForUnit("default.target","alice"); + + # Check that logging in has given the user ownership of devices. + $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/alice.*machine/); + $machine->succeed("timeout 900 bash -c 'while read msg; do if [[ \$msg =~ \"GNOME Shell started\" ]]; then break; fi; done < <(journalctl -f)'"); + $machine->sleep(10); + $machine->screenshot("screen"); + ''; +}) diff --git a/nixos/tests/gnome3.nix b/nixos/tests/gnome3.nix index b58c9e5a0e3..b6fe602a732 100644 --- a/nixos/tests/gnome3.nix +++ b/nixos/tests/gnome3.nix @@ -1,7 +1,7 @@ import ./make-test.nix ({ pkgs, ...} : { name = "gnome3"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ domenkozar eelco lethalman ]; + maintainers = pkgs.gnome3.maintainers; }; machine = @@ -11,19 +11,34 @@ import ./make-test.nix ({ pkgs, ...} : { services.xserver.enable = true; - services.xserver.displayManager.gdm.enable = false; - services.xserver.displayManager.lightdm.enable = true; - services.xserver.displayManager.lightdm.autoLogin.enable = true; - services.xserver.displayManager.lightdm.autoLogin.user = "alice"; + services.xserver.displayManager.gdm = { + enable = true; + autoLogin = { + enable = true; + user = "alice"; + }; + }; + services.xserver.desktopManager.gnome3.enable = true; - services.xserver.desktopManager.default = "gnome-xorg"; virtualisation.memorySize = 1024; }; - testScript = - '' - $machine->waitForX; + testScript = let + # Keep line widths somewhat managable + bus = "DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/1000/bus"; + gdbus = "${bus} gdbus"; + # Call javascript in gnome shell, returns a tuple (success, output), where + # `success` is true if the dbus call was successful and output is what the + # javascript evaluates to. + eval = "call --session -d org.gnome.Shell -o /org/gnome/Shell -m org.gnome.Shell.Eval"; + # False when startup is done + startingUp = "${gdbus} ${eval} Main.layoutManager._startingUp"; + # Hopefully gnome-terminal's wm class + wmClass = "${gdbus} ${eval} global.display.focus_window.wm_class"; + in '' + # wait for gdm to start + $machine->waitForUnit("display-manager.service"); # wait for alice to be logged in $machine->waitForUnit("default.target","alice"); @@ -31,11 +46,19 @@ import ./make-test.nix ({ pkgs, ...} : { # Check that logging in has given the user ownership of devices. $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/alice.*machine/); - $machine->succeed("timeout 900 bash -c 'while read msg; do if [[ \$msg =~ \"GNOME Shell started\" ]]; then break; fi; done < <(journalctl -f)'"); - $machine->sleep(10); + # Wait for the wayland server + $machine->waitForFile("/run/user/1000/wayland-0"); + + # Wait for gnome shell, correct output should be "(true, 'false')" + $machine->waitUntilSucceeds("su - alice -c '${startingUp} | grep -q true,..false'"); + + # open a terminal + $machine->succeed("su - alice -c '${bus} gnome-terminal'"); + # and check it's there + $machine->waitUntilSucceeds("su - alice -c '${wmClass} | grep -q gnome-terminal-server'"); + + # wait to get a nice screenshot + $machine->sleep(20); $machine->screenshot("screen"); ''; }) diff --git a/nixos/tests/initdb.nix b/nixos/tests/initdb.nix new file mode 100644 index 00000000000..749d7857a13 --- /dev/null +++ b/nixos/tests/initdb.nix @@ -0,0 +1,26 @@ +let + pkgs = import <nixpkgs> { }; +in +with import <nixpkgs/nixos/lib/testing.nix> { inherit pkgs; system = builtins.currentSystem; }; +with pkgs.lib; + +makeTest { + name = "pg-initdb"; + + machine = {...}: + { + documentation.enable = false; + services.postgresql.enable = true; + services.postgresql.package = pkgs.postgresql_9_6; + environment.pathsToLink = [ + "/share/postgresql" + ]; + }; + + testScript = '' + $machine->start; + $machine->succeed("sudo -u postgres initdb -D /tmp/testpostgres2"); + $machine->shutdown; + ''; + + } \ No newline at end of file diff --git a/nixos/tests/lightdm.nix b/nixos/tests/lightdm.nix index 8a9a7408d29..c805f1ed9f3 100644 --- a/nixos/tests/lightdm.nix +++ b/nixos/tests/lightdm.nix @@ -1,7 +1,7 @@ import ./make-test.nix ({ pkgs, ...} : { name = "lightdm"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ aszlig ]; + maintainers = [ aszlig worldofpeace ]; }; machine = { ... }: { diff --git a/nixos/tests/mosquitto.nix b/nixos/tests/mosquitto.nix index 86b7f9c044d..bd5447de15f 100644 --- a/nixos/tests/mosquitto.nix +++ b/nixos/tests/mosquitto.nix @@ -49,21 +49,40 @@ in rec { testScript = let file = "/tmp/msg"; - payload = "wootWOOT"; + sub = args: + "(${cmd "sub"} -C 1 ${args} | tee ${file} &)"; in '' startAll; $server->waitForUnit("mosquitto.service"); $server->fail("test -f ${file}"); - $server->execute("(${cmd "sub"} -C 1 | tee ${file} &)"); - $client1->fail("test -f ${file}"); - $client1->execute("(${cmd "sub"} -C 1 | tee ${file} &)"); + $client2->fail("test -f ${file}"); + + + # QoS = 0, so only one subscribers should get it + $server->execute("${sub "-q 0"}"); + + # we need to give the subscribers some time to connect + $client2->execute("sleep 5"); + $client2->succeed("${cmd "pub"} -m FOO -q 0"); + + $server->waitUntilSucceeds("grep -q FOO ${file}"); + $server->execute("rm ${file}"); + + + # QoS = 1, so both subscribers should get it + $server->execute("${sub "-q 1"}"); + $client1->execute("${sub "-q 1"}"); - $client2->succeed("${cmd "pub"} -m ${payload}"); + # we need to give the subscribers some time to connect + $client2->execute("sleep 5"); + $client2->succeed("${cmd "pub"} -m BAR -q 1"); - $server->succeed("grep -q ${payload} ${file}"); + $server->waitUntilSucceeds("grep -q BAR ${file}"); + $server->execute("rm ${file}"); - $client1->succeed("grep -q ${payload} ${file}"); + $client1->waitUntilSucceeds("grep -q BAR ${file}"); + $client1->execute("rm ${file}"); ''; }) diff --git a/nixos/tests/mysql.nix b/nixos/tests/mysql.nix index abf9606aa36..05bd968de02 100644 --- a/nixos/tests/mysql.nix +++ b/nixos/tests/mysql.nix @@ -19,7 +19,7 @@ import ./make-test.nix ({ pkgs, ...} : { services.mysql.initialScript = pkgs.writeText "mysql-init.sql" '' CREATE USER 'passworduser'@'localhost' IDENTIFIED BY 'password123'; ''; - services.mysql.package = pkgs.mysql; + services.mysql.package = pkgs.mysql57; }; mariadb = diff --git a/nixos/tests/nixos-generate-config.nix b/nixos/tests/nixos-generate-config.nix new file mode 100644 index 00000000000..15a173e024b --- /dev/null +++ b/nixos/tests/nixos-generate-config.nix @@ -0,0 +1,24 @@ +import ./make-test.nix ({ lib, ... } : { + name = "nixos-generate-config"; + meta.maintainers = with lib.maintainers; [ basvandijk ]; + machine = { + system.nixos-generate-config.configuration = '' + # OVERRIDDEN + { config, pkgs, ... }: { + imports = [ ./hardware-configuration.nix ]; + $bootLoaderConfig + } + ''; + }; + testScript = '' + startAll; + $machine->waitForUnit("multi-user.target"); + $machine->succeed("nixos-generate-config"); + + # Test if the configuration really is overridden + $machine->succeed("grep 'OVERRIDDEN' /etc/nixos/configuration.nix"); + + # Test of if the Perl variable $bootLoaderConfig is spliced correctly: + $machine->succeed("grep 'boot\\.loader\\.grub\\.enable = true;' /etc/nixos/configuration.nix"); + ''; +}) diff --git a/nixos/tests/postgresql-wal-receiver.nix b/nixos/tests/postgresql-wal-receiver.nix new file mode 100644 index 00000000000..791b041ba95 --- /dev/null +++ b/nixos/tests/postgresql-wal-receiver.nix @@ -0,0 +1,86 @@ +{ system ? builtins.currentSystem +, config ? { } +, pkgs ? import ../.. { inherit system config; } }: + +with import ../lib/testing.nix { inherit system pkgs; }; +with pkgs.lib; + +let + postgresqlDataDir = "/var/db/postgresql/test"; + replicationUser = "wal_receiver_user"; + replicationSlot = "wal_receiver_slot"; + replicationConn = "postgresql://${replicationUser}@localhost"; + baseBackupDir = "/tmp/pg_basebackup"; + walBackupDir = "/tmp/pg_wal"; + recoveryConf = pkgs.writeText "recovery.conf" '' + restore_command = 'cp ${walBackupDir}/%f %p' + ''; + + makePostgresqlWalReceiverTest = subTestName: postgresqlPackage: makeTest { + name = "postgresql-wal-receiver-${subTestName}"; + meta.maintainers = with maintainers; [ pacien ]; + + machine = { ... }: { + services.postgresql = { + package = postgresqlPackage; + enable = true; + dataDir = postgresqlDataDir; + extraConfig = '' + wal_level = archive # alias for replica on pg >= 9.6 + max_wal_senders = 10 + max_replication_slots = 10 + ''; + authentication = '' + host replication ${replicationUser} all trust + ''; + initialScript = pkgs.writeText "init.sql" '' + create user ${replicationUser} replication; + select * from pg_create_physical_replication_slot('${replicationSlot}'); + ''; + }; + + services.postgresqlWalReceiver.receivers.main = { + inherit postgresqlPackage; + connection = replicationConn; + slot = replicationSlot; + directory = walBackupDir; + }; + }; + + testScript = '' + # make an initial base backup + $machine->waitForUnit('postgresql'); + $machine->waitForUnit('postgresql-wal-receiver-main'); + # WAL receiver healthchecks PG every 5 seconds, so let's be sure they have connected each other + # required only for 9.4 + $machine->sleep(5); + $machine->succeed('${postgresqlPackage}/bin/pg_basebackup --dbname=${replicationConn} --pgdata=${baseBackupDir}'); + + # create a dummy table with 100 records + $machine->succeed('sudo -u postgres psql --command="create table dummy as select * from generate_series(1, 100) as val;"'); + + # stop postgres and destroy data + $machine->systemctl('stop postgresql'); + $machine->systemctl('stop postgresql-wal-receiver-main'); + $machine->succeed('rm -r ${postgresqlDataDir}/{base,global,pg_*}'); + + # restore the base backup + $machine->succeed('cp -r ${baseBackupDir}/* ${postgresqlDataDir} && chown postgres:postgres -R ${postgresqlDataDir}'); + + # prepare WAL and recovery + $machine->succeed('chmod a+rX -R ${walBackupDir}'); + $machine->execute('for part in ${walBackupDir}/*.partial; do mv $part ''${part%%.*}; done'); # make use of partial segments too + $machine->succeed('cp ${recoveryConf} ${postgresqlDataDir}/recovery.conf && chmod 666 ${postgresqlDataDir}/recovery.conf'); + + # replay WAL + $machine->systemctl('start postgresql'); + $machine->waitForFile('${postgresqlDataDir}/recovery.done'); + $machine->systemctl('restart postgresql'); + $machine->waitForUnit('postgresql'); + + # check that our records have been restored + $machine->succeed('test $(sudo -u postgres psql --pset="pager=off" --tuples-only --command="select count(distinct val) from dummy;") -eq 100'); + ''; + }; + +in mapAttrs makePostgresqlWalReceiverTest (import ../../pkgs/servers/sql/postgresql pkgs) diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix index e8702c1ffbf..74583ae5562 100644 --- a/nixos/tests/printing.nix +++ b/nixos/tests/printing.nix @@ -3,7 +3,7 @@ import ./make-test.nix ({pkgs, ... }: { name = "printing"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ domenkozar eelco ]; + maintainers = [ domenkozar eelco matthewbauer ]; }; nodes = { @@ -34,10 +34,6 @@ import ./make-test.nix ({pkgs, ... }: { '' startAll; - # Make sure that cups is up on both sides. - $server->waitForUnit("cups.service"); - $client->waitForUnit("cups.service"); - $client->sleep(10); # wait until cups is fully initialized $client->succeed("lpstat -r") =~ /scheduler is running/ or die; # check local encrypted connections work without error $client->succeed("lpstat -E -r") =~ /scheduler is running/ or die; diff --git a/nixos/tests/syncthing-init.nix b/nixos/tests/syncthing-init.nix index 811a466ff94..0de76b688bd 100644 --- a/nixos/tests/syncthing-init.nix +++ b/nixos/tests/syncthing-init.nix @@ -22,9 +22,13 @@ in { }; testScript = '' + my $config; + $machine->waitForUnit("syncthing-init.service"); - $machine->succeed("cat /var/lib/syncthing/config.xml") =~ /${testId}/ or die; - $machine->succeed("cat /var/lib/syncthing/config.xml") =~ /testFolder/ or die; + $config = $machine->succeed("cat /var/lib/syncthing/.config/syncthing/config.xml"); + + $config =~ /${testId}/ or die; + $config =~ /testFolder/ or die; ''; }) diff --git a/nixos/tests/systemd.nix b/nixos/tests/systemd.nix index 4d470126abe..fadea52f1db 100644 --- a/nixos/tests/systemd.nix +++ b/nixos/tests/systemd.nix @@ -1,4 +1,4 @@ -import ./make-test.nix { +import ./make-test.nix ({ pkgs, ... }: { name = "systemd"; machine = { lib, ... }: { @@ -21,6 +21,14 @@ import ./make-test.nix { services.journald.extraConfig = "Storage=volatile"; services.xserver.displayManager.auto.user = "alice"; + systemd.shutdown.test = pkgs.writeScript "test.shutdown" '' + #!${pkgs.stdenv.shell} + PATH=${lib.makeBinPath (with pkgs; [ utillinux coreutils ])} + mount -t 9p shared -o trans=virtio,version=9p2000.L /tmp/shared + touch /tmp/shared/shutdown-test + umount /tmp/shared + ''; + systemd.services.testservice1 = { description = "Test Service 1"; wantedBy = [ "multi-user.target" ]; @@ -69,5 +77,20 @@ import ./make-test.nix { # has a last mount time, because the file system wasn't checked. $machine->fail('dumpe2fs /dev/vdb | grep -q "^Last mount time: *n/a"'); }; + + # Regression test for https://github.com/NixOS/nixpkgs/issues/35268 + subtest "file system with x-initrd.mount is not unmounted", sub { + $machine->shutdown; + $machine->waitForUnit('multi-user.target'); + # If the file system was unmounted during the shutdown the file system + # has a last mount time, because the file system wasn't checked. + $machine->fail('dumpe2fs /dev/vdb | grep -q "^Last mount time: *n/a"'); + }; + + subtest "systemd-shutdown works", sub { + $machine->shutdown; + $machine->waitForUnit('multi-user.target'); + $machine->succeed('test -e /tmp/shared/shutdown-test'); + }; ''; -} +}) diff --git a/pkgs/applications/altcoins/bitcoin.nix b/pkgs/applications/altcoins/bitcoin.nix index ce0a31dfe68..b1d84f91251 100644 --- a/pkgs/applications/altcoins/bitcoin.nix +++ b/pkgs/applications/altcoins/bitcoin.nix @@ -5,13 +5,13 @@ with stdenv.lib; stdenv.mkDerivation rec{ name = "bitcoin" + (toString (optional (!withGui) "d")) + "-" + version; - version = "0.18.0"; + version = "0.18.1"; src = fetchurl { urls = [ "https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" "https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" ]; - sha256 = "5e4e6890e07b620a93fdb24605dae2bb53e8435b2a93d37558e1db1913df405f"; + sha256 = "5c7d93f15579e37aa2d1dc79e8f5ac675f59045fceddf604ae0f1550eb03bf96"; }; nativeBuildInputs = diff --git a/pkgs/applications/altcoins/dogecoin.nix b/pkgs/applications/altcoins/dogecoin.nix index 0452f401334..1332e53964b 100644 --- a/pkgs/applications/altcoins/dogecoin.nix +++ b/pkgs/applications/altcoins/dogecoin.nix @@ -2,23 +2,23 @@ , pkgconfig, autoreconfHook , db5, openssl, boost, zlib, miniupnpc , protobuf, utillinux, qt4, qrencode -, withGui }: +, withGui, libevent }: with stdenv.lib; stdenv.mkDerivation rec { name = "dogecoin" + (toString (optional (!withGui) "d")) + "-" + version; - version = "1.10.0"; + version = "1.14.1"; src = fetchFromGitHub { owner = "dogecoin"; repo = "dogecoin"; rev = "v${version}"; - sha256 = "04rddx20d4fps2w3h1jxa2j8iyqpjv2fh897z0z3r06qjvjzf7rr"; + sha256 = "0nmbi5gmms16baqs3fmdp2xm0yf8wawnyz80gcmca4j5ph2zka1v"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ openssl db5 openssl utillinux - protobuf boost zlib miniupnpc ] + protobuf boost zlib miniupnpc libevent ] ++ optionals withGui [ qt4 qrencode ]; configureFlags = [ "--with-incompatible-bdb" diff --git a/pkgs/applications/altcoins/go-ethereum.nix b/pkgs/applications/altcoins/go-ethereum.nix index 9ef348abc50..740ecfa228f 100644 --- a/pkgs/applications/altcoins/go-ethereum.nix +++ b/pkgs/applications/altcoins/go-ethereum.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "go-ethereum"; - version = "1.9.1"; + version = "1.9.2"; goPackagePath = "github.com/ethereum/go-ethereum"; @@ -17,7 +17,7 @@ buildGoPackage rec { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "05vnjdjwahdp2j7c6g81jchpdhxmdpbr20mjzpszylp9824v4cba"; + sha256 = "0lymwylh4j63fzj9jy7mcw676a2ksgpsj9mazif1r3d2q73h9m88"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/altcoins/monero-gui/default.nix b/pkgs/applications/altcoins/monero-gui/default.nix index c10cc34ad44..aaff39f1c6b 100644 --- a/pkgs/applications/altcoins/monero-gui/default.nix +++ b/pkgs/applications/altcoins/monero-gui/default.nix @@ -25,13 +25,13 @@ in stdenv.mkDerivation rec { name = "monero-gui-${version}"; - version = "0.14.1.0"; + version = "0.14.1.2"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero-gui"; rev = "v${version}"; - sha256 = "0ilx47771faygf97wilm64xnqxgxa3b43q0g9v014npk0qj8pc31"; + sha256 = "1rm043r6y2mzy8pclnzbjjfxgps8pkfa2b92p66k8y8rdmgq6m1k"; }; nativeBuildInputs = [ qmake pkgconfig wrapQtAppsHook ]; @@ -48,7 +48,6 @@ stdenv.mkDerivation rec { patches = [ ./move-log-file.patch - ./move-translations-dir.patch ]; postPatch = '' @@ -83,10 +82,6 @@ stdenv.mkDerivation rec { mkdir -p $out/share/applications cp ${desktopItem}/share/applications/* $out/share/applications - # install translations - mkdir -p $out/share/translations - cp translations/*.qm $out/share/translations/ - # install icons for n in 16 24 32 48 64 96 128 256; do size=$n"x"$n @@ -97,10 +92,11 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Private, secure, untraceable currency"; - homepage = https://getmonero.org/; - license = licenses.bsd3; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ rnhmjoj ]; + description = "Private, secure, untraceable currency"; + homepage = https://getmonero.org/; + license = licenses.bsd3; + platforms = platforms.all; + badPlatforms = platforms.darwin; + maintainers = with maintainers; [ rnhmjoj ]; }; } diff --git a/pkgs/applications/altcoins/monero-gui/move-log-file.patch b/pkgs/applications/altcoins/monero-gui/move-log-file.patch index 260c6d9d00f..e540f1960d6 100644 --- a/pkgs/applications/altcoins/monero-gui/move-log-file.patch +++ b/pkgs/applications/altcoins/monero-gui/move-log-file.patch @@ -13,18 +13,3 @@ index a51568d..5a9f683 100644 parser.addOption(logPathOption); parser.addHelpOption(); parser.process(app); -diff --git a/Logger.cpp b/Logger.cpp -index 6b1daba..c357762 100644 ---- a/Logger.cpp -+++ b/Logger.cpp -@@ -28,8 +28,8 @@ static const QString defaultLogName = "monero-wallet-gui.log"; - static const QString appFolder = "Library/Logs"; - #else // linux + bsd - //HomeLocation = "~" -- static const QString osPath = QStandardPaths::standardLocations(QStandardPaths::HomeLocation).at(0); -- static const QString appFolder = ".bitmonero"; -+ static const QString osPath = QStandardPaths::standardLocations(QStandardPaths::CacheLocation).at(0); -+ static const QString appFolder = "bitmonero"; - #endif - - diff --git a/pkgs/applications/altcoins/monero-gui/move-translations-dir.patch b/pkgs/applications/altcoins/monero-gui/move-translations-dir.patch deleted file mode 100644 index ff17ce5da1c..00000000000 --- a/pkgs/applications/altcoins/monero-gui/move-translations-dir.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/TranslationManager.cpp b/TranslationManager.cpp -index e7fc52a..83534cc 100644 ---- a/TranslationManager.cpp -+++ b/TranslationManager.cpp -@@ -25,7 +25,7 @@ bool TranslationManager::setLanguage(const QString &language) - return true; - } - -- QString dir = qApp->applicationDirPath() + "/translations"; -+ QString dir = qApp->applicationDirPath() + "/../share/translations"; - QString filename = "monero-core_" + language; - - qDebug("%s: loading translation file '%s' from '%s'", diff --git a/pkgs/applications/altcoins/parity/beta.nix b/pkgs/applications/altcoins/parity/beta.nix index cce0b1c6488..5670a0b767c 100644 --- a/pkgs/applications/altcoins/parity/beta.nix +++ b/pkgs/applications/altcoins/parity/beta.nix @@ -1,6 +1,6 @@ let - version = "2.5.4"; - sha256 = "103kg0lrijf6d0mc1nk4pdgwgkmp9ga51rwfqrkkm133lylrr0lf"; - cargoSha256 = "1w9p43v76igb62mbjk2rl7fynk13l4hpz25jd4f4hk5b2y2wf3r7"; + version = "2.6.0"; + sha256 = "1v0wc6l09nr42ljlq5lq1dgignm53hq3pmrgp2sld9zfxy3vdy0x"; + cargoSha256 = "1bkcvziz0diy76nbcgykajpnp6akva0m7ka7q6w3s9k7awxjxkx3"; in import ./parity.nix { inherit version sha256 cargoSha256; } diff --git a/pkgs/applications/altcoins/parity/default.nix b/pkgs/applications/altcoins/parity/default.nix index 57b1faf71f7..8f81cdd8544 100644 --- a/pkgs/applications/altcoins/parity/default.nix +++ b/pkgs/applications/altcoins/parity/default.nix @@ -1,6 +1,6 @@ let - version = "2.4.9"; - sha256 = "0pj3yyjzc3fq0r7g8j22anzqxvm377pbcy27np1g7ygkzapzb2v6"; - cargoSha256 = "1dxn00zxivmgk4a61nxwhjlv7fjsy2ngadyw0br1ssrkgz9k7af2"; + version = "2.5.5"; + sha256 = "193fnrf1pr67wblyxd5gbrg1rgflphnfaxgm3kb4iawjh18br6c6"; + cargoSha256 = "1w9p43v76igb62mbjk2rl7fynk13l4hpz25jd4f4hk5b2y2wf3r7"; in import ./parity.nix { inherit version sha256 cargoSha256; } diff --git a/pkgs/applications/altcoins/parity/parity.nix b/pkgs/applications/altcoins/parity/parity.nix index 011a44fe170..79831f3304d 100644 --- a/pkgs/applications/altcoins/parity/parity.nix +++ b/pkgs/applications/altcoins/parity/parity.nix @@ -3,9 +3,10 @@ , cargoSha256 }: -{ stdenv +{ lib , fetchFromGitHub , rustPlatform + , pkgconfig , openssl , systemd @@ -14,7 +15,8 @@ }: rustPlatform.buildRustPackage rec { - name = "parity-${version}"; + pname = "parity"; + inherit version; inherit cargoSha256; src = fetchFromGitHub { @@ -34,11 +36,11 @@ rustPlatform.buildRustPackage rec { # test result: FAILED. 80 passed; 12 failed; 0 ignored; 0 measured; 0 filtered out doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Fast, light, robust Ethereum implementation"; homepage = "http://parity.io"; license = licenses.gpl3; - maintainers = [ maintainers.akru ]; + maintainers = with maintainers; [ akru xrelkd ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix index dc805a8caf9..292f28554d0 100644 --- a/pkgs/applications/audio/cantata/default.nix +++ b/pkgs/applications/audio/cantata/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, vlc +{ mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig, vlc , qtbase, qtmultimedia, qtsvg, qttools # Cantata doesn't build with cdparanoia enabled so we disable that @@ -35,7 +35,7 @@ let withUdisks = (withTaglib && withDevices); -in stdenv.mkDerivation rec { +in mkDerivation rec { name = "${pname}-${version}"; src = fetchFromGitHub { @@ -46,20 +46,20 @@ in stdenv.mkDerivation rec { }; buildInputs = [ vlc qtbase qtmultimedia qtsvg ] - ++ stdenv.lib.optionals withTaglib [ taglib taglib_extras ] - ++ stdenv.lib.optionals withReplaygain [ ffmpeg speex mpg123 ] - ++ stdenv.lib.optional withCdda cdparanoia - ++ stdenv.lib.optional withCddb libcddb - ++ stdenv.lib.optional withLame lame - ++ stdenv.lib.optional withMtp libmtp - ++ stdenv.lib.optional withMusicbrainz libmusicbrainz5 - ++ stdenv.lib.optional withUdisks udisks2; + ++ lib.optionals withTaglib [ taglib taglib_extras ] + ++ lib.optionals withReplaygain [ ffmpeg speex mpg123 ] + ++ lib.optional withCdda cdparanoia + ++ lib.optional withCddb libcddb + ++ lib.optional withLame lame + ++ lib.optional withMtp libmtp + ++ lib.optional withMusicbrainz libmusicbrainz5 + ++ lib.optional withUdisks udisks2; nativeBuildInputs = [ cmake pkgconfig qttools ]; enableParallelBuilding = true; - cmakeFlags = stdenv.lib.flatten [ + cmakeFlags = lib.flatten [ (fstats withTaglib [ "TAGLIB" "TAGLIB_EXTRAS" ]) (fstats withReplaygain [ "FFMPEG" "MPG123" "SPEEXDSP" ]) (fstat withCdda "CDPARANOIA") @@ -76,7 +76,7 @@ in stdenv.mkDerivation rec { "-DENABLE_HTTPS_SUPPORT=ON" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = https://github.com/cdrummond/cantata; description = "A graphical client for MPD"; license = licenses.gpl3; diff --git a/pkgs/applications/audio/denemo/default.nix b/pkgs/applications/audio/denemo/default.nix index 6c1536c0a61..d01e7879335 100644 --- a/pkgs/applications/audio/denemo/default.nix +++ b/pkgs/applications/audio/denemo/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "denemo-${version}"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { url = "https://ftp.gnu.org/gnu/denemo/denemo-${version}.tar.gz"; - sha256 = "18zcs4xmfj4vpzi15dj7k5bjzzzlr3sjf9xhrrgy4samrrdpqzfh"; + sha256 = "1blkcl3slbsq9jlhwcf2m9v9g38a0sjfhh9advgi2qr1gxri08by"; }; buildInputs = [ diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix index a61f7dc0a90..680694aa403 100644 --- a/pkgs/applications/audio/fmit/default.nix +++ b/pkgs/applications/audio/fmit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fftw, qtbase, qtmultimedia, qmake +{ stdenv, mkDerivation, fetchFromGitHub, fftw, qtbase, qtmultimedia, qmake, itstool, wrapQtAppsHook , alsaSupport ? true, alsaLib ? null , jackSupport ? false, libjack2 ? null , portaudioSupport ? false, portaudio ? null }: @@ -9,18 +9,18 @@ assert portaudioSupport -> portaudio != null; with stdenv.lib; -stdenv.mkDerivation rec { - name = "fmit-${version}"; - version = "1.1.14"; +mkDerivation rec { + pname = "fmit"; + version = "1.2.6"; src = fetchFromGitHub { - sha256 = "18gvl8smcnigzldy1acs5h8rscf287b39xi4y2cl5armqbj0y38x"; - rev = "v${version}"; - repo = "fmit"; owner = "gillesdegottex"; + repo = "fmit"; + rev = "v${version}"; + sha256 = "03nzkig5mw2rqwhwmg0qvc5cnk9bwh2wp13jh0mdrr935w0587mz"; }; - nativeBuildInputs = [ qmake ]; + nativeBuildInputs = [ qmake itstool wrapQtAppsHook ]; buildInputs = [ fftw qtbase qtmultimedia ] ++ optionals alsaSupport [ alsaLib ] ++ optionals jackSupport [ libjack2 ] diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index 464552584a4..e4d508b2a1f 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -15,13 +15,12 @@ , gobject-introspection , wrapGAppsHook , lastFMSupport ? true -, wikipediaSupport ? true -, youtubeSupport ? true, youtube-dl +, youtubeSupport ? true }: python3.pkgs.buildPythonApplication rec { pname = "lollypop"; - version = "1.1.4.2"; + version = "1.1.4.14"; format = "other"; doCheck = false; @@ -30,7 +29,7 @@ python3.pkgs.buildPythonApplication rec { url = "https://gitlab.gnome.org/World/lollypop"; rev = "refs/tags/${version}"; fetchSubmodules = true; - sha256 = "0rn3q7xslqq5hw4wb739ywg5dr99xpkbmyw80y84rsg0wfrwbjlc"; + sha256 = "004cwbnxss6vmdsc6i0y83h3xbc2bzc0ra4z99pkizkky2mz6swj"; }; nativeBuildInputs = [ @@ -64,7 +63,6 @@ python3.pkgs.buildPythonApplication rec { pygobject3 ] ++ lib.optional lastFMSupport pylast - ++ lib.optional wikipediaSupport wikipedia ++ lib.optional youtubeSupport youtube-dl ; diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix index d0c8f4d9ebe..bc7c2ff9a24 100644 --- a/pkgs/applications/audio/mixxx/default.nix +++ b/pkgs/applications/audio/mixxx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchFromGitHub, makeWrapper, chromaprint +{ stdenv, mkDerivation, fetchFromGitHub, chromaprint , fftw, flac, faad2, glibcLocales, mp4v2 , libid3tag, libmad, libopus, libshout, libsndfile, libusb1, libvorbis , libGLU, libxcb, lilv, lv2, opusfile @@ -8,17 +8,15 @@ mkDerivation rec { name = "mixxx-${version}"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "mixxxdj"; repo = "mixxx"; rev = "release-${version}"; - sha256 = "1q6c2wfpprsx7s7nz1w0mhm2yhikj54jxcv61kwylxx3n5k2na9r"; + sha256 = "0dmkvcsgq7abxqd4wms8c4w0mr5c53z7n5r8jgzp4swz9nmfjpfg"; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ chromaprint fftw flac faad2 glibcLocales mp4v2 libid3tag libmad libopus libshout libsndfile libusb1 libvorbis libxcb libGLU lilv lv2 opusfile pkgconfig portaudio portmidi protobuf qtbase qtscript qtsvg @@ -34,10 +32,9 @@ mkDerivation rec { "opus=1" ]; - fixupPhase = '' - wrapProgram $out/bin/mixxx \ - --set LOCALE_ARCHIVE ${glibcLocales}/lib/locale/locale-archive; - ''; + qtWrapperArgs = [ + "--set LOCALE_ARCHIVE ${glibcLocales}/lib/locale/locale-archive" + ]; meta = with stdenv.lib; { homepage = https://mixxx.org; diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index 9407a1c2688..a595bb06900 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -1,10 +1,10 @@ -{ stdenv, lib, fetchzip, cmake, pkgconfig +{ stdenv, mkDerivation, lib, fetchzip, cmake, pkgconfig , alsaLib, freetype, libjack2, lame, libogg, libpulseaudio, libsndfile, libvorbis , portaudio, portmidi, qtbase, qtdeclarative, qtscript, qtsvg, qttools , qtwebengine, qtxmlpatterns }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "musescore-${version}"; version = "3.0.5"; diff --git a/pkgs/applications/audio/pamixer/default.nix b/pkgs/applications/audio/pamixer/default.nix index 322a4e23846..7c452096785 100644 --- a/pkgs/applications/audio/pamixer/default.nix +++ b/pkgs/applications/audio/pamixer/default.nix @@ -1,27 +1,20 @@ { stdenv, fetchFromGitHub, fetchpatch, boost, libpulseaudio }: stdenv.mkDerivation rec { - name = "pamixer-${version}"; - version = "1.3.1"; + pname = "pamixer"; + version = "1.4"; src = fetchFromGitHub { owner = "cdemoulins"; repo = "pamixer"; rev = version; - sha256 = "15zs2x4hnrpxphqn542b6qqm4ymvhkvbcfyffy69d6cki51chzzw"; + sha256 = "1i14550n8paijwwnhksv5izgfqm3s5q2773bdfp6vyqybkll55f7"; }; - # Remove after https://github.com/cdemoulins/pamixer/pull/16 gets fixed - patches = [(fetchpatch { - url = "https://github.com/oxij/pamixer/commit/dea1cd967aa837940e5c0b04ef7ebc47a7a93d63.patch"; - sha256 = "0s77xmsiwywyyp6f4bjxg1sqdgms1k5fiy7na6ws0aswshfnzfjb"; - })]; - buildInputs = [ boost libpulseaudio ]; installPhase = '' - mkdir -p $out/bin - cp pamixer $out/bin + install -Dm755 pamixer -t $out/bin ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index 1ecb8be09dd..04a62b5d159 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages, fetchFromGitHub, gettext, chromaprint }: +{ stdenv, python3Packages, fetchFromGitHub, gettext, chromaprint, qt5 }: let pythonPackages = python3Packages; @@ -13,7 +13,7 @@ in pythonPackages.buildPythonApplication rec { sha256 = "1armg8vpvnbpk7rrfk9q7nj5gm56rza00ni9qwdyqpxp1xaz6apj"; }; - nativeBuildInputs = [ gettext ]; + nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ]; propagatedBuildInputs = with pythonPackages; [ pyqt5 @@ -22,15 +22,16 @@ in pythonPackages.buildPythonApplication rec { discid ]; - installPhase = '' - python setup.py install --prefix="$out" - ''; - prePatch = '' # Pesky unicode punctuation. substituteInPlace setup.cfg --replace "‘" "'" ''; + installPhase = '' + python setup.py install --prefix="$out" + wrapQtApp $out/bin/picard + ''; + meta = with stdenv.lib; { homepage = http://musicbrainz.org/doc/MusicBrainz_Picard; description = "The official MusicBrainz tagger"; diff --git a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix index f63b828a0a8..9989f75c0bd 100644 --- a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix +++ b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix @@ -24,13 +24,13 @@ let in stdenv.mkDerivation rec { name = "pulseaudio-modules-bt-${version}"; - version = "1.1.99"; + version = "1.3"; src = fetchFromGitHub { owner = "EHfive"; repo = "pulseaudio-modules-bt"; rev = "v${version}"; - sha256 = "0x670xbd62r3fs9a8pa5p4ppvxn6m64hvlrqa702gvikcvyrmwcg"; + sha256 = "00xmidcw4fvpbmg0nsm2gk5zw26fpyjbc0pjk6mzr570zbnyqqbn"; }; patches = [ diff --git a/pkgs/applications/audio/qtractor/default.nix b/pkgs/applications/audio/qtractor/default.nix index b83804e16be..2e504a3c9ec 100644 --- a/pkgs/applications/audio/qtractor/default.nix +++ b/pkgs/applications/audio/qtractor/default.nix @@ -1,20 +1,21 @@ { alsaLib, autoconf, automake, dssi, fetchurl, libjack2 , ladspaH, ladspaPlugins, liblo, libmad, libsamplerate, libsndfile , libtool, libvorbis, lilv, lv2, pkgconfig, qttools, qtbase, rubberband, serd -, sord, sratom, stdenv, suil }: +, sord, sratom, stdenv, suil, wrapQtAppsHook }: stdenv.mkDerivation rec { pname = "qtractor"; - version = "0.9.8"; + version = "0.9.9"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1llajl450yh7bka32ngm4xdva6a2nnxzjc497ydh07rwkap16smx"; + sha256 = "0qlbccdxyfy0f09y6qg1xkg12fm67bf2f2c27c22cg8lzk9ang5j"; }; nativeBuildInputs = [ - autoconf automake libtool pkgconfig qttools + autoconf automake libtool pkgconfig qttools wrapQtAppsHook ]; + buildInputs = [ alsaLib dssi libjack2 ladspaH ladspaPlugins liblo libmad libsamplerate libsndfile libtool diff --git a/pkgs/applications/audio/spectmorph/default.nix b/pkgs/applications/audio/spectmorph/default.nix index 9557770418e..64deede535b 100644 --- a/pkgs/applications/audio/spectmorph/default.nix +++ b/pkgs/applications/audio/spectmorph/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "spectmorph-${version}"; - version = "0.4.1"; + version = "0.5.0"; src = fetchurl { url = "http://spectmorph.org/files/releases/${name}.tar.bz2"; - sha256 = "0z00yvv3jl8qsx6bz9msmg09mdnj5r5d4ws5bmnylwxk182whbrv"; + sha256 = "003wznv3sy1b4g55vqii9pr3i3bb3zmj7nqvwrz7vjsfn2xyd1bn"; }; buildInputs = [ libjack2 lv2 glib qt5.qtbase libao cairo libsndfile fftwFloat ]; diff --git a/pkgs/applications/audio/spotifyd/default.nix b/pkgs/applications/audio/spotifyd/default.nix index 5f064cf4e88..3daed9f6350 100644 --- a/pkgs/applications/audio/spotifyd/default.nix +++ b/pkgs/applications/audio/spotifyd/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1iybk9xrrvhrcl2xl5r2xhyn1ydhrgwnnb8ldhsw5c16b32z03q1"; }; - cargoSha256 = "0879p1h32259schmy8j3xnwpw3sw80f8mrj8s6b5aihi3yyzz521"; + cargoSha256 = "1dzg4sb95ixjfhx6n4w2rgrq4481vw01nsdrbm746mz7nm71csk3"; cargoBuildFlags = [ "--no-default-features" diff --git a/pkgs/applications/audio/vcv-rack/default.nix b/pkgs/applications/audio/vcv-rack/default.nix index 15935751c32..2e55306029f 100644 --- a/pkgs/applications/audio/vcv-rack/default.nix +++ b/pkgs/applications/audio/vcv-rack/default.nix @@ -5,13 +5,18 @@ let glfw-git = glfw.overrideAttrs (oldAttrs: rec { name = "glfw-git-${version}"; - version = "unstable-2018-05-29"; + version = "2019-06-30"; src = fetchFromGitHub { - owner = "glfw"; + owner = "AndrewBelt"; repo = "glfw"; - rev = "0be4f3f75aebd9d24583ee86590a38e741db0904"; - sha256 = "0zbcjgc7ks25yi949k0wjknfl00a4dqmz45mhp00k62vlq2sj0i5"; + rev = "d9ab59efc781c392128a449361a381fcc93cf6f3"; + sha256 = "1ykkq6qq8y6j5hlfj2zp1p87kr33vwhywziprz20v5avx1q7rjm8"; }; + # We patch the source to export a function that was added to the glfw fork + # for Rack so it is present when we build glfw as a shared library. + # See https://github.com/AndrewBelt/glfw/pull/1 for discussion of this issue + # with upstream. + patches = [ ./glfw.patch ]; buildInputs = oldAttrs.buildInputs ++ [ libXext libXi ]; }); pfft-source = fetchFromBitbucket { @@ -23,32 +28,31 @@ let in with stdenv.lib; stdenv.mkDerivation rec { name = "VCV-Rack-${version}"; - version = "0.6.2b"; + version = "1.1.3"; src = fetchFromGitHub { owner = "VCVRack"; repo = "Rack"; rev = "v${version}"; - sha256 = "17ynhxcci6dyn1yi871fd8yli4924fh12pmk510djwkcj5crhas6"; + sha256 = "16q3x0jpwkdwwvh7rn472w7nfjf81s10z9c7bx011kk7rgk88hh2"; fetchSubmodules = true; }; + patches = [ ./rack-minimize-vendoring.patch ]; + prePatch = '' - ln -s ${pfft-source} dep/jpommier-pffft-source + cp -r ${pfft-source} dep/jpommier-pffft-source mkdir -p dep/include cp dep/jpommier-pffft-source/*.h dep/include - cp dep/nanosvg/src/*.h dep/include + cp dep/nanosvg/**/*.h dep/include cp dep/nanovg/src/*.h dep/include cp dep/osdialog/*.h dep/include cp dep/oui-blendish/*.h dep/include substituteInPlace include/audio.hpp --replace "<RtAudio.h>" "<rtaudio/RtAudio.h>" substituteInPlace compile.mk --replace "-march=nocona" "" - substituteInPlace Makefile \ - --replace "-Wl,-Bstatic" "" \ - --replace "-lglfw3" "-lglfw" ''; enableParallelBuilding = true; @@ -60,13 +64,12 @@ with stdenv.lib; stdenv.mkDerivation rec { installPhase = '' install -D -m755 -t $out/bin Rack - cp -r res $out/ - mkdir -p $out/share/rack - cp LICENSE.txt LICENSE-dist.txt $out/share/rack + mkdir -p $out/share/vcv-rack + cp -r res Core.json template.vcv LICENSE* cacert.pem $out/share/vcv-rack # Override the default global resource file directory - wrapProgram $out/bin/Rack --add-flags "-g $out" + wrapProgram $out/bin/Rack --add-flags "-s $out/share/vcv-rack" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/vcv-rack/glfw.patch b/pkgs/applications/audio/vcv-rack/glfw.patch new file mode 100644 index 00000000000..77875415160 --- /dev/null +++ b/pkgs/applications/audio/vcv-rack/glfw.patch @@ -0,0 +1,13 @@ +diff --git a/src/init.c b/src/init.c +index af4a579e..317e25b8 100644 +--- a/src/init.c ++++ b/src/init.c +@@ -339,7 +339,7 @@ GLFWAPI GLFWerrorfun glfwSetErrorCallback(GLFWerrorfun cbfun) + + char glfwOpenedFilename[1024]; + +-const char *glfwGetOpenedFilename() ++GLFWAPI const char *glfwGetOpenedFilename() + { + if (glfwOpenedFilename[0]) + { diff --git a/pkgs/applications/audio/vcv-rack/rack-minimize-vendoring.patch b/pkgs/applications/audio/vcv-rack/rack-minimize-vendoring.patch new file mode 100644 index 00000000000..eca9c2f13c0 --- /dev/null +++ b/pkgs/applications/audio/vcv-rack/rack-minimize-vendoring.patch @@ -0,0 +1,14 @@ +diff -ru a/Makefile b/Makefile +--- a/Makefile 1970-01-01 01:00:01.000000000 +0100 ++++ b/Makefile 1970-01-01 01:00:01.000000000 +0100 +@@ -21,8 +21,8 @@ + build/dep/osdialog/osdialog_gtk2.c.o: FLAGS += $(shell pkg-config --cflags gtk+-2.0) + + LDFLAGS += -rdynamic \ +- dep/lib/libglfw3.a dep/lib/libGLEW.a dep/lib/libjansson.a dep/lib/libspeexdsp.a dep/lib/libzip.a dep/lib/libz.a dep/lib/librtmidi.a dep/lib/librtaudio.a dep/lib/libcurl.a dep/lib/libssl.a dep/lib/libcrypto.a \ +- -lpthread -lGL -ldl -lX11 -lasound -ljack \ ++ -lGLEW -ljansson -lspeexdsp -lzip -lz -lrtmidi -lrtaudio -lcurl -lssl -lcrypto \ ++ -lpthread -lGL -ldl -lX11 -lasound -ljack -lglfw \ + $(shell pkg-config --libs gtk+-2.0) + TARGET := Rack + endif diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix index 7e43225eedc..ece2f567791 100644 --- a/pkgs/applications/audio/x42-plugins/default.nix +++ b/pkgs/applications/audio/x42-plugins/default.nix @@ -3,12 +3,12 @@ , libGLU, lv2, gtk2, cairo, pango, fftwFloat, zita-convolver }: stdenv.mkDerivation rec { - version = "20190206"; + version = "20190714"; name = "x42-plugins-${version}"; src = fetchurl { url = "https://gareus.org/misc/x42-plugins/${name}.tar.xz"; - sha256 = "0rsp8lm8zr20l410whr98d61401rkphgpl8llbn5p2wsiw0q9aqd"; + sha256 = "1mifmdy9pi1lg0h4nsvyjjnnni41vhgg34lks94mrx46wq90bgx4"; }; nativeBuildInputs = [ pkgconfig ]; @@ -26,6 +26,8 @@ stdenv.mkDerivation rec { patchPhase = '' patchShebangs ./stepseq.lv2/gridgen.sh + patchShebangs ./matrixmixer.lv2/genttl.sh #TODO: remove at next update, see https://github.com/x42/matrixmixer.lv2/issues/2 + patchShebangs ./matrixmixer.lv2/genhead.sh #TODO: remove at next update, see https://github.com/x42/matrixmixer.lv2/issues/2 sed -i 's|/usr/include/zita-convolver.h|${zita-convolver}/include/zita-convolver.h|g' ./convoLV2/Makefile ''; diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 794a881090c..7f691b30418 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -13,14 +13,14 @@ let sha256Hash = "090rc307mfm0yw4h592l9307lq4aas8zq0ci49csn6kxhds8rsrm"; }; betaVersion = { - version = "3.5.0.19"; # "Android Studio 3.5 RC 2" - build = "191.5763348"; - sha256Hash = "0z7mjpk0cqwk4ysd3cdsahlg70ax90353qvvag9wgyzl2x2sr6d2"; + version = "3.5.0.20"; # "Android Studio 3.5 RC 3" + build = "191.5781497"; + sha256Hash = "03c5f01dqjvz55l8vyrpypjmmip96kc27p8sw0c5jky0igiyym5j"; }; latestVersion = { # canary & dev - version = "3.6.0.3"; # "Android Studio 3.6 Canary 3" - build = "191.5618338"; - sha256Hash = "0ryf61svn6ra8gh1rvfjqj3j282zmgcvkjvgfvql1wgkjlz21519"; + version = "3.6.0.6"; # "Android Studio 3.6 Canary 6" + build = "192.5787298"; + sha256Hash = "1rri8b5nkxj65hq13s5d31fy08llf3ad9s5mn56ridd4nsy2c5df"; }; in rec { # Attributes are named by their corresponding release channels diff --git a/pkgs/applications/editors/aseprite/default.nix b/pkgs/applications/editors/aseprite/default.nix index 7af3742349a..7db4d3e947b 100644 --- a/pkgs/applications/editors/aseprite/default.nix +++ b/pkgs/applications/editors/aseprite/default.nix @@ -1,17 +1,17 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake, pkgconfig -, curl, freetype, giflib, harfbuzz, libjpeg, libpng, libwebp, pixman, tinyxml, zlib -, libX11, libXext, libXcursor, libXxf86vm +{ stdenv, lib, callPackage, fetchFromGitHub, fetchpatch, cmake, ninja, pkgconfig +, curl, freetype, giflib, libjpeg, libpng, libwebp, pixman, tinyxml, zlib +, harfbuzzFull, glib, fontconfig, pcre +, libX11, libXext, libXcursor, libXxf86vm, libGL , unfree ? false , cmark }: -# Unfree version is not redistributable: -# https://dev.aseprite.org/2016/09/01/new-source-code-license/ -# Consider supporting the developer: https://aseprite.org/#buy - +let + skia = callPackage ./skia.nix {}; +in stdenv.mkDerivation rec { name = "aseprite-${version}"; - version = if unfree then "1.2.9" else "1.1.7"; + version = if unfree then "1.2.11" else "1.1.7"; src = fetchFromGitHub { owner = "aseprite"; @@ -19,21 +19,27 @@ stdenv.mkDerivation rec { rev = "v${version}"; fetchSubmodules = true; sha256 = if unfree - then "0a9xk163j0984n8nn6pqf27n83gr6w7g25wkiv591zx88pa6cpbd" + then "1illr51jpg5g6nx29rav9dllyy5lzyyn7lj2fhrnpz1ysqgaq5p8" else "0gd49lns2bpzbkwax5jf9x1xmg1j8ij997kcxr2596cwiswnw4di"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ + cmake pkgconfig + ] ++ lib.optionals unfree [ ninja ]; buildInputs = [ - curl freetype giflib harfbuzz libjpeg libpng libwebp pixman tinyxml zlib + curl freetype giflib libjpeg libpng libwebp pixman tinyxml zlib libX11 libXext libXcursor libXxf86vm - ] ++ lib.optionals unfree [ cmark harfbuzz ]; + ] ++ lib.optionals unfree [ + cmark + harfbuzzFull glib fontconfig pcre + skia libGL + ]; patches = lib.optionals unfree [ (fetchpatch { - url = "https://github.com/aseprite/aseprite/commit/cfb4dac6feef1f39e161c23c886055a8f9acfd0d.patch"; - sha256 = "1qhjfpngg8b1vvb9w26lhjjfamfx57ih0p31km3r5l96nm85l7f9"; + url = "https://github.com/lfont/aseprite/commit/f1ebc47012d3fed52306ed5922787b4b98cc0a7b.patch"; + sha256 = "03xg7x6b9iv7z18vzlqxhcfphmx4v3qhs9f5rgf38ppyklca5jyw"; }) (fetchpatch { url = "https://github.com/orivej/aseprite/commit/ea87e65b357ad0bd65467af5529183b5a48a8c17.patch"; @@ -67,6 +73,9 @@ stdenv.mkDerivation rec { "-DENABLE_CAT=OFF" "-DENABLE_CPIO=OFF" "-DENABLE_TAR=OFF" + # UI backend. + "-DLAF_OS_BACKEND=skia" + "-DSKIA_DIR=${skia}" ]; postInstall = '' @@ -87,6 +96,24 @@ stdenv.mkDerivation rec { homepage = https://www.aseprite.org/; description = "Animated sprite editor & pixel art tool"; license = if unfree then licenses.unfree else licenses.gpl2; + longDescription = + ''Aseprite is a program to create animated sprites. Its main features are: + + - Sprites are composed by layers & frames (as separated concepts). + - Supported color modes: RGBA, Indexed (palettes up to 256 colors), and Grayscale. + - Load/save sequence of PNG files and GIF animations (and FLC, FLI, JPG, BMP, PCX, TGA). + - Export/import animations to/from Sprite Sheets. + - Tiled drawing mode, useful to draw patterns and textures. + - Undo/Redo for every operation. + - Real-time animation preview. + - Multiple editors support. + - Pixel-art specific tools like filled Contour, Polygon, Shading mode, etc. + - Onion skinning. + '' + lib.optionalString unfree + '' + This version is not redistributable: https://dev.aseprite.org/2016/09/01/new-source-code-license/ + Consider supporting the developer: https://aseprite.org/#buy + ''; maintainers = with maintainers; [ orivej ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/editors/aseprite/skia-deps.nix b/pkgs/applications/editors/aseprite/skia-deps.nix new file mode 100644 index 00000000000..e5655ca8315 --- /dev/null +++ b/pkgs/applications/editors/aseprite/skia-deps.nix @@ -0,0 +1,23 @@ +{ fetchgit }: +{ + angle2 = fetchgit { + url = "https://chromium.googlesource.com/angle/angle.git"; + rev = "956ab4d9fab36be9929e63829475d4d69b2c681c"; + sha256 = "0fcw04wwkn3ixr9l9k0d32n78r9g72p31ii9i5spsq2d0wlylr38"; + }; + dng_sdk = fetchgit { + url = "https://android.googlesource.com/platform/external/dng_sdk.git"; + rev = "96443b262250c390b0caefbf3eed8463ba35ecae"; + sha256 = "1rsr7njhj7c5p87hfznj069fdc3qqhvvnq9sa2rb8c4q849rlzx6"; + }; + piex = fetchgit { + url = "https://android.googlesource.com/platform/external/piex.git"; + rev = "bb217acdca1cc0c16b704669dd6f91a1b509c406"; + sha256 = "05ipmag6k55jmidbyvg5mkqm69zfw03gfkqhi9jnjlmlbg31y412"; + }; + sfntly = fetchgit { + url = "https://chromium.googlesource.com/external/github.com/googlei18n/sfntly.git"; + rev = "b18b09b6114b9b7fe6fc2f96d8b15e8a72f66916"; + sha256 = "0zf1h0dibmm38ldypccg4faacvskmd42vsk6zbxlfcfwjlqm6pp4"; + }; +} diff --git a/pkgs/applications/editors/aseprite/skia-make-deps.sh b/pkgs/applications/editors/aseprite/skia-make-deps.sh new file mode 100755 index 00000000000..5e12c4f5c85 --- /dev/null +++ b/pkgs/applications/editors/aseprite/skia-make-deps.sh @@ -0,0 +1,37 @@ +#!/usr/bin/env bash + +FILTER=$1 +OUT=skia-deps.nix +REVISION=89e4ca4352d05adc892f5983b108433f29b2c0c2 +DEPS=$(curl -s https://raw.githubusercontent.com/aseprite/skia/$REVISION/DEPS) +THIRD_PARTY_DEPS=$(echo "$DEPS" | grep third_party | grep "#" -v | sed 's/"//g') + +function write_fetch_defs () +{ + while read -r DEP; do + NAME=$(echo "$DEP" | cut -d: -f1 | cut -d/ -f3 | sed 's/ //g') + URL=$(echo "$DEP" | cut -d: -f2- | cut -d@ -f1 | sed 's/ //g') + REV=$(echo "$DEP" | cut -d: -f2- | cut -d@ -f2 | sed 's/[ ,]//g') + + echo "Fetching $NAME@$REV" + PREFETCH=$(nix-prefetch-git --rev "$REV" "$URL") + +( +cat <<EOF + $NAME = fetchgit { + url = "$URL"; + rev = "$REV"; + sha256 = $(echo $PREFETCH | jq '.sha256'); + }; +EOF +) >> "$OUT" + + echo "----------" + echo + done <<< "$1" +} + +echo "{ fetchgit }:" > "$OUT" +echo "{" >> "$OUT" +write_fetch_defs "$(echo "$THIRD_PARTY_DEPS" | grep -E "$FILTER")" +echo "}" >> "$OUT" diff --git a/pkgs/applications/editors/aseprite/skia.nix b/pkgs/applications/editors/aseprite/skia.nix new file mode 100644 index 00000000000..038ff96ad3b --- /dev/null +++ b/pkgs/applications/editors/aseprite/skia.nix @@ -0,0 +1,68 @@ +{ stdenv, lib, fetchFromGitHub, fetchgit, python2, gn, ninja +, fontconfig, expat, icu58, libjpeg, libpng, libwebp, zlib +, mesa, libX11 +}: + +let + # skia-deps.nix is generated by: ./skia-make-deps.sh 'angle2|dng_sdk|piex|sfntly' + depSrcs = import ./skia-deps.nix { inherit fetchgit; }; +in +stdenv.mkDerivation rec { + name = "skia-aseprite-m71"; + + src = fetchFromGitHub { + owner = "aseprite"; + repo = "skia"; + # latest commit from aseprite-m71 branch + rev = "89e4ca4352d05adc892f5983b108433f29b2c0c2"; + sha256 = "0n3vrkswvi6rib9zv2pzi18h3j5wm7flmgkgaikcm6q7iw4l2c7x"; + }; + + nativeBuildInputs = [ python2 gn ninja ]; + + buildInputs = [ + fontconfig expat icu58 libjpeg libpng libwebp zlib + mesa libX11 + ]; + + preConfigure = with depSrcs; '' + mkdir -p third_party/externals + ln -s ${angle2} third_party/externals/angle2 + ln -s ${dng_sdk} third_party/externals/dng_sdk + ln -s ${piex} third_party/externals/piex + ln -s ${sfntly} third_party/externals/sfntly + ''; + + configurePhase = '' + runHook preConfigure + gn gen out/Release --args="is_debug=false is_official_build=true" + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + ninja -C out/Release skia + runHook postBuild + ''; + + installPhase = '' + mkdir -p $out + + # Glob will match all subdirs. + shopt -s globstar + + # All these paths are used in some way when building aseprite. + cp -r --parents -t $out/ \ + include/codec \ + include/config \ + include/core \ + include/effects \ + include/gpu \ + include/private \ + include/utils \ + out/Release/*.a \ + src/gpu/**/*.h \ + third_party/externals/angle2/include \ + third_party/skcms/**/*.h + ''; +} diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index 7f0a318741f..31e87df6d85 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -30,21 +30,21 @@ license = lib.licenses.free; }; }) {}; - ada-mode = callPackage ({ cl-lib ? null - , elpaBuild + ada-mode = callPackage ({ elpaBuild , emacs , fetchurl , lib + , uniquify-files , wisi }: elpaBuild { pname = "ada-mode"; ename = "ada-mode"; - version = "6.1.0"; + version = "6.2.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ada-mode-6.1.0.tar"; - sha256 = "1qa4kjv5xxlj50fghg5516cxn8ckv8vlyarcab2isxjnnxnb6g7s"; + url = "https://elpa.gnu.org/packages/ada-mode-6.2.1.tar"; + sha256 = "0lg2y28qs8ls70d43ikhy5zcwadh5ddfw4k59p7sqb79w0y3lbnq"; }; - packageRequires = [ cl-lib emacs wisi ]; + packageRequires = [ emacs uniquify-files wisi ]; meta = { homepage = "https://elpa.gnu.org/packages/ada-mode.html"; license = lib.licenses.free; @@ -84,10 +84,10 @@ elpaBuild { pname = "adjust-parens"; ename = "adjust-parens"; - version = "3.0"; + version = "3.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/adjust-parens-3.0.tar"; - sha256 = "16gmrgdfyqs7i617669f7xy5mds1svbyfv12xhdjk96rbssfngzg"; + url = "https://elpa.gnu.org/packages/adjust-parens-3.1.tar"; + sha256 = "059v0njd52vxidr5xwv2jmknm2shnwpj3101069q6lsmz1wq242a"; }; packageRequires = []; meta = { @@ -178,10 +178,10 @@ elpaBuild { pname = "arbitools"; ename = "arbitools"; - version = "0.976"; + version = "0.977"; src = fetchurl { - url = "https://elpa.gnu.org/packages/arbitools-0.976.el"; - sha256 = "08lvm921zhm22aghz17pps0b5g4f1xyyrl0qisdvd98kz1ajq7xr"; + url = "https://elpa.gnu.org/packages/arbitools-0.977.el"; + sha256 = "0nvdy14lqvy2ca4vw2qlr2kg2vv4y4sr8sa7kqrpf8cg7k9q3mbv"; }; packageRequires = [ cl-lib ]; meta = { @@ -204,7 +204,7 @@ license = lib.licenses.free; }; }) {}; - async = callPackage ({ elpaBuild, fetchurl, lib }: + async = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, nadvice }: elpaBuild { pname = "async"; ename = "async"; @@ -213,7 +213,7 @@ url = "https://elpa.gnu.org/packages/async-1.9.2.tar"; sha256 = "17fnvrj7jww29sav6a6jpizclg4w2962m6h37akpii71gf0vrffw"; }; - packageRequires = []; + packageRequires = [ cl-lib nadvice ]; meta = { homepage = "https://elpa.gnu.org/packages/async.html"; license = lib.licenses.free; @@ -735,10 +735,10 @@ elpaBuild { pname = "debbugs"; ename = "debbugs"; - version = "0.18"; + version = "0.19"; src = fetchurl { - url = "https://elpa.gnu.org/packages/debbugs-0.18.tar"; - sha256 = "00kich80zdg7v3v613f9prqddkpwpm1nf9sj10f0n6wh15rzwv07"; + url = "https://elpa.gnu.org/packages/debbugs-0.19.tar"; + sha256 = "0cpby8f088cqb5mpd756a2mb706x763k15cg2xdmmsxl415k3yw4"; }; packageRequires = [ cl-lib emacs soap-client ]; meta = { @@ -746,7 +746,7 @@ license = lib.licenses.free; }; }) {}; - delight = callPackage ({ elpaBuild, fetchurl, lib }: + delight = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, nadvice }: elpaBuild { pname = "delight"; ename = "delight"; @@ -755,7 +755,7 @@ url = "https://elpa.gnu.org/packages/delight-1.5.el"; sha256 = "0kzlvzwmn6zj0874086q2xw0pclyi7wlkq48zh2lkd2796xm8vw7"; }; - packageRequires = []; + packageRequires = [ cl-lib nadvice ]; meta = { homepage = "https://elpa.gnu.org/packages/delight.html"; license = lib.licenses.free; @@ -780,10 +780,10 @@ elpaBuild { pname = "diff-hl"; ename = "diff-hl"; - version = "1.8.6"; + version = "1.8.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/diff-hl-1.8.6.tar"; - sha256 = "02hvi5jxv2anf62lw878bdz6xk7xjhjd5q85pqihmadbpj6i6pfq"; + url = "https://elpa.gnu.org/packages/diff-hl-1.8.7.tar"; + sha256 = "1qcwicflvm6dxcflnlg891hyzwp2q79fdkdbdwp1440a0j09riam"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -870,10 +870,10 @@ elpaBuild { pname = "djvu"; ename = "djvu"; - version = "1.0.1"; + version = "1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/djvu-1.0.1.el"; - sha256 = "1am4cm9csc5df3mbdby7j197j8yxv0x0maf6kfmn2ww1iwcyv8x6"; + url = "https://elpa.gnu.org/packages/djvu-1.1.el"; + sha256 = "0njgyx09q225hliacsnjk8wallg5i6xkz6bj501pb05nwqfbvfk7"; }; packageRequires = []; meta = { @@ -930,10 +930,10 @@ elpaBuild { pname = "ebdb"; ename = "ebdb"; - version = "0.6.8"; + version = "0.6.11"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ebdb-0.6.8.tar"; - sha256 = "0bcs4f2l6cdg6hx3crk0vchhljhgwd1ik8n0p001gs1mk91178jp"; + url = "https://elpa.gnu.org/packages/ebdb-0.6.11.tar"; + sha256 = "1ljcp4vy8z5xbcrlf33xgi63a2px4fhx6928qhwr7sy7jwil2s6n"; }; packageRequires = [ cl-lib emacs seq ]; meta = { @@ -960,10 +960,10 @@ elpaBuild { pname = "ebdb-i18n-chn"; ename = "ebdb-i18n-chn"; - version = "1.2"; + version = "1.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ebdb-i18n-chn-1.2.el"; - sha256 = "1qgrlk625mhfd6n1mc0kqfzbisnb61kx3vrrl3bzlz4viq3kcc10"; + url = "https://elpa.gnu.org/packages/ebdb-i18n-chn-1.3.el"; + sha256 = "1w7xgagscyjxrw4xl8bz6wf7skvdvk5qdcp5p7kxl4r9nhjffj20"; }; packageRequires = [ ebdb pyim ]; meta = { @@ -990,10 +990,10 @@ elpaBuild { pname = "eev"; ename = "eev"; - version = "20190425"; + version = "20190517"; src = fetchurl { - url = "https://elpa.gnu.org/packages/eev-20190425.tar"; - sha256 = "0wffwdkk68hcnkggrfmx0ag3pmapdzwzq54sx8y0m68aw0by90y1"; + url = "https://elpa.gnu.org/packages/eev-20190517.tar"; + sha256 = "0hgjdax0kg2w7bf3idl6mw6m8j2wkh1253px42v2lbaxp6897m07"; }; packageRequires = [ emacs ]; meta = { @@ -1030,10 +1030,10 @@ elpaBuild { pname = "el-search"; ename = "el-search"; - version = "1.12.5"; + version = "1.12.6.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/el-search-1.12.5.tar"; - sha256 = "0q6fnjp2hh8p1l7wj7645szlz6qxdfy71s0xljjrmc2836i32xzc"; + url = "https://elpa.gnu.org/packages/el-search-1.12.6.1.tar"; + sha256 = "150f4rirg107hmzpv8ifa32k2mgf07smbf9z44ln5rh8n17xwqah"; }; packageRequires = [ cl-print emacs stream ]; meta = { @@ -1132,10 +1132,10 @@ elpaBuild { pname = "excorporate"; ename = "excorporate"; - version = "0.8.1"; + version = "0.8.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/excorporate-0.8.1.tar"; - sha256 = "1k89472x80wsn14y16km5bgynmmd2kbdfhylb3cc17jvdn1xr53y"; + url = "https://elpa.gnu.org/packages/excorporate-0.8.3.tar"; + sha256 = "04bsbiwgfbfd501qvwh0iwyk0xh442kjfj73b3876idwj3p8alr5"; }; packageRequires = [ emacs fsm nadvice soap-client url-http-ntlm ]; meta = { @@ -1207,10 +1207,10 @@ elpaBuild { pname = "flymake"; ename = "flymake"; - version = "1.0.6"; + version = "1.0.8"; src = fetchurl { - url = "https://elpa.gnu.org/packages/flymake-1.0.6.el"; - sha256 = "10n9vnabiz3m5gs3azc76x7y1p9qhc6aspgygw7awq9ff6hhkhbw"; + url = "https://elpa.gnu.org/packages/flymake-1.0.8.el"; + sha256 = "1hqxrqb227v4ncjjqx8im3c4mhg8w5yjbz9hpfcm5x8xnr2yd6bp"; }; packageRequires = [ emacs ]; meta = { @@ -1222,10 +1222,10 @@ elpaBuild { pname = "fountain-mode"; ename = "fountain-mode"; - version = "2.7.1"; + version = "2.7.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/fountain-mode-2.7.1.el"; - sha256 = "198ls0rvzgpb942mvjyljgbaxp05wjys1a003bfq528przv0vpaz"; + url = "https://elpa.gnu.org/packages/fountain-mode-2.7.3.el"; + sha256 = "1sz3qp3y52d05jd006zc99r4ryignpa2jgfk72rw3zfqmikzv15j"; }; packageRequires = [ emacs ]; meta = { @@ -1252,10 +1252,10 @@ elpaBuild { pname = "frog-menu"; ename = "frog-menu"; - version = "0.2.8"; + version = "0.2.9"; src = fetchurl { - url = "https://elpa.gnu.org/packages/frog-menu-0.2.8.el"; - sha256 = "18f937lvhw2dxwldahim13pr3ppndssjp0dis95iaspiwg9mwc4h"; + url = "https://elpa.gnu.org/packages/frog-menu-0.2.9.el"; + sha256 = "1gjhypsafpqybcbwi49qi1g419hcq9qv4p940ybspydg9gqk3gmp"; }; packageRequires = [ avy emacs posframe ]; meta = { @@ -1297,10 +1297,10 @@ elpaBuild { pname = "gited"; ename = "gited"; - version = "0.5.3"; + version = "0.5.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/gited-0.5.3.tar"; - sha256 = "1bayfclczdzrmay8swszs8lliz5p4nnmjzzz2gh68rc16isjgh2z"; + url = "https://elpa.gnu.org/packages/gited-0.5.4.tar"; + sha256 = "07ckknggkqd733bnps21r46bacgyhd0v9wc0spid22hn0dnrfp12"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -1596,10 +1596,10 @@ elpaBuild { pname = "ivy"; ename = "ivy"; - version = "0.11.0"; + version = "0.12.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ivy-0.11.0.tar"; - sha256 = "1pxapdc7jarqc8lf3a3fsn4nsi4j146dh07f89xkj087psq30v50"; + url = "https://elpa.gnu.org/packages/ivy-0.12.0.tar"; + sha256 = "14q9kh48iabrnhwcmhlvgk7sg4a0j5c3zjp0yzj1ijrz5zbdhxxz"; }; packageRequires = [ emacs ]; meta = { @@ -1746,10 +1746,10 @@ elpaBuild { pname = "let-alist"; ename = "let-alist"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/let-alist-1.0.5.el"; - sha256 = "0r7b9jni50la1m79kklml11syg8d2fmdlr83pv005sv1wh02jszw"; + url = "https://elpa.gnu.org/packages/let-alist-1.0.6.el"; + sha256 = "0szj7vnjzz4zci5fvz7xqgcpi4pzdyyf4qi2s8xar2hi7v3yaawr"; }; packageRequires = [ emacs ]; meta = { @@ -2250,10 +2250,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "9.2.3"; + version = "9.2.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-9.2.3.tar"; - sha256 = "0hqy4lns9q5p0l1ylgmlckqprn9sbasszhznanmv0rsh0gzhsbyw"; + url = "https://elpa.gnu.org/packages/org-9.2.5.tar"; + sha256 = "1pid1sykgz83i4ry5n8f270finag6sm7ckqxn5lkikyya43wlzx1"; }; packageRequires = []; meta = { @@ -2366,6 +2366,21 @@ license = lib.licenses.free; }; }) {}; + path-iterator = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "path-iterator"; + ename = "path-iterator"; + version = "1.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/path-iterator-1.0.tar"; + sha256 = "0kgl7rhv9x23jyr6ahfy6ql447zpz9fnmfwldkpn69g7jdx6a3cc"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/path-iterator.html"; + license = lib.licenses.free; + }; + }) {}; peg = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "peg"; @@ -2381,6 +2396,36 @@ license = lib.licenses.free; }; }) {}; + persist = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "persist"; + ename = "persist"; + version = "0.4"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/persist-0.4.tar"; + sha256 = "0gpxy41qawzss2526j9a7lys60vqma1lvamn4bfabwza7gfhac0q"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/persist.html"; + license = lib.licenses.free; + }; + }) {}; + phps-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "phps-mode"; + ename = "phps-mode"; + version = "0.2.4"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/phps-mode-0.2.4.tar"; + sha256 = "0n6gj22w0llns3kx5hd69imhlrnlxx74zvhz7qikfx60669c5n20"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/phps-mode.html"; + license = lib.licenses.free; + }; + }) {}; pinentry = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "pinentry"; @@ -2415,10 +2460,10 @@ elpaBuild { pname = "posframe"; ename = "posframe"; - version = "0.4.3"; + version = "0.5.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/posframe-0.4.3.el"; - sha256 = "06q0p4qim6lha2xr9fxaspbzw01xn01ik9gxlld6hdhh19b65cmi"; + url = "https://elpa.gnu.org/packages/posframe-0.5.0.el"; + sha256 = "1fjnpwg1fj9j54nymh802vd4viggrg3qnqwh52281n7zv6xfv0qb"; }; packageRequires = [ emacs ]; meta = { @@ -2556,10 +2601,10 @@ elpaBuild { pname = "realgud"; ename = "realgud"; - version = "1.5.0"; + version = "1.5.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/realgud-1.5.0.tar"; - sha256 = "0bfshrgkfrfb1d8insnb5n25230xd0scdk6bijhgh34q2phjy2fy"; + url = "https://elpa.gnu.org/packages/realgud-1.5.1.tar"; + sha256 = "01155sydricdvxy3djk64w2zc6x0q4j669bvz8m8rd766wsmida8"; }; packageRequires = [ emacs load-relative loc-changes test-simple ]; meta = { @@ -2710,10 +2755,10 @@ elpaBuild { pname = "relint"; ename = "relint"; - version = "1.8"; + version = "1.10"; src = fetchurl { - url = "https://elpa.gnu.org/packages/relint-1.8.el"; - sha256 = "1bl6m2h7131acbmr0kqfnjjpv2syiv2mxfnm61g874ynnvkmmkm3"; + url = "https://elpa.gnu.org/packages/relint-1.10.el"; + sha256 = "1l0lh4pkksw7brmhhbaikwzs4zkgd2962ks1zy7m262dvkhxjfv8"; }; packageRequires = [ xr ]; meta = { @@ -2971,10 +3016,10 @@ elpaBuild { pname = "sql-indent"; ename = "sql-indent"; - version = "1.3"; + version = "1.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/sql-indent-1.3.tar"; - sha256 = "0zira8my1q975bad2h76bz4yddjzf0dskvy6x865np86rmzd0c9w"; + url = "https://elpa.gnu.org/packages/sql-indent-1.4.tar"; + sha256 = "1nilxfm30nb2la1463729rgbgbma7igkf0z325k8cbapqanb1wgl"; }; packageRequires = [ cl-lib ]; meta = { @@ -3016,10 +3061,10 @@ elpaBuild { pname = "svg"; ename = "svg"; - version = "0.2"; + version = "1.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/svg-0.2.el"; - sha256 = "14yfi27v3zdzh1chcjiq4l63iwh0vd99wv1z4w7agr33540jybc5"; + url = "https://elpa.gnu.org/packages/svg-1.0.el"; + sha256 = "1hh0x7sz2rqb7zdhcm2q9knr8nnwqrsbz1zfp29k8l1318li9f62"; }; packageRequires = [ emacs ]; meta = { @@ -3046,10 +3091,10 @@ elpaBuild { pname = "system-packages"; ename = "system-packages"; - version = "1.0.10"; + version = "1.0.11"; src = fetchurl { - url = "https://elpa.gnu.org/packages/system-packages-1.0.10.tar"; - sha256 = "1vwf2j0fxrsqmrgc7x5nkkg0vlhwgxppc4w7kb5is6dgrssskpb5"; + url = "https://elpa.gnu.org/packages/system-packages-1.0.11.tar"; + sha256 = "0xf2q5bslxpw0wycgi2k983lnfpw182rgdzq0f99f64kb7ifns9y"; }; packageRequires = [ emacs ]; meta = { @@ -3132,6 +3177,21 @@ license = lib.licenses.free; }; }) {}; + tramp = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "tramp"; + ename = "tramp"; + version = "2.4.2.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/tramp-2.4.2.1.tar"; + sha256 = "139y05b2m715zryxqw7k438cc137mziz2k5nbzrrahddfz0i3cf9"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/tramp.html"; + license = lib.licenses.free; + }; + }) {}; tramp-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "tramp-theme"; @@ -3207,6 +3267,21 @@ license = lib.licenses.free; }; }) {}; + uniquify-files = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "uniquify-files"; + ename = "uniquify-files"; + version = "1.0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/uniquify-files-1.0.1.tar"; + sha256 = "0c4lf25503z71wz9f0v6ag5lmqfxz94lmq65xvzvhmqvkxvsgpm5"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/uniquify-files.html"; + license = lib.licenses.free; + }; + }) {}; url-http-ntlm = callPackage ({ cl-lib ? null , elpaBuild , fetchurl @@ -3276,6 +3351,23 @@ license = lib.licenses.free; }; }) {}; + verilog-mode = callPackage ({ elpaBuild + , fetchurl + , lib }: + elpaBuild { + pname = "verilog-mode"; + ename = "verilog-mode"; + version = "2019.6.21.103209889"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/verilog-mode-2019.6.21.103209889.el"; + sha256 = "0hlcp2jhm30bzx6iabdb31aqv0dmmim30g9z5kqb0hl1bd1dnm9m"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/verilog-mode.html"; + license = lib.licenses.free; + }; + }) {}; vigenere = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "vigenere"; @@ -3358,10 +3450,10 @@ elpaBuild { pname = "wcheck-mode"; ename = "wcheck-mode"; - version = "2016.1.30"; + version = "2019.6.17"; src = fetchurl { - url = "https://elpa.gnu.org/packages/wcheck-mode-2016.1.30.el"; - sha256 = "0hzrxnslfl04h083njy7wp4hhgrqpyz0cnm73v348kr1i4wx9xjq"; + url = "https://elpa.gnu.org/packages/wcheck-mode-2019.6.17.el"; + sha256 = "0579a3p9swq0j0fca9s885kzv69y9lhhnqa6m4pzdgrr6pfrirqv"; }; packageRequires = []; meta = { @@ -3418,10 +3510,10 @@ elpaBuild { pname = "websocket"; ename = "websocket"; - version = "1.9"; + version = "1.11.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/websocket-1.9.tar"; - sha256 = "00sd0dawpjcr79w6klya5ywq9r1p86d97z62vqpjij6yg5qv470f"; + url = "https://elpa.gnu.org/packages/websocket-1.11.1.tar"; + sha256 = "09s8qyi012djmm3vrj1qg1zqqy0h0cbcfzfkhybvqi4amy4jgliw"; }; packageRequires = [ cl-lib ]; meta = { @@ -3459,21 +3551,41 @@ license = lib.licenses.free; }; }) {}; - wisi = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib, seq }: + wisi = callPackage ({ elpaBuild, emacs, fetchurl, lib, seq }: elpaBuild { pname = "wisi"; ename = "wisi"; - version = "2.1.0"; + version = "2.2.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/wisi-2.1.0.tar"; - sha256 = "143xfdr7agyc52wz9zsx67rvvnjs4rlj7j3cbdhvs6wyl7whyg38"; + url = "https://elpa.gnu.org/packages/wisi-2.2.1.tar"; + sha256 = "1qvhx8bpms7gri7y6wniwqd6nmqxj4lip5l3sphbq2kjf4zq4qd4"; }; - packageRequires = [ cl-lib emacs seq ]; + packageRequires = [ emacs seq ]; meta = { homepage = "https://elpa.gnu.org/packages/wisi.html"; license = lib.licenses.free; }; }) {}; + wisitoken-grammar-mode = callPackage ({ elpaBuild + , emacs + , fetchurl + , lib + , mmm-mode + , wisi }: + elpaBuild { + pname = "wisitoken-grammar-mode"; + ename = "wisitoken-grammar-mode"; + version = "1.0.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/wisitoken-grammar-mode-1.0.2.tar"; + sha256 = "09rpjl3z6xzap0lbrjs9hf2nspwc5avvx75ah3aimgvizrf2kyp0"; + }; + packageRequires = [ emacs mmm-mode wisi ]; + meta = { + homepage = "https://elpa.gnu.org/packages/wisitoken-grammar-mode.html"; + license = lib.licenses.free; + }; + }) {}; wpuzzle = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "wpuzzle"; @@ -3493,10 +3605,10 @@ elpaBuild { pname = "xclip"; ename = "xclip"; - version = "1.8"; + version = "1.9"; src = fetchurl { - url = "https://elpa.gnu.org/packages/xclip-1.8.el"; - sha256 = "1ymc9dhpwbh92ad7w64p8xlrjdws5c9h90h47ckh6479h8r697xg"; + url = "https://elpa.gnu.org/packages/xclip-1.9.el"; + sha256 = "0xbs6fw0dfm5iynhdx62cwixzizjkrwrib6n0fjnsj31kajbkf3y"; }; packageRequires = []; meta = { @@ -3538,10 +3650,10 @@ elpaBuild { pname = "xr"; ename = "xr"; - version = "1.12"; + version = "1.13"; src = fetchurl { - url = "https://elpa.gnu.org/packages/xr-1.12.tar"; - sha256 = "1vv87h0h8ldc1mbsn45w5z1m6jq8j2js4xz23a9ixdby06g60y3g"; + url = "https://elpa.gnu.org/packages/xr-1.13.tar"; + sha256 = "1km4x92pii8c4bcimks4xzhmwpypdf183z0zh7raj062jz4jb74r"; }; packageRequires = []; meta = { @@ -3586,10 +3698,10 @@ elpaBuild { pname = "zones"; ename = "zones"; - version = "2019.4.30"; + version = "2019.7.13"; src = fetchurl { - url = "https://elpa.gnu.org/packages/zones-2019.4.30.el"; - sha256 = "0f0ryd9wnkg7vh2jv30bqhpzzkaf0gc2ysmib6y36s3m8c2sa9b6"; + url = "https://elpa.gnu.org/packages/zones-2019.7.13.el"; + sha256 = "0qp1ba2pkqx9d35g7z8hf8qs2k455krf2a92l4rka3ipsbnmq5k1"; }; packageRequires = []; meta = { diff --git a/pkgs/applications/editors/emacs-modes/elpa-packages.nix b/pkgs/applications/editors/emacs-modes/elpa-packages.nix index 9c08e91af41..5f0c863b586 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-packages.nix @@ -4,36 +4,36 @@ To update the list of packages from MELPA, -1. Clone https://github.com/ttuegel/emacs2nix. -2. Run `./elpa-packages.sh` from emacs2nix. -3. Copy the new `elpa-generated.nix` file into Nixpkgs. -4. Check for evaluation errors: `nix-instantiate ./. -A emacsPackagesNg.elpaPackages`. -5. `git add pkgs/applications/editors/emacs-modes/elpa-generated.nix && git commit -m "elpa-packages $(date -Idate)"` +1. Run `./update-elpa`. +2. Check for evaluation errors: `nix-instantiate ../../../.. -A emacsPackagesNg.elpaPackages`. +3. `git commit -m "elpa-packages $(date -Idate)" -- elpa-generated.nix` */ { lib, stdenv, texinfo }: -self: +self: let - let + markBroken = pkg: pkg.override { + elpaBuild = args: self.elpaBuild (args // { + meta = (args.meta or {}) // { broken = true; }; + }); + }; - imported = import ./elpa-generated.nix { - inherit (self) callPackage; - }; + elpaBuild = import ../../../build-support/emacs/elpa.nix { + inherit lib stdenv texinfo; + inherit (self) emacs; + }; - super = removeAttrs imported [ "dash" ]; + generateElpa = lib.makeOverridable ({ + generated ? ./elpa-generated.nix + }: let - elpaBuild = import ../../../build-support/emacs/elpa.nix { - inherit lib stdenv texinfo; - inherit (self) emacs; + imported = import generated { + inherit (self) callPackage; }; - markBroken = pkg: pkg.override { - elpaBuild = args: self.elpaBuild (args // { - meta = (args.meta or {}) // { broken = true; }; - }); - }; + super = removeAttrs imported [ "dash" ]; overrides = { # upstream issue: missing footer @@ -50,4 +50,6 @@ self: elpaPackages = super // overrides; - in elpaPackages // { inherit elpaBuild elpaPackages; } + in elpaPackages // { inherit elpaBuild; }); + +in generateElpa { } diff --git a/pkgs/applications/editors/emacs-modes/emacs-libvterm/default.nix b/pkgs/applications/editors/emacs-modes/emacs-libvterm/default.nix deleted file mode 100644 index ba54b9404a0..00000000000 --- a/pkgs/applications/editors/emacs-modes/emacs-libvterm/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ stdenv, fetchFromGitHub, cmake, emacs, libvterm-neovim }: - -let - emacsSources = stdenv.mkDerivation { - name = emacs.name + "-sources"; - src = emacs.src; - - dontConfigure = true; - dontBuild = true; - doCheck = false; - fixupPhase = ":"; - - installPhase = '' - mkdir -p $out - cp -a * $out - ''; - - }; - - libvterm = libvterm-neovim.overrideAttrs(old: rec { - pname = "libvterm-neovim"; - version = "2019-04-27"; - name = pname + "-" + version; - src = fetchFromGitHub { - owner = "neovim"; - repo = "libvterm"; - rev = "89675ffdda615ffc3f29d1c47a933f4f44183364"; - sha256 = "0l9ixbj516vl41v78fi302ws655xawl7s94gmx1kb3fmfgamqisy"; - }; - }); - - -in stdenv.mkDerivation rec { - name = "emacs-libvterm-${version}"; - version = "unstable-2019-07-22"; - - src = fetchFromGitHub { - owner = "akermu"; - repo = "emacs-libvterm"; - rev = "301fe9fdfd5fb2496c8428a11e0812fd8a4c0820"; - sha256 = "0i1hn5gcxayqcbjrnpgczvbicq2vsyn59646ary3crs0mz9wlbpr"; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ emacs libvterm ]; - - cmakeFlags = [ - "-DEMACS_SOURCE=${emacsSources}" - "-DUSE_SYSTEM_LIBVTERM=True" - ]; - - installPhase = '' - install -d $out/share/emacs/site-lisp - install ../*.el $out/share/emacs/site-lisp - install ../*.so $out/share/emacs/site-lisp - ''; -} diff --git a/pkgs/applications/editors/emacs-modes/emacs2nix.nix b/pkgs/applications/editors/emacs-modes/emacs2nix.nix new file mode 100644 index 00000000000..4c1a0dd2312 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/emacs2nix.nix @@ -0,0 +1,23 @@ +let + pkgs = import ../../../.. { }; + + src = pkgs.fetchgit { + url = "https://github.com/ttuegel/emacs2nix.git"; + fetchSubmodules = true; + rev = "752fe1bd891425cb7a4a53cd7b98c194c1fe4518"; + sha256 = "0asfdswh8sbnapbqhbz539zzxmv72f1iviha95iys34sgnd5k1nk"; + }; + +in pkgs.mkShell { + + buildInputs = [ + pkgs.bash + ]; + + EMACS2NIX = "${src}"; + + shellHook = '' + export PATH=$PATH:${src} + ''; + +} diff --git a/pkgs/applications/editors/emacs-modes/manual-packages.nix b/pkgs/applications/editors/emacs-modes/manual-packages.nix new file mode 100644 index 00000000000..7f75de74ed6 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/manual-packages.nix @@ -0,0 +1,145 @@ +{ lib, external, pkgs }: self: with self; with lib.licenses; { + + elisp-ffi = melpaBuild rec { + pname = "elisp-ffi"; + version = "1.0.0"; + src = pkgs.fetchFromGitHub { + owner = "skeeto"; + repo = "elisp-ffi"; + rev = "${version}"; + sha256 = "0z2n3h5l5fj8wl8i1ilfzv11l3zba14sgph6gz7dx7q12cnp9j22"; + }; + buildInputs = [ external.libffi ]; + preBuild = "make"; + recipe = pkgs.writeText "recipe" '' + (elisp-ffi + :repo "skeeto/elisp-ffi" + :fetcher github + :files ("ffi-glue" "ffi.el")) + ''; + meta = { + description = "Emacs Lisp Foreign Function Interface"; + longDescription = '' + This library provides an FFI for Emacs Lisp so that Emacs + programs can invoke functions in native libraries. It works by + driving a subprocess to do the heavy lifting, passing result + values on to Emacs. + ''; + license = publicDomain; + }; + }; + + agda2-mode = with external; trivialBuild { + pname = "agda-mode"; + version = Agda.version; + + phases = [ "buildPhase" "installPhase" ]; + + # already byte-compiled by Agda builder + buildPhase = '' + agda=`${Agda}/bin/agda-mode locate` + cp `dirname $agda`/*.el* . + ''; + + meta = { + description = "Agda2-mode for Emacs extracted from Agda package"; + longDescription = '' + Wrapper packages that liberates init.el from `agda-mode locate` magic. + Simply add this to user profile or systemPackages and do `(require 'agda2)` in init.el. + ''; + homepage = Agda.meta.homepage; + license = Agda.meta.license; + }; + }; + + ess-R-object-popup = + callPackage ./ess-R-object-popup { }; + + filesets-plus = callPackage ./filesets-plus { }; + + font-lock-plus = callPackage ./font-lock-plus { }; + + ghc-mod = melpaBuild rec { + pname = "ghc"; + version = external.ghc-mod.version; + src = external.ghc-mod.src; + packageRequires = [ haskell-mode ]; + propagatedUserEnvPkgs = [ external.ghc-mod ]; + recipe = pkgs.writeText "recipe" '' + (ghc-mod :repo "DanielG/ghc-mod" :fetcher github :files ("elisp/*.el")) + ''; + fileSpecs = [ "elisp/*.el" ]; + meta = { + description = "An extension of haskell-mode that provides completion of symbols and documentation browsing"; + license = bsd3; + }; + }; + + haskell-unicode-input-method = melpaBuild rec { + pname = "emacs-haskell-unicode-input-method"; + version = "20110905.2307"; + src = pkgs.fetchFromGitHub { + owner = "roelvandijk"; + repo = "emacs-haskell-unicode-input-method"; + rev = "d8d168148c187ed19350bb7a1a190217c2915a63"; + sha256 = "09b7bg2s9aa4s8f2kdqs4xps3jxkq5wsvbi87ih8b6id38blhf78"; + }; + recipe = pkgs.writeText "recipe" '' + (haskell-unicode-input-method + :repo "roelvandijk/emacs-haskell-unicode-input-method" + :fetcher github) + ''; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#haskell-unicode-input-method/"; + license = lib.licenses.free; + }; + }; + + hexrgb = callPackage ./hexrgb { }; + + header2 = callPackage ./header2 { }; + + helm-words = callPackage ./helm-words { }; + + icicles = callPackage ./icicles { }; + + rtags = melpaBuild rec { + inherit (external.rtags) version src meta; + + pname = "rtags"; + + dontConfigure = true; + + propagatedUserEnvPkgs = [ external.rtags ]; + recipe = pkgs.writeText "recipe" '' + (rtags + :repo "andersbakken/rtags" :fetcher github + :files ("src/*.el")) + ''; + }; + + lib-requires = + callPackage ./lib-requires { }; + + org-mac-link = + callPackage ./org-mac-link { }; + + perl-completion = + callPackage ./perl-completion { }; + + railgun = callPackage ./railgun { }; + + gn = callPackage ./gn { }; + + structured-haskell-mode = self.shm; + + thingatpt-plus = callPackage ./thingatpt-plus { }; + + tramp = callPackage ./tramp { }; + + yaoddmuse = callPackage ./yaoddmuse { }; + + zeitgeist = callPackage ./zeitgeist { }; + +} diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 527a82aa469..f57c1b71b13 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -12,289 +12,494 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac */ -{ lib, external }: +{ lib, external, pkgs }: variant: self: let -self: - - let - inherit (import ./libgenerated.nix lib self) melpaDerivation; - imported = lib.listToAttrs (map (melpaDerivation "unstable") - (lib.importJSON ./recipes-archive-melpa.json)); - super = builtins.removeAttrs imported [ - "swbuff-x" # required dependency swbuff is missing - ]; - - dontConfigure = pkg: pkg.override (args: { - melpaBuild = drv: args.melpaBuild (drv // { - configureScript = "true"; - }); + dontConfigure = pkg: if pkg != null then pkg.override (args: { + melpaBuild = drv: args.melpaBuild (drv // { + configureScript = "true"; }); + }) else null; - markBroken = pkg: pkg.override (args: { - melpaBuild = drv: args.melpaBuild (drv // { - meta = (drv.meta or {}) // { broken = true; }; - }); + markBroken = pkg: if pkg != null then pkg.override (args: { + melpaBuild = drv: args.melpaBuild (drv // { + meta = (drv.meta or {}) // { broken = true; }; }); + }) else null; - overrides = { - # Expects bash to be at /bin/bash - ac-rtags = markBroken super.ac-rtags; + generateMelpa = lib.makeOverridable ({ + archiveJson ? ./recipes-archive-melpa.json + }: let - # upstream issue: mismatched filename - ack-menu = markBroken super.ack-menu; + inherit (import ./libgenerated.nix lib self) melpaDerivation; + super = lib.listToAttrs (map (melpaDerivation variant) (lib.importJSON archiveJson)); - airline-themes = super.airline-themes.override { - inherit (self.melpaPackages) powerline; - }; + generic = import ./melpa-generic.nix; - # upstream issue: missing file header - bufshow = markBroken super.bufshow; + overrides = rec { + shared = { + # Expects bash to be at /bin/bash + ac-rtags = markBroken super.ac-rtags; - # part of a larger package - caml = dontConfigure super.caml; + airline-themes = super.airline-themes.override { + inherit (self.melpaPackages) powerline; + }; - # Expects bash to be at /bin/bash - company-rtags = markBroken super.company-rtags; + # upstream issue: missing file header + bufshow = markBroken super.bufshow; - easy-kill-extras = super.easy-kill-extras.override { - inherit (self.melpaPackages) easy-kill; - }; + # part of a larger package + caml = dontConfigure super.caml; - editorconfig = super.editorconfig.overrideAttrs (attrs: { - propagatedUserEnvPkgs = [ external.editorconfig-core-c ]; - }); + cmake-mode = super.cmake-mode.overrideAttrs (attrs: { + buildInputs = (attrs.buildInputs or []) ++ [ + external.openssl + ]; + nativeBuildInputs = (attrs.nativeBuildInputs or []) ++ [ + external.pkgconfig + ]; + }); - egg = super.egg.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; - }); + # Expects bash to be at /bin/bash + company-rtags = markBroken super.company-rtags; - # upstream issue: missing file header - elmine = markBroken super.elmine; + easy-kill-extras = super.easy-kill-extras.override { + inherit (self.melpaPackages) easy-kill; + }; - ess-R-data-view = super.ess-R-data-view.override { - inherit (self.melpaPackages) ess ctable popup; - }; + # upstream issue: missing file header + elmine = markBroken super.elmine; - evil-magit = super.evil-magit.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; - }); + elpy = super.elpy.overrideAttrs(old: { + propagatedUserEnvPkgs = old.propagatedUserEnvPkgs ++ [ external.elpy ]; + }); - # missing dependencies - evil-search-highlight-persist = super.evil-search-highlight-persist.overrideAttrs (attrs: { - packageRequires = with self; [ evil highlight ]; - }); + emacsql-sqlite = super.emacsql-sqlite.overrideAttrs(old: { + buildInputs = old.buildInputs ++ [ pkgs.sqlite ]; - # Expects bash to be at /bin/bash - flycheck-rtags = markBroken super.flycheck-rtags; + postBuild = '' + cd source/sqlite + make + cd - + ''; - forge = super.forge.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; - }); + postInstall = '' + install -m=755 -D source/sqlite/emacsql-sqlite \ + $out/share/emacs/site-lisp/elpa/emacsql-sqlite-${old.version}/sqlite/emacsql-sqlite + ''; - # build timeout - graphene = markBroken super.graphene; + stripDebugList = [ "share" ]; + }); - # upstream issue: mismatched filename - helm-lobsters = markBroken super.helm-lobsters; + evil-magit = super.evil-magit.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); - # Expects bash to be at /bin/bash - helm-rtags = markBroken super.helm-rtags; + ess-R-data-view = super.ess-R-data-view.override { + inherit (self.melpaPackages) ess ctable popup; + }; + + # Expects bash to be at /bin/bash + flycheck-rtags = markBroken super.flycheck-rtags; + + # build timeout + graphene = markBroken super.graphene; + + pdf-tools = super.pdf-tools.overrideAttrs(old: { + nativeBuildInputs = [ external.pkgconfig ]; + buildInputs = with external; old.buildInputs ++ [ autoconf automake libpng zlib poppler ]; + preBuild = "make server/epdfinfo"; + recipe = pkgs.writeText "recipe" '' + (pdf-tools + :repo "politza/pdf-tools" :fetcher github + :files ("lisp/pdf-*.el" "server/epdfinfo")) + ''; + }); - # Build same version as Haskell package - hindent = super.hindent.overrideAttrs (attrs: { - version = external.hindent.version; - src = external.hindent.src; - packageRequires = [ self.haskell-mode ]; - propagatedUserEnvPkgs = [ external.hindent ]; - }); + # Build same version as Haskell package + hindent = super.hindent.overrideAttrs (attrs: { + version = external.hindent.version; + src = external.hindent.src; + packageRequires = [ self.haskell-mode ]; + propagatedUserEnvPkgs = [ external.hindent ]; + }); - # upstream issue: missing file header - ido-complete-space-or-hyphen = markBroken super.ido-complete-space-or-hyphen; + # upstream issue: missing file header + ido-complete-space-or-hyphen = markBroken super.ido-complete-space-or-hyphen; + + # upstream issue: missing file header + initsplit = markBroken super.initsplit; + + irony = super.irony.overrideAttrs(old: { + preConfigure = '' + cd server + ''; + preBuild = '' + make + ''; + postInstall = '' + mkdir -p $out + mv $out/share/emacs/site-lisp/elpa/*/server/bin $out + rm -rf $out/share/emacs/site-lisp/elpa/*/server + ''; + preCheck = '' + cd source/server + ''; + dontUseCmakeBuildDir = true; + doCheck = true; + packageRequires = [ self.emacs ]; + nativeBuildInputs = [ external.cmake external.llvmPackages.llvm external.llvmPackages.clang ]; + }); - # upstream issue: missing file header - initsplit = super.initsplit; + # tries to write a log file to $HOME + insert-shebang = super.insert-shebang.overrideAttrs (attrs: { + HOME = "/tmp"; + }); - # tries to write a log file to $HOME - insert-shebang = super.insert-shebang.overrideAttrs (attrs: { - HOME = "/tmp"; - }); + # Expects bash to be at /bin/bash + ivy-rtags = markBroken super.ivy-rtags; - # Expects bash to be at /bin/bash - ivy-rtags = markBroken super.ivy-rtags; + # upstream issue: missing file header + jsfmt = markBroken super.jsfmt; - # upstream issue: missing file header - jsfmt = markBroken super.jsfmt; + # upstream issue: missing file header + maxframe = markBroken super.maxframe; - # upstream issue: missing file header - maxframe = markBroken super.maxframe; + magit = super.magit.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); - magit = - super.magit.overrideAttrs (attrs: { + magit-annex = super.magit-annex.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = (attrs.nativeBuildInputs or []) ++ [ external.git ]; }); - magit-annex = super.magit-annex.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; - }); + magit-todos = super.magit-todos.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); - magit-gitflow = super.magit-gitflow.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; - }); + magit-filenotify = super.magit-filenotify.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); - magithub = super.magithub.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; - }); + magit-gitflow = super.magit-gitflow.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); - magit-svn = super.magit-svn.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; - }); + magithub = super.magithub.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); - magit-todos = super.magit-todos.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; - }); + magit-svn = super.magit-svn.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); - magit-filenotify = super.magit-filenotify.overrideAttrs (attrs: { + kubernetes = super.kubernetes.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = (attrs.nativeBuildInputs or []) ++ [ external.git ]; }); - mhc = super.mhc.override { - inherit (self.melpaPackages) calfw; - }; + # upstream issue: missing file header + mhc = super.mhc.override { + inherit (self.melpaPackages) calfw; + }; - # missing .NET - nemerle = markBroken super.nemerle; + # missing .NET + nemerle = markBroken super.nemerle; - # part of a larger package - notmuch = dontConfigure super.notmuch; + # part of a larger package + notmuch = dontConfigure super.notmuch; - # missing OCaml - ocp-indent = markBroken super.ocp-indent; + # missing OCaml + ocp-indent = markBroken super.ocp-indent; - orgit = - (super.orgit.overrideAttrs (attrs: { - # searches for Git at build time + # upstream issue: missing file header + qiita = markBroken super.qiita; + + # upstream issue: missing file header + speech-tagger = markBroken super.speech-tagger; + + shm = super.shm.overrideAttrs (attrs: { + propagatedUserEnvPkgs = [ external.structured-haskell-mode ]; + }); + + # upstream issue: missing file header + tawny-mode = markBroken super.tawny-mode; + + # Telega has a server portion for it's network protocol + telega = super.telega.overrideAttrs(old: { + + buildInputs = old.buildInputs ++ [ pkgs.tdlib ]; + + postBuild = '' + cd source/server + make + cd - + ''; + + postInstall = '' + mkdir -p $out/bin + install -m755 -Dt $out/bin ./source/server/telega-server + ''; + + }); + + # upstream issue: missing file header + textmate = markBroken super.textmate; + + # missing OCaml + utop = markBroken super.utop; + + vdiff-magit = super.vdiff-magit.overrideAttrs (attrs: { nativeBuildInputs = (attrs.nativeBuildInputs or []) ++ [ external.git ]; - })); + }); - # tries to write to $HOME - php-auto-yasnippets = super.php-auto-yasnippets.overrideAttrs (attrs: { - HOME = "/tmp"; - }); + # upstream issue: missing file header + voca-builder = markBroken super.voca-builder; + + # upstream issue: missing file header + window-numbering = markBroken super.window-numbering; + + zmq = super.zmq.overrideAttrs(old: { + stripDebugList = [ "share" ]; + preBuild = '' + make + ''; + nativeBuildInputs = [ + external.autoconf external.automake external.pkgconfig external.libtool + (external.zeromq.override { enableDrafts = true; }) + ]; + postInstall = '' + mv $out/share/emacs/site-lisp/elpa/zmq-*/src/.libs/emacs-zmq.so $out/share/emacs/site-lisp/elpa/zmq-* + rm -r $out/share/emacs/site-lisp/elpa/zmq-*/src + rm $out/share/emacs/site-lisp/elpa/zmq-*/Makefile + ''; + }); - # upstream issue: mismatched filename - processing-snippets = markBroken super.processing-snippets; + # Map legacy renames from emacs2nix since code generation was ported to emacs lisp + _0blayout = super."0blayout"; + _0xc = super."0xc"; + _2048-game = super."2048-game"; + _4clojure = super."4clojure"; + at = super."@"; + desktop-plus = super."desktop+"; + ghub-plus = super."ghub+"; + git-gutter-plus = super."git-gutter+"; + git-gutter-fringe-plus = super."git-gutter-fringe+"; + ido-completing-read-plus = super."ido-completing-read+"; + image-plus = super."image+"; + image-dired-plus = super."image-dired+"; + markdown-mode-plus = super."markdown-mode+"; + package-plus = super."package+"; + rect-plus = super."rect+"; + term-plus = super."term+"; + term-plus-key-intercept = super."term+key-intercept"; + term-plus-mux = super."term+mux"; + xml-plus = super."xml+"; + }; - # upstream issue: missing file header - qiita = markBroken super.qiita; + stable = shared // { + # part of a larger package + # upstream issue: missing package version + cmake-mode = markBroken (dontConfigure super.cmake-mode); - racer = super.racer.overrideAttrs (attrs: { - postPatch = attrs.postPatch or "" + '' - substituteInPlace racer.el \ - --replace /usr/local/src/rust/src ${external.rustPlatform.rustcSrc} - ''; - }); + # upstream issue: missing file header + connection = markBroken super.connection; - # upstream issue: missing file footer - seoul256-theme = markBroken super.seoul256-theme; + # upstream issue: missing file header + dictionary = markBroken super.dictionary; - spaceline = super.spaceline.override { - inherit (self.melpaPackages) powerline; - }; + # missing git + egg = markBroken super.egg; - # upstream issue: missing file header - speech-tagger = markBroken super.speech-tagger; + # upstream issue: missing dependency redshank + emr = markBroken super.emr; - # upstream issue: missing file header - stgit = markBroken super.stgit; + # upstream issue: doesn't build + eterm-256color = markBroken super.eterm-256color; - # upstream issue: missing file header - tawny-mode = markBroken super.tawny-mode; + # upstream issue: missing dependency highlight + evil-search-highlight-persist = markBroken super.evil-search-highlight-persist; - # upstream issue: missing file header - textmate = markBroken super.textmate; + # upstream issue: missing dependency highlight + floobits = markBroken super.floobits; - treemacs-magit = super.treemacs-magit.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; - }); + # missing OCaml + flycheck-ocaml = markBroken super.flycheck-ocaml; + + # upstream issue: missing dependency + fold-dwim-org = markBroken super.fold-dwim-org; + + # build timeout + graphene = markBroken super.graphene; + + # Expects bash to be at /bin/bash + helm-rtags = markBroken super.helm-rtags; + + # upstream issue: missing file header + link = markBroken super.link; - # missing OCaml - utop = markBroken super.utop; + # missing OCaml + merlin = markBroken super.merlin; - vdiff-magit = - (super.vdiff-magit.overrideAttrs (attrs: { + # upstream issue: missing file header + po-mode = markBroken super.po-mode; + + # upstream issue: truncated file + powershell = markBroken super.powershell; + }; + + unstable = shared // { + # upstream issue: mismatched filename + ack-menu = markBroken super.ack-menu; + + editorconfig = super.editorconfig.overrideAttrs (attrs: { + propagatedUserEnvPkgs = [ external.editorconfig-core-c ]; + }); + + egg = super.egg.overrideAttrs (attrs: { + # searches for Git at build time nativeBuildInputs = (attrs.nativeBuildInputs or []) ++ [ external.git ]; - })); + }); - # upstream issue: missing file header - voca-builder = markBroken super.voca-builder; + # missing dependencies + evil-search-highlight-persist = super.evil-search-highlight-persist.overrideAttrs (attrs: { + packageRequires = with self; [ evil highlight ]; + }); - # upstream issue: missing file header - window-numbering = markBroken super.window-numbering; - - w3m = super.w3m.override (args: { - melpaBuild = drv: args.melpaBuild (drv // { - prePatch = - let w3m = "${lib.getBin external.w3m}/bin/w3m"; in '' - substituteInPlace w3m.el \ - --replace 'defcustom w3m-command nil' \ - 'defcustom w3m-command "${w3m}"' - ''; + forge = super.forge.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + + # upstream issue: mismatched filename + helm-lobsters = markBroken super.helm-lobsters; + + # Expects bash to be at /bin/bash + helm-rtags = markBroken super.helm-rtags; + + # Fails with "package does not untar cleanly into ..." + irony = shared.irony.overrideAttrs(old: { + meta = old.meta // { + broken = true; + }; }); - }); - # Map legacy renames from emacs2nix since code generation was ported to emacs lisp - _0blayout = super."0blayout"; - _0xc = super."0xc"; - _2048-game = super."2048-game"; - _4clojure = super."4clojure"; - at = super."@"; - desktop-plus = super."desktop+"; - # filesets-plus = super."filesets+"; - ghub-plus = super."ghub+"; - git-gutter-plus = super."git-gutter+"; - git-gutter-fringe-plus = super."git-gutter-fringe+"; - ido-completing-read-plus = super."ido-completing-read+"; - image-plus = super."image+"; - image-dired-plus = super."image-dired+"; - markdown-mode-plus = super."markdown-mode+"; - package-plus = super."package+"; - rect-plus = super."rect+"; - term-plus = super."term+"; - term-plus-key-intercept = super."term+key-intercept"; - term-plus-mux = super."term+mux"; - xml-plus = super."xml+"; + orgit = + (super.orgit.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + })); + # tries to write to $HOME + php-auto-yasnippets = super.php-auto-yasnippets.overrideAttrs (attrs: { + HOME = "/tmp"; + }); + + # upstream issue: mismatched filename + processing-snippets = markBroken super.processing-snippets; + + racer = super.racer.overrideAttrs (attrs: { + postPatch = attrs.postPatch or "" + '' + substituteInPlace racer.el \ + --replace /usr/local/src/rust/src ${external.rustPlatform.rustcSrc} + ''; + }); + + # upstream issue: missing file footer + seoul256-theme = markBroken super.seoul256-theme; + + spaceline = super.spaceline.override { + inherit (self.melpaPackages) powerline; + }; + + treemacs-magit = super.treemacs-magit.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + + vterm = let + emacsSources = pkgs.stdenv.mkDerivation { + name = self.emacs.name + "-sources"; + src = self.emacs.src; + + dontConfigure = true; + dontBuild = true; + doCheck = false; + fixupPhase = ":"; + + installPhase = '' + mkdir -p $out + cp -a * $out + ''; + + }; + + libvterm = pkgs.libvterm-neovim.overrideAttrs(old: rec { + pname = "libvterm-neovim"; + version = "2019-04-27"; + name = pname + "-" + version; + src = pkgs.fetchFromGitHub { + owner = "neovim"; + repo = "libvterm"; + rev = "89675ffdda615ffc3f29d1c47a933f4f44183364"; + sha256 = "0l9ixbj516vl41v78fi302ws655xawl7s94gmx1kb3fmfgamqisy"; + }; + }); + + in pkgs.stdenv.mkDerivation rec { + inherit (super.vterm) name version src; + + nativeBuildInputs = [ pkgs.cmake ]; + buildInputs = [ self.emacs libvterm ]; + + cmakeFlags = [ + "-DEMACS_SOURCE=${emacsSources}" + "-DUSE_SYSTEM_LIBVTERM=True" + ]; + + installPhase = '' + install -d $out/share/emacs/site-lisp + install ../*.el $out/share/emacs/site-lisp + install ../*.so $out/share/emacs/site-lisp + ''; + }; + # Legacy alias + emacs-libvterm = unstable.vterm; + + w3m = super.w3m.override (args: { + melpaBuild = drv: args.melpaBuild (drv // { + prePatch = + let w3m = "${lib.getBin external.w3m}/bin/w3m"; in '' + substituteInPlace w3m.el \ + --replace 'defcustom w3m-command nil' \ + 'defcustom w3m-command "${w3m}"' + ''; + }); + }); + }; }; - melpaPackages = - removeAttrs (super // overrides) - [ - "show-marks" # missing dependency: fm - "lenlen-theme" # missing dependency: color-theme-solarized - ]; - in - melpaPackages // { inherit melpaPackages; } + in super // overrides."${variant}"); + +in generateMelpa { } diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix deleted file mode 100644 index 8f52f2d3489..00000000000 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix +++ /dev/null @@ -1,235 +0,0 @@ -/* - -# Updating - -To update the list of packages from MELPA, - - -1. Run ./update-melpa -2. Check for evaluation errors: -env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPackagesNg.melpaStablePackages -env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPackagesNg.melpaPackages -3. `git commit -m "melpa-packages: $(date -Idate)" recipes-archive-melpa.json` - -*/ - -{ lib, external }: - -self: - - let - inherit (import ./libgenerated.nix lib self) melpaDerivation; - imported = lib.listToAttrs (map (melpaDerivation "stable") - (lib.importJSON ./recipes-archive-melpa.json)); - super = imported; - - dontConfigure = pkg: pkg.override (args: { - melpaBuild = drv: args.melpaBuild (drv // { - configureScript = "true"; - }); - }); - - markBroken = pkg: if pkg != null then pkg.override (args: { - melpaBuild = drv: args.melpaBuild (drv // { - meta = (drv.meta or {}) // { broken = true; }; - }); - }) else null; - - overrides = { - # Expects bash to be at /bin/bash - ac-rtags = markBroken super.ac-rtags; - - airline-themes = super.airline-themes.override { - inherit (self.melpaPackages) powerline; - }; - - # upstream issue: missing file header - bufshow = markBroken super.bufshow; - - # part of a larger package - caml = dontConfigure super.caml; - - # part of a larger package - # upstream issue: missing package version - cmake-mode = markBroken (dontConfigure super.cmake-mode); - - # Expects bash to be at /bin/bash - company-rtags = markBroken super.company-rtags; - - # upstream issue: missing file header - connection = markBroken super.connection; - - # upstream issue: missing file header - dictionary = markBroken super.dictionary; - - easy-kill-extras = super.easy-kill-extras.override { - inherit (self.melpaPackages) easy-kill; - }; - - # missing git - egg = markBroken super.egg; - - # upstream issue: missing file header - elmine = markBroken super.elmine; - - # upstream issue: missing dependency redshank - emr = markBroken super.emr; - - ess-R-data-view = super.ess-R-data-view.override { - inherit (self.melpaPackages) ess ctable popup; - }; - - # upstream issue: doesn't build - eterm-256color = markBroken super.eterm-256color; - - # upstream issue: missing dependency highlight - evil-search-highlight-persist = markBroken super.evil-search-highlight-persist; - - # upstream issue: missing dependency highlight - floobits = markBroken super.floobits; - - # missing OCaml - flycheck-ocaml = markBroken super.flycheck-ocaml; - - # Expects bash to be at /bin/bash - flycheck-rtags = markBroken super.flycheck-rtags; - - # upstream issue: missing dependency - fold-dwim-org = markBroken super.fold-dwim-org; - - # build timeout - graphene = markBroken super.graphene; - - # Expects bash to be at /bin/bash - helm-rtags = markBroken super.helm-rtags; - - # Build same version as Haskell package - hindent = super.hindent.overrideAttrs (attrs: { - version = external.hindent.version; - src = external.hindent.src; - packageRequires = [ self.haskell-mode ]; - propagatedUserEnvPkgs = [ external.hindent ]; - }); - - # upstream issue: missing file header - ido-complete-space-or-hyphen = markBroken super.ido-complete-space-or-hyphen; - - # upstream issue: missing file header - initsplit = markBroken super.initsplit; - - # upstream issue: recipe fails - insert-shebang = markBroken super.insert-shebang; - - # Expects bash to be at /bin/bash - ivy-rtags = markBroken super.ivy-rtags; - - # upstream issue: missing file header - jsfmt = markBroken super.jsfmt; - - # upstream issue: missing file header - link = markBroken super.link; - - # upstream issue: missing file header - maxframe = markBroken super.maxframe; - - magit = - (super.magit.override { - # version of magit-popup needs to match magit - # https://github.com/magit/magit/issues/3286 - inherit (self.melpaStablePackages) magit-popup; - }).overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; - }); - - magit-todos = super.magit-todos.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; - }); - - magit-filenotify = super.magit-filenotify.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; - }); - - # missing OCaml - merlin = markBroken super.merlin; - - mhc = super.mhc.override { - inherit (self.melpaPackages) calfw; - }; - - # missing .NET - nemerle = markBroken super.nemerle; - - # part of a larger package - notmuch = dontConfigure super.notmuch; - - # missing OCaml - ocp-indent = markBroken super.ocp-indent; - - # upstream issue: missing file header - po-mode = markBroken super.po-mode; - - # upstream issue: truncated file - powershell = markBroken super.powershell; - - # upstream issue: missing file header - qiita = markBroken super.qiita; - - # upstream issue: missing file header - speech-tagger = markBroken super.speech-tagger; - - # upstream issue: missing file header - stgit = markBroken super.stgit; - - # upstream issue: missing file header - tawny-mode = markBroken super.tawny-mode; - - # upstream issue: missing file header - textmate = markBroken super.textmate; - - # missing OCaml - utop = markBroken super.utop; - - vdiff-magit = - (super.vdiff-magit.overrideAttrs (attrs: { - nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; - })); - - # upstream issue: missing file header - voca-builder = markBroken super.voca-builder; - - # upstream issue: missing file header - window-numbering = markBroken super.window-numbering; - - # Map legacy renames from emacs2nix since code generation was ported to emacs lisp - _0blayout = super."0blayout"; - _0xc = super."0xc"; - _2048-game = super."2048-game"; - _4clojure = super."4clojure"; - at = super."@"; - desktop-plus = super."desktop+"; - ghub-plus = super."ghub+"; - git-gutter-plus = super."git-gutter+"; - git-gutter-fringe-plus = super."git-gutter-fringe+"; - ido-completing-read-plus = super."ido-completing-read+"; - image-plus = super."image+"; - image-dired-plus = super."image-dired+"; - markdown-mode-plus = super."markdown-mode+"; - package-plus = super."package+"; - rect-plus = super."rect+"; - term-plus = super."term+"; - term-plus-key-intercept = super."term+key-intercept"; - term-plus-mux = super."term+mux"; - xml-plus = super."xml+"; - - }; - - melpaStablePackages = super // overrides; - in - melpaStablePackages // { inherit melpaStablePackages; } diff --git a/pkgs/applications/editors/emacs-modes/nyan-mode/default.nix b/pkgs/applications/editors/emacs-modes/nyan-mode/default.nix deleted file mode 100644 index e0057fd30ce..00000000000 --- a/pkgs/applications/editors/emacs-modes/nyan-mode/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{lib, trivialBuild, fetchFromGitHub}: - -trivialBuild rec { - pname = "nyan-mode"; - version = "20150128"; - - src = fetchFromGitHub { - owner = "TeMPOraL"; - repo = pname; - rev = "41faa2c809da7b2cb3e6f8fadefae3f338ced3f2"; - sha256 = "1idaac7sjc8hhbf5zif61ncg1pvg28c0qfihavdx61albww0ll7f"; - }; - - patches = [ ./directory.patch ]; - - preBuild = '' - substituteInPlace nyan-mode.el \ - --replace "@OUT@" "$out/" - ''; - - postInstall = '' - cp -r img $out - cp -r mus $out - ''; - - meta = { - description = "An analog indicator of the position in the buffer"; - license = lib.licenses.gpl3Plus; - }; -} diff --git a/pkgs/applications/editors/emacs-modes/nyan-mode/directory.patch b/pkgs/applications/editors/emacs-modes/nyan-mode/directory.patch deleted file mode 100644 index b471531ec34..00000000000 --- a/pkgs/applications/editors/emacs-modes/nyan-mode/directory.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/nyan-mode.el b/nyan-mode.el -index 939a25a..3d0b983 100644 ---- a/nyan-mode.el -+++ b/nyan-mode.el -@@ -106,7 +106,7 @@ This can be t or nil." - :group 'nyan) - - --(defconst +nyan-directory+ (file-name-directory (or load-file-name buffer-file-name))) -+(defconst +nyan-directory+ "@OUT@") - - (defconst +nyan-cat-size+ 3) - diff --git a/pkgs/applications/editors/emacs-modes/org-packages.nix b/pkgs/applications/editors/emacs-modes/org-packages.nix index 46b90a52a09..1f37cf624f9 100644 --- a/pkgs/applications/editors/emacs-modes/org-packages.nix +++ b/pkgs/applications/editors/emacs-modes/org-packages.nix @@ -2,22 +2,23 @@ # Updating -To update the list of packages from ELPA, +To update the list of packages from Org (ELPA), -1. Clone https://github.com/ttuegel/emacs2nix -2. Run `./org-packages.sh` from emacs2nix -3. Copy the new org-packages.json file into Nixpkgs -4. `git commit -m "org-packages $(date -Idate)"` +1. Run `./update-org`. +2. Check for evaluation errors: `nix-instantiate ../../../.. -A emacsPackagesNg.orgPackages`. +3. `git commit -m "org-packages $(date -Idate)" -- org-generated.nix` */ -{ }: +{ lib }: -self: +self: let - let + generateOrg = lib.makeOverridable ({ + generated ? ./org-generated.nix + }: let - imported = import ./org-generated.nix { + imported = import generated { inherit (self) callPackage; }; @@ -26,6 +27,6 @@ self: overrides = { }; - orgPackages = super // overrides; + in super // overrides); - in orgPackages // { inherit orgPackages; } +in generateOrg { } diff --git a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json index d0f1ce982ce..00bcb16b31b 100644 --- a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json @@ -24,6 +24,30 @@ } }, { + "ename": "0x0", + "commit": "a48b10b770038efc606fbbbedf79178d3b05186c", + "sha256": "1nkc5hfz77s37a1rp8m69f7zbk05jc1y1fcj0b46h9khyz6zbm01", + "fetcher": "git", + "url": "https://git.sr.ht/~zge/nullpointer-emacs", + "unstable": { + "version": [ + 20190801, + 902 + ], + "commit": "129585c4096e78f46b741c7729915f666bfee501", + "sha256": "0jplfnp4cn5vgj99g0ks0g9k2ij8yz1h24c6ghbz0hxd5bh5g889" + }, + "stable": { + "version": [ + 0, + 1, + 1 + ], + "commit": "129585c4096e78f46b741c7729915f666bfee501", + "sha256": "0jplfnp4cn5vgj99g0ks0g9k2ij8yz1h24c6ghbz0hxd5bh5g889" + } + }, + { "ename": "0xc", "commit": "3fbb2c86a50a8df9a3967787fc10f33beab2c933", "sha256": "0lxcz1x1dymsh9idhkn7jn8vphr724d6sb88a4g55x2m1rlmzg3w", @@ -3586,8 +3610,8 @@ "repo": "jyp/attrap", "unstable": { "version": [ - 20190207, - 1410 + 20190805, + 1829 ], "deps": [ "dash", @@ -3595,8 +3619,8 @@ "flycheck", "s" ], - "commit": "3b092bb8f6755a97e6ecb7623b9d2dde58beba4a", - "sha256": "05d32980saji8ja1pcv65l0s3dq7w0n5hpikbf246hciy1x067pp" + "commit": "25d34a6c5f13ee6de5da60f3dae25d7e4961d991", + "sha256": "0bvymi8cfalv64a5zh1ln641qfgrdmqvsfd0d9c82xjrz19ffnpm" }, "stable": { "version": [ @@ -3740,11 +3764,11 @@ "repo": "DamienCassou/auth-password-store", "unstable": { "version": [ - 20190628, - 650 + 20190812, + 936 ], - "commit": "a40196e4bff7cfe1139dd744dc6a76f9404552cb", - "sha256": "19d97rphr0wcd7mh2wy74abfzi7g24iblcmhimwrycbf9qxbfgvp" + "commit": "2039468bb800d676ff02a76c8fabda168696b564", + "sha256": "07q7hjk40rz0cji1ygmybkwn6pm86m8fzkisdv920qpi6i2jhgvz" }, "stable": { "version": [ @@ -4358,14 +4382,14 @@ "repo": "ncaq/auto-sudoedit", "unstable": { "version": [ - 20180915, - 706 + 20190809, + 735 ], "deps": [ "f" ], - "commit": "6e30a349fc8865ffd99b077140611820bf3e48ef", - "sha256": "1mi158sg275ln2drlwqzm28jka96fqkhkylqhay27vgrddnnqyda" + "commit": "4d7aeeeff339683a5d4eed05de357058a11f2e02", + "sha256": "10zbillf66bnhni08x159w4nrd08x8zsagam3c7c7555p1ccf5rk" } }, { @@ -4559,8 +4583,8 @@ 20190331, 2230 ], - "commit": "d52853e93b40fc54ffd4552df9b8c07ad5446013", - "sha256": "0jdy1lqg3s01dxlpigqm0ss4kid2kzrhhyqm15rlj9s0ghdrbnby" + "commit": "ef0c6b84d92eecd05aa5cd4a35b73652f21b311a", + "sha256": "0wh0fwl2mimb48g2sf2nhmr3xxwvgkgr3566187x3kw8zxgh1nv7" } }, { @@ -6425,11 +6449,11 @@ "repo": "joodland/bm", "unstable": { "version": [ - 20190527, - 2110 + 20190807, + 1217 ], - "commit": "637dacf4cb9112fdfb949706a704dd53cbe79c7e", - "sha256": "180b3rc13asrmsdh7v405d54jkrininvaj52xhp71vw91ng51dkn" + "commit": "8129428182e1b8a647d16fceb2d08cc0a2a5f3c7", + "sha256": "048n596psrnvz5hi7i7vs0dyk6i6m9krzfh8fld95yggyyikf0iw" }, "stable": { "version": [ @@ -6656,16 +6680,16 @@ "repo": "jyp/boon", "unstable": { "version": [ - 20190720, - 2129 + 20190802, + 959 ], "deps": [ "dash", "expand-region", "multiple-cursors" ], - "commit": "e482b889cc652b25508c3ac0ddeff35f3140bf73", - "sha256": "12axjkmcnclpzbzvf6nfaswjdj7r68gjx3x5lkk08w9361f4yxz1" + "commit": "a1df9a6d8d01ead25583ec086de71e3d5840eba9", + "sha256": "0ak04sh49zkgz66hbgwvjmdxnxs4zsx1aw5yx79r0fd5rpxscxfi" }, "stable": { "version": [ @@ -6689,16 +6713,16 @@ "repo": "emacscollective/borg", "unstable": { "version": [ - 20190717, - 1753 + 20190802, + 2023 ], "deps": [ "dash", "epkg", "magit" ], - "commit": "c177e602cc41dca7b885f0d443d3cb46577f92cd", - "sha256": "15zn7var3cjd479snw4mw0z92lsmm4k3l68nkjmnxih9y5dhhiah" + "commit": "b338e13e8de7bb2e0eef093fdb79fb763910c7e8", + "sha256": "0ydj3xs856gbm559f20zrnag5rbhy9s60qs2x5kwwdn921mdcsgj" }, "stable": { "version": [ @@ -7391,14 +7415,14 @@ "repo": "sshaw/build-status", "unstable": { "version": [ - 20171111, - 1947 + 20190807, + 1231 ], "deps": [ "cl-lib" ], - "commit": "ef44185d9dd748ea578d68398f3f729a8adb45b5", - "sha256": "00zcmmdccgzb5cp1nd9kjpiqs3zd9rh0z7aj9kmwsffaq339g55n" + "commit": "1a1d2473aa62f2fdda47d8bfeb9fe352d2579b48", + "sha256": "03mxvqiknca5dzcr5j3xdwfyjpq172rbj3dgdfjms8lbgxgm4kgw" }, "stable": { "version": [ @@ -7579,26 +7603,26 @@ "url": "https://bitbucket.org/olanilsson/buttercup-junit", "unstable": { "version": [ - 20181111, - 2058 + 20190802, + 2258 ], "deps": [ "buttercup" ], - "commit": "f95f91ac61137ed78b65642160bfe107f0ad8973", - "sha256": "1jazvil9zzc7g5hp6f43ba7k99kwriidhan20ig4nx1wgmngdzhr" + "commit": "6bc28b6b0f36fb71b0915c9e45963c840c64a8df", + "sha256": "1rayxq1va7jpikfr37p8nq2pv339mhq7zqy082kzwvj5q6qfw88s" }, "stable": { "version": [ 1, 1, - 0 + 1 ], "deps": [ "buttercup" ], - "commit": "0bae5577c7dd026b11a75dc5a565e74c9422b958", - "sha256": "0x0ndyhmria7mg0pxbpkar7sgvgv9hklsflwkhnjy6gxrc330zx1" + "commit": "6bc28b6b0f36fb71b0915c9e45963c840c64a8df", + "sha256": "1rayxq1va7jpikfr37p8nq2pv339mhq7zqy082kzwvj5q6qfw88s" } }, { @@ -8101,7 +8125,7 @@ "error": [ "exited abnormally with code 1\n", "", - "warning: unknown setting 'system-features'\nerror: unable to download 'https://github.com/ocaml/caml-mode/archive/9803cf37ac52bbfa5130fde0f228dc51c4590c2d.tar.gz': HTTP error 404 (curl error: No error)\n" + "error: unable to download 'https://github.com/ocaml/caml-mode/archive/9803cf37ac52bbfa5130fde0f228dc51c4590c2d.tar.gz': HTTP error 404\n" ] } }, @@ -8656,15 +8680,15 @@ "repo": "ema2159/centaur-tabs", "unstable": { "version": [ - 20190729, - 1510 + 20190812, + 1915 ], "deps": [ "cl-lib", "powerline" ], - "commit": "2e033e3aacab147f730f122509088d82304302f1", - "sha256": "1nh0zzc4g80m6np4r17ghrkbvz6bmd23l0m2piysgm25iwylya4f" + "commit": "de3738c14b8e73e135c16e26ca405f18459fbb20", + "sha256": "11w5nhiaz7wrb8kgkv832xg0fmm0251wy6klxrk5gsdjh2c5qf26" } }, { @@ -8779,8 +8803,8 @@ 20171115, 2108 ], - "commit": "d00cbe3643230f71ad108d0037b9e1d72b60dc79", - "sha256": "1x3v28fs4d2r8mqfkhrmi1slrb2z8hz30ginv020bq6y20v3na6x" + "commit": "2a473e3acb297086c988a84972ab37f77fabaaa9", + "sha256": "0piak5l66al28xg9m7ypv83l12q3v9fcndvnnarqvpmh5db1alp1" }, "stable": { "version": [ @@ -9311,14 +9335,14 @@ "repo": "SavchenkoValeriy/emacs-chocolate-theme", "unstable": { "version": [ - 20190724, - 702 + 20190811, + 1414 ], "deps": [ "autothemer" ], - "commit": "7d9be4a0516d5ccab61c21af1e2a1555c4cee456", - "sha256": "01rk3ls2ji59mmr5s1ijbc92186m4hc3mv43j24sbcbci64h21k0" + "commit": "7b005d9ef522ccde84fc9488fa6ea3cc429f9c48", + "sha256": "176f7gcpzzsr74cspcm0f44bxpb8a4244zzljlqfpksfg8qpf23d" } }, { @@ -9421,8 +9445,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20190720, - 1656 + 20190811, + 1423 ], "deps": [ "clojure-mode", @@ -9433,8 +9457,8 @@ "sesman", "spinner" ], - "commit": "dd6d4c4236c6a7beb2ad755f9ef65e6243092fd8", - "sha256": "16hmgy7gwfqdcahy0q5vwjhgrsv6k8jf8mlijb30pxsn6jlrwmc9" + "commit": "31f83dfadbf0d180a6273f8b19429e12bc23ef3a", + "sha256": "0bwjg4fgn9l9xjk4q7mkn56nlvygfjg5hzfdy3hy2k6a2w4s9ka0" }, "stable": { "version": [ @@ -10319,14 +10343,14 @@ "repo": "emacscollective/closql", "unstable": { "version": [ - 20190716, - 1430 + 20190731, + 1450 ], "deps": [ "emacsql-sqlite" ], - "commit": "f2f1d7bc76153ec257cb13452075f51feb99f14e", - "sha256": "0264sg0dwlwrfflj4wjxlf9lsbhd28gahgcyi1drvhpb0nr6d82r" + "commit": "70b98dbae53611d10a461d9b4a6f71086910dcef", + "sha256": "1wvhrihg663f61yzc7f0vha2abjdnlwbk0gjcwakdfk1bhwf5ikh" }, "stable": { "version": [ @@ -10364,11 +10388,11 @@ "repo": "vallyscode/cloud-theme", "unstable": { "version": [ - 20190723, - 2316 + 20190811, + 1842 ], - "commit": "6fa1274f3f09e43c6749e658c88bb8237fc3d168", - "sha256": "0hkbajihpczagywmbf7a5jbbv2696gj86glyk58j7i28c7vw8x45" + "commit": "195ef1d55cf0e9aa25a257c93f1cff5ecf807374", + "sha256": "011f7x1qdjpz9vz76nd743fzlk2lp696286x2q3gmdhrmg7h3csc" } }, { @@ -10502,17 +10526,17 @@ 20190710, 1319 ], - "commit": "33d9a691306956750bffb10be9d0b17a47c0ec0b", - "sha256": "0hgri0dpj7km0xnfw7j0fm4g4952qqg47mv64wkx1gmd3ahbcvpb" + "commit": "7d194f7d8331a127e0b2b921dc6bc0abfe21a0f5", + "sha256": "0gqpm4cgcx176kamgx8p3vxxf9r41ckxy20gdw153fqbba2prsip" }, "stable": { "version": [ 3, 15, - 1 + 2 ], - "commit": "f43a7d76c737c5bb9b903a2b1be5186c081ec21e", - "sha256": "1335nx2nxjq3hc9nsrl86yjifgbflaz6l1v4ga6piww1qfniky70" + "commit": "40bbe50e23c06232ccf1c49589dde5dd84e1ac31", + "sha256": "006ziv2imzxpq646f3vq30ylbpp84l2hf7ki0l7s521g1ikh1dy0" } }, { @@ -10854,14 +10878,14 @@ "repo": "ankurdave/color-identifiers-mode", "unstable": { "version": [ - 20181120, - 1951 + 20190805, + 1455 ], "deps": [ "dash" ], - "commit": "4ba39f0274e1f85e50c956c507f942d950891a20", - "sha256": "102vyyal2zv8smbc7a362ibk5kl5nylplfjjx9w8r5pyapygq7mq" + "commit": "58fc8706a8f44e8df4678eec8ce15636fd4db758", + "sha256": "04splp4nvfva2cv87gwmga9ak4fk1x8z087lbz0x46qy9sj0dpz4" }, "stable": { "version": [ @@ -10997,11 +11021,11 @@ "repo": "purcell/color-theme-sanityinc-tomorrow", "unstable": { "version": [ - 20190801, - 1755 + 20190809, + 1314 ], - "commit": "3648bb7d0e85e2d980c8a1f42ae400735c974fce", - "sha256": "0j1rllrjzpj3kvzd7sv883lnbbfd1ad3nnq6sp4j2v40n7smin8i" + "commit": "025cda606860800fe32a81e25e81e18e2d841069", + "sha256": "0c6ibf29gxnm53q1xsrnfcl8r93apqpcljgj4m9knzswizxb2mqs" }, "stable": { "version": [ @@ -11038,11 +11062,11 @@ "url": "https://git.sr.ht/~lthms/colorless-themes.el", "unstable": { "version": [ - 20190720, - 752 + 20190802, + 725 ], - "commit": "2ae9a1e5e7bd073154f1557000b8535a113eddfc", - "sha256": "0h73zgwfl8v8x75lbxz4s5z50njv97whrj0nh435cjnjm85c13b2" + "commit": "4f9d0ec5a078ab8442abdba0c35eb748728f3052", + "sha256": "1h8ggaqvrdj8cyknps9anh2xz08ar94137gydvxy8xgrmpa3jnc1" } }, { @@ -12375,15 +12399,15 @@ "repo": "emacs-php/phpactor.el", "unstable": { "version": [ - 20190403, - 216 + 20190812, + 1454 ], "deps": [ "company", "phpactor" ], - "commit": "fcdbae4b12735d6d1595f76275e5a6a589a20c7a", - "sha256": "1kx9pk6a4kc3x58qfv35fvh9hkp2xgw2yxj98n065xr82yzzd6m1" + "commit": "01ced487c673e027332ecb99c444f819b05ab40b", + "sha256": "0ish3kvzn1j1arg6n1mglzsb46sc7hr7gqgnw2084kj56y5q6rjp" }, "stable": { "version": [ @@ -12805,8 +12829,8 @@ "repo": "TommyX12/company-tabnine", "unstable": { "version": [ - 20190723, - 2214 + 20190811, + 2013 ], "deps": [ "cl-lib", @@ -12815,8 +12839,8 @@ "s", "unicode-escape" ], - "commit": "8123d33951144fd3da10240dfa7f274cac0ac8ad", - "sha256": "0sfn2q2vpnjdw209n4fvaqgwq176r3aqiir3bvab5gwwk6wnqy09" + "commit": "df5e5fbfdb2ac174c031b75576a059429c6fb3a3", + "sha256": "0vxj9dm7h082i4jj8h8nh164jgdyxqr2fdavn2biwxijmdykp63p" } }, { @@ -13560,14 +13584,14 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20190731, - 46 + 20190809, + 1548 ], "deps": [ "swiper" ], - "commit": "4389a261b30c8fbfc6e31228b33b1764221daac7", - "sha256": "153a9nn0m6q5a4psw2vvnmqixkny56dlbrfvvw45zc9ikdd1wv2b" + "commit": "20d604c139b82d98010aabbbc00ad487438bdf8e", + "sha256": "0clg04az8v5ia3z5fxcimprqp4kbf2g1z6na3js60gmi689ks8ll" }, "stable": { "version": [ @@ -13694,28 +13718,28 @@ "repo": "redguardtoo/counsel-etags", "unstable": { "version": [ - 20190801, - 1416 + 20190802, + 652 ], "deps": [ "counsel", "ivy" ], - "commit": "77ac96ed2ebedd334057b4f4ef3bf5755544f7fe", - "sha256": "1r6vydmdxfs7mpqnxk6lb91hyd8w4ljqj069hnpa17b7s2rqvy3r" + "commit": "fda1f77eb8548c4451894886ef5e99815dfc1bf8", + "sha256": "0rmdl93kgyydwa96yclds9vwly41bpk8v18cbqc1x266w6v77dr9" }, "stable": { "version": [ 1, 8, - 8 + 9 ], "deps": [ "counsel", "ivy" ], - "commit": "2dbc3f24c6150ce581a55a122321c54019800211", - "sha256": "0iaa75h9phinzcawj12rj3d16dpwd8h0jgnv6d7d01wdg582dldc" + "commit": "fda1f77eb8548c4451894886ef5e99815dfc1bf8", + "sha256": "0rmdl93kgyydwa96yclds9vwly41bpk8v18cbqc1x266w6v77dr9" } }, { @@ -15039,8 +15063,8 @@ 20190111, 2150 ], - "commit": "ac1c9fe47491d01fb80cdde3ccd3e61152a973c7", - "sha256": "1b1k4f22f4kcx606gii0rmn2rslz66rh711jjvkl5s21q9amyzwr" + "commit": "8cf109c0f19ad8c36b8a5368d138912495963387", + "sha256": "07wmv5hgi7db1cx6xrjsa8r337frm3cx38l1jglr9kf5qkw917q1" }, "stable": { "version": [ @@ -15247,8 +15271,8 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20190722, - 1641 + 20190810, + 1131 ], "deps": [ "bui", @@ -15259,8 +15283,8 @@ "s", "tree-mode" ], - "commit": "7d22cf541d7a23d6366a36b33bc8a36d4b583d66", - "sha256": "1h7a01rjc7cm66dcsvgm2icrk3c7gach0l6xg72gg2gwv6wrcj4x" + "commit": "f01c7d2a32ce04d6643771a6e4d38fd1fb3bfbe6", + "sha256": "1nv7h16wy60rhylbc5zd79i4mf5gy76j7h6qgq0jql607pqkrjxr" }, "stable": { "version": [ @@ -15446,23 +15470,17 @@ "repo": "bradyt/dart-mode", "unstable": { "version": [ - 20190629, - 2353 - ], - "deps": [ - "cl-lib", - "dash", - "flycheck", - "s" + 20190808, + 2226 ], - "commit": "31861e81fdc21cb562942bf3a69f6c5aec2050ec", - "sha256": "1paqzicfngw9vhmjw21cv8rwnrrzw28gvgrc4zr7434h1nrs4h3n" + "commit": "9b65aae8c79132275733ee4324948446c88a6b93", + "sha256": "0149axzm52f2j80qpcafb6db2knzrmp43ln0zcx4dj1qsrmq5mbj" }, "stable": { "version": [ 1, 0, - 4 + 5 ], "deps": [ "cl-lib", @@ -15470,8 +15488,8 @@ "flycheck", "s" ], - "commit": "d78c5c796da53108a824967932cf6c773426e10f", - "sha256": "1x04vhmwg0hn54dfskwp8dnghjyyn8rha3vpfqw37qjchf3js3f0" + "commit": "d414a5faf22f7fafbb0a8208b88cecd6324704bf", + "sha256": "1qmdlwjmmqyyb65sqvfpygifai5m0llc815vp0jqwp8ldd8ls172" } }, { @@ -15910,29 +15928,29 @@ "repo": "Wilfred/deadgrep", "unstable": { "version": [ - 20190516, - 2159 + 20190807, + 2125 ], "deps": [ "dash", "s", "spinner" ], - "commit": "caeb37b8d6ab83f0eba353d6bbb29678190d4419", - "sha256": "158fqha8nilwfzmw15lcsq8b099j8wclzq303md0j4mfr2q2gfvs" + "commit": "329119c65126f7917d3910bc584f4191ba8f21ac", + "sha256": "0fxf7gq9sjfkgpdfqx10w3l3nd4rwa8kv9plyxk1fqacb3s5m6ai" }, "stable": { "version": [ 0, - 7 + 8 ], "deps": [ "dash", "s", "spinner" ], - "commit": "1d64c113f562a80147cdb6041a2dd48e5ba2da5d", - "sha256": "025xj4hc1k87wmbx2imvxb9brfnajclpd4rj7j1yg85gbk7a99v5" + "commit": "094ad453e8bc0451a2c062d06db3079f003566d2", + "sha256": "18prsg8kyngz8f0l9kjhaz23al9fna2naazy324bjj0sn9yiqgd4" } }, { @@ -16517,28 +16535,28 @@ "repo": "cqql/dictcc.el", "unstable": { "version": [ - 20190118, - 2002 + 20190807, + 1504 ], "deps": [ "cl-lib", "ivy" ], - "commit": "3244897515db954eafeed9648e7a0011b89c3ce2", - "sha256": "1nlgz3i8kynhl6d6h5rszja14z5n7ri83mm5ks90nbdhjcqwk3qd" + "commit": "33df7c64ee5bb9faf77a4b80cd123d35a15ad706", + "sha256": "1dxn41p4bmi7l8lz6kp56qhb4v2qi7x8wijyicd3715amsagl2jc" }, "stable": { "version": [ 1, 0, - 1 + 2 ], "deps": [ "cl-lib", "ivy" ], - "commit": "3244897515db954eafeed9648e7a0011b89c3ce2", - "sha256": "1nlgz3i8kynhl6d6h5rszja14z5n7ri83mm5ks90nbdhjcqwk3qd" + "commit": "33df7c64ee5bb9faf77a4b80cd123d35a15ad706", + "sha256": "1dxn41p4bmi7l8lz6kp56qhb4v2qi7x8wijyicd3715amsagl2jc" } }, { @@ -18306,8 +18324,8 @@ "repo": "Silex/docker.el", "unstable": { "version": [ - 20190730, - 711 + 20190812, + 1155 ], "deps": [ "dash", @@ -18317,8 +18335,8 @@ "s", "tablist" ], - "commit": "df80f8010c86658f1a9ed0e8ba298f34940123bf", - "sha256": "06b45abmifrad9kk84lg5fp5ncg2jqmcfcfdjqcgzcys93ysm00z" + "commit": "55635cb15b1dc3945174de04f4bab22129e675e8", + "sha256": "0wv36b7w5cya6yr0phvg8ws3kc138ya1b4vimjf6chzhx3r6mhy7" }, "stable": { "version": [ @@ -18581,30 +18599,30 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20190801, - 1802 + 20190812, + 1448 ], "deps": [ "all-the-icons", "dash", "shrink-path" ], - "commit": "ada38ab4d8ea0e234a6a242e3ae53b6c1174e620", - "sha256": "1l3bg6ihcrf48fx6mhc30wgq9csyaqri4a3fv440qa527l4wf8p0" + "commit": "a6145d435ae380dbbff4d148e3c200b89a60d010", + "sha256": "0mny8zz3l4bqgbshmfgrf5y7zn0jkgawfgzn189bw68x87i8fwp3" }, "stable": { "version": [ 2, - 4, - 1 + 5, + 0 ], "deps": [ "all-the-icons", "dash", "shrink-path" ], - "commit": "6ecda37e4550e85cfa5e4957d0a05bd393e6a4b3", - "sha256": "1dlrq4p0jl30n786nxfnnm7mw4c1978kbrll7w9snsclm6crw99s" + "commit": "eb3258b50399ae7a2ed2edea797238a21352ea22", + "sha256": "1xx2zjksh93z6px89w4grycry9m8vh864m0p471q0g77r16z2prn" } }, { @@ -18615,14 +18633,14 @@ "repo": "hlissner/emacs-doom-themes", "unstable": { "version": [ - 20190731, - 1645 + 20190812, + 2115 ], "deps": [ "cl-lib" ], - "commit": "7015afb483397a0fadba3c638e2af4edfb84a344", - "sha256": "1is81xnibql3g8ix8swpwrknjxyq10r341ngpad8pz7286cw487s" + "commit": "ae18b84e01496c4ebd572cad00a89516af089a94", + "sha256": "0zcsk2z5z0hh9plbig4ba1ywzbdy0mar1jfm0c5mi46vl0vb29i7" }, "stable": { "version": [ @@ -19062,8 +19080,8 @@ "repo": "dtk01/dtk", "unstable": { "version": [ - 20190722, - 1307 + 20190803, + 2120 ], "deps": [ "cl-lib", @@ -19071,8 +19089,8 @@ "s", "seq" ], - "commit": "01ae65c601be9906047ee490f52966427e3efd62", - "sha256": "177lmi4kza3lavr5zlmm5679g5ghqg93j69flkisz6jv92ynr98d" + "commit": "cc5807cc38417060725f1f5ab2efca8baf074053", + "sha256": "0vwx0s3hli1ql2rfkqcv4y7n6ln4yrp3h2a7x8vrp99h6rb6xxg0" } }, { @@ -19180,8 +19198,8 @@ "repo": "jacktasia/dumb-jump", "unstable": { "version": [ - 20190801, - 1558 + 20190804, + 533 ], "deps": [ "dash", @@ -19189,8 +19207,8 @@ "popup", "s" ], - "commit": "5e3e47fce8e24c42ad65fb9e6e5f92086834b3c6", - "sha256": "1a0zs58j1027pllssb3pai2654wbvdbf2g0y3dqbg35gfqanaizp" + "commit": "7ffa63cdc8481158a2dbfe4acc6719ebe7fff056", + "sha256": "1l682xjish7v8mdkfdjqbdz464hnif15xlyrq8il6pgcq12g2hl6" }, "stable": { "version": [ @@ -19231,20 +19249,20 @@ "repo": "ocaml/dune", "unstable": { "version": [ - 20190723, - 1011 + 20190808, + 345 ], - "commit": "7d0414b4801b52eeb385908221ffcab567b853be", - "sha256": "0lj80vllx4kn6iaxg042j465lpa5ngmbkfpzx5cijcjljw0213bz" + "commit": "0f9863467c7a2dbacc41e62adc858765474c4ff0", + "sha256": "0ddhg3qbs4z6wkc680m5vmp2q6wdjs863h375rl1k114z4qdwn4z" }, "stable": { "version": [ 1, 11, - 0 + 1 ], - "commit": "bb7449b87ce9311b610c0c5f95de9ae1a4f3e365", - "sha256": "1w5g024sfh3scxm0ivc3mwldk6i2pai404ps1060lh05h94h2fsz" + "commit": "2f40f29f8eab3f7ae044f1c522f3e34036a16d9d", + "sha256": "1ax0lf7h191l772s0pr2xyy1kxpzjalm44ck265jihiga07dk0m5" } }, { @@ -20711,8 +20729,8 @@ 20190714, 236 ], - "commit": "d884df820099e5b128b553bd06904ff31d57b28f", - "sha256": "0l72rzwvlzwjdgag2cqkfrjajnsad7lp8flq957m980v9b88nqsg" + "commit": "ba135b498cfa92e60634c4318fa0073bd60ba230", + "sha256": "1fxnvrqxdyqr7d88fdvr8hiwfrc3nrxddg6zpbqjw2jc3ijmzq0p" }, "stable": { "version": [ @@ -20732,15 +20750,15 @@ "repo": "joaotavora/eglot", "unstable": { "version": [ - 20190718, - 1936 + 20190812, + 2013 ], "deps": [ "flymake", "jsonrpc" ], - "commit": "f45fdc6674a6cda16dc71966334f5346500e9498", - "sha256": "18n4w2cxzhc6yyr7bdggb19hmzk2h7m1d6r7nnr90ldryb05yyf0" + "commit": "6a7ce6634fcf79853a6bd89cf1c81bad2ac25540", + "sha256": "0qxkpn4mx2xjp98gwps0wric7c8c2g1ixdjy4jypya6alyc5b28x" }, "stable": { "version": [ @@ -20825,8 +20843,8 @@ "repo": "millejoh/emacs-ipython-notebook", "unstable": { "version": [ - 20190729, - 20 + 20190812, + 1512 ], "deps": [ "auto-complete", @@ -20839,8 +20857,8 @@ "skewer-mode", "websocket" ], - "commit": "ce419a12a5149d86cec235773f4f9ecc1d88c038", - "sha256": "1v1fsj3142w548cwvxg4s52l83qg7zw4cldds2grl5y8xhhbzlhw" + "commit": "52f304d038019f3eed6e1afbccc31878e161183a", + "sha256": "0wds8xddp4v1i4rimzp5gva2v5wvhx4hdjhxl6m7lih95vlpnq6v" }, "stable": { "version": [ @@ -20913,8 +20931,8 @@ "repo": "kostafey/ejc-sql", "unstable": { "version": [ - 20190730, - 1837 + 20190812, + 2255 ], "deps": [ "auto-complete", @@ -20923,8 +20941,8 @@ "direx", "spinner" ], - "commit": "ffda6d74f7b83c338953cc33de5a520722f544d9", - "sha256": "042aba3wlaxygyzjs55r42s91mp8c2sx9y0r804a4xxx7ykp9gmv" + "commit": "524a00d23c60c4718e39f4b963086fcc497afc25", + "sha256": "0qw12rk3cw1f2i0s2fm5630w5dnn6z0f1fxif1lrkky4yjp9ybxi" }, "stable": { "version": [ @@ -21578,11 +21596,11 @@ "repo": "skeeto/elfeed", "unstable": { "version": [ - 20190721, - 1410 + 20190809, + 1358 ], - "commit": "40f0be457c7b9c0ff724eafd8fa07989d24eb1a2", - "sha256": "0dqmayp0aizkvvs4h83vai3wb0rdhcg2lw1gmiqijwbwhdk7yyfi" + "commit": "87433438e10d851d57d76bea4403cbde936647e9", + "sha256": "1spyrvq0zsfnhckci5kprkzy6yh4vx2fafx43dih92ccsi513hw5" }, "stable": { "version": [ @@ -21686,8 +21704,8 @@ "elfeed", "simple-httpd" ], - "commit": "40f0be457c7b9c0ff724eafd8fa07989d24eb1a2", - "sha256": "0dqmayp0aizkvvs4h83vai3wb0rdhcg2lw1gmiqijwbwhdk7yyfi" + "commit": "87433438e10d851d57d76bea4403cbde936647e9", + "sha256": "1spyrvq0zsfnhckci5kprkzy6yh4vx2fafx43dih92ccsi513hw5" }, "stable": { "version": [ @@ -22012,6 +22030,25 @@ } }, { + "ename": "ellocate", + "commit": "fac47d8b4937c714df7b61ce4914831bfd7fcd20", + "sha256": "1i31gr3hdl1mjqwkkrfb7x1dpddyxnl1n9l7p7jiqbg3nn85gsxx", + "fetcher": "github", + "repo": "walseb/ellocate", + "unstable": { + "version": [ + 20190811, + 1123 + ], + "deps": [ + "f", + "s" + ], + "commit": "10845fc5722d833f20944ecc5586b429974e383b", + "sha256": "01wy71gdkiwglbndc96jx3hm0w6pia18cr76810hffrfkbsywgd8" + } + }, + { "ename": "elm-mode", "commit": "5d1a4d786b137f61ed3a1dd4ec236d0db120e571", "sha256": "1gw9szkyr1spcx7qijddhxlm36h0hmfd53b4yzp1336yx44mlnd1", @@ -23415,15 +23452,15 @@ "repo": "iqbalansari/emacs-emojify", "unstable": { "version": [ - 20190613, - 607 + 20190809, + 959 ], "deps": [ "ht", "seq" ], - "commit": "a16199dcf9b4688839eba00f1e356d9beac46cfe", - "sha256": "1j5i617lps6vv4f88qzghzd4gdrngnyis8m8gabgqxbmx9z9hjd7" + "commit": "782ac307f37239e90c56810323db4263a6469219", + "sha256": "1x6ds9aj8yd5phkfw29jdlklqdxjl7g2gqwlm7ngb60nsk02vjvf" }, "stable": { "version": [ @@ -23479,8 +23516,8 @@ "repo": "Wilfred/emacs-refactor", "unstable": { "version": [ - 20190724, - 2350 + 20190810, + 2133 ], "deps": [ "cl-lib", @@ -23493,8 +23530,8 @@ "projectile", "s" ], - "commit": "eea1ea70d371de543be1c82c39bf97233c8adda5", - "sha256": "1yb7dbl321ip9pgch1krxs3manvkczq0b97797kq0hdbyiwpzi9b" + "commit": "ed430d55bd7504cb51d9f2b9e1b3c4b4ca93dafc", + "sha256": "154vzwxw3mlxxjmvi8aqxmpww6b4gvrcq6aw7w1gi3yb048pgkyy" }, "stable": { "version": [ @@ -23817,15 +23854,15 @@ "repo": "emacscollective/epkg", "unstable": { "version": [ - 20190717, - 1420 + 20190807, + 846 ], "deps": [ "closql", "dash" ], - "commit": "dca082baf1a99e43ec0152117d9947107c3841d5", - "sha256": "084p2fvm5ml1kbbabmm3l5kaiwc77x0prs6nm4zn6lhl60ash11j" + "commit": "80098a45909d50aa089d344c6e24cbbae1481513", + "sha256": "0r5h8wdw58maqmda2ldg5j3fmjsih95ikzg34gxfk18sw7r50rpv" }, "stable": { "version": [ @@ -24435,8 +24472,8 @@ 20190404, 928 ], - "commit": "cd7cad8d6ad6234bab004af800d9b28aa03aeff1", - "sha256": "195flsyi33pz7j6svza4l6ymxw5gcmbi2l8i9fjclij1958w5m14" + "commit": "65449e9e54fd765abdbe546590e4da044f36c2a4", + "sha256": "0yj4vfpz6vjxsraiab45c4lw313yd7c88sa10fsr974h0wfp9rnv" }, "stable": { "version": [ @@ -24456,14 +24493,14 @@ "repo": "k32/erlstack-mode", "unstable": { "version": [ - 20190722, - 952 + 20190812, + 1117 ], "deps": [ "dash" ], - "commit": "b8a2027808177fb0aa74e6767a867c0e20c57d84", - "sha256": "09bn6ldnz7mgc16h818rdbs4a5vs7a72183din5xvbw5ygfhwhjs" + "commit": "d0a67fb6f91cef02376e71b4b4669b071ebd9737", + "sha256": "10b77q2qwwlvj56g9yd6d9lkmk184mjf6x3067vvqs40xiv9bsgl" }, "stable": { "version": [ @@ -24537,26 +24574,26 @@ "url": "https://bitbucket.org/olanilsson/ert-junit", "unstable": { "version": [ - 20181118, - 2256 + 20190802, + 2232 ], "deps": [ "ert" ], - "commit": "a910ab288e108c61fa3cd035d93df91f2e19e367", - "sha256": "0k3j7nsfg88nbm546bcyh6q4yaxc027a1xh8kg8hx3nb17lxc03r" + "commit": "65f91c35b088b87943dbbbe7e1ce354bc9bc0992", + "sha256": "1srmkffzj7xf8iickhyhw1fpg4nxbkp45aiz9w784ra9p99a366y" }, "stable": { "version": [ 0, 4, - 0 + 1 ], "deps": [ "ert" ], - "commit": "b0649e94460aff5176dee5b33f28946bffb602d5", - "sha256": "0hj85hz4s1q4dalinhgahn8jn97s2pdpv41d9qqbvbdzwhhw2mrk" + "commit": "65f91c35b088b87943dbbbe7e1ce354bc9bc0992", + "sha256": "1srmkffzj7xf8iickhyhw1fpg4nxbkp45aiz9w784ra9p99a366y" } }, { @@ -25236,14 +25273,14 @@ "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20190729, - 2339 + 20190809, + 1459 ], "deps": [ "julia-mode" ], - "commit": "0786929aaabf8ce90ad48e6e90c98d19bee9aac4", - "sha256": "1h41i157hkagminm356fg6saxbjs5ccn74xgsvqvvlyhay1xh53x" + "commit": "d625e9ccdb612812b90fe427563db4b910da7159", + "sha256": "0fnfcxlngc7rwnkhs1fwir1ax7hi9qhl7zlalbl5m7yfly84dl4p" }, "stable": { "version": [ @@ -25876,15 +25913,15 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20190725, - 213 + 20190807, + 214 ], "deps": [ "cl-lib", "evil" ], - "commit": "f8cf811d658da2618359391436e194bb41b95ae5", - "sha256": "1yayphihwm8nsp3mryxdckaki21xmqn1vjb59z5kl8mashfsm2v2" + "commit": "d226a50061a5033846ae819472e3c86fb54cc5f1", + "sha256": "155ajm7h9wpjg9ca60a4ib5fyp1sk4i54m5825595n43laqyd5p9" }, "stable": { "version": [ @@ -26470,26 +26507,26 @@ "repo": "redguardtoo/evil-matchit", "unstable": { "version": [ - 20190801, - 140 + 20190808, + 1056 ], "deps": [ "evil" ], - "commit": "2143844e2bdf53ed7aac3dc599ab4bc8d6947783", - "sha256": "1vvw6rkm6301qrcf04slhbadm5mc5fiv3lr3q2dglyw1vlpb6xac" + "commit": "43be86d8c41841a20733718d177e8299d5379218", + "sha256": "04kllxd7vvziwqiff3vx60a0r6805wynsla73j8xkcz4yzk8q91r" }, "stable": { "version": [ 2, 3, - 2 + 3 ], "deps": [ "evil" ], - "commit": "2143844e2bdf53ed7aac3dc599ab4bc8d6947783", - "sha256": "1vvw6rkm6301qrcf04slhbadm5mc5fiv3lr3q2dglyw1vlpb6xac" + "commit": "43be86d8c41841a20733718d177e8299d5379218", + "sha256": "04kllxd7vvziwqiff3vx60a0r6805wynsla73j8xkcz4yzk8q91r" } }, { @@ -26890,6 +26927,24 @@ } }, { + "ename": "evil-ruby-text-objects", + "commit": "ba500b9f3df067e57e84654561091897e39623ef", + "sha256": "0icvmrcj2lslill2a26vzb71598l7c2fl2fi1971z8r1vhmckwmq", + "fetcher": "github", + "repo": "porras/evil-ruby-text-objects", + "unstable": { + "version": [ + 20190729, + 1653 + ], + "deps": [ + "evil" + ], + "commit": "781f134d9484481b0b4ad32f9cfe90dc00219902", + "sha256": "00ybb6y5lnfsk44cy6dks46n2cl1ms4010vfqqrji64i19wd1riq" + } + }, + { "ename": "evil-search-highlight-persist", "commit": "f2e91974ddb219c88229782b70ade7e14f20c0b5", "sha256": "08l8ymrp9vkpwprq9gp4562yvcnd4hfc3z7n4n5lz7h6ffv3zym3", @@ -27308,14 +27363,14 @@ "repo": "mamapanda/evil-traces", "unstable": { "version": [ - 20190721, - 2136 + 20190810, + 2054 ], "deps": [ "evil" ], - "commit": "b41b7432b8110378c199a3d25af464083777f453", - "sha256": "0a15f2saynz9fws1h5s7py3cshsk4xs1kwgwj1m5rsin36g0j6hc" + "commit": "b1c64532ad754591c472e0615a10c9a9f8ad3df0", + "sha256": "0d7ijy067rb6wf1hzyyrk1nqh891b95fs0f39lbgawc0hkqk9bzw" } }, { @@ -27517,11 +27572,11 @@ "repo": "jjzmajic/ewal", "unstable": { "version": [ - 20190720, - 829 + 20190807, + 240 ], - "commit": "19fb4bdd0ba81ec17e36e06812e7bee7fb265b68", - "sha256": "0x08px30dcjl0dcszba6fbj1h4g1vsbn3glslwz4ya6r3c2cmhf9" + "commit": "9807c3d7bb3bab3676ef15b1b438eb9ea8c419f8", + "sha256": "10dprjijh10npgh0k3vxcmcdsxg8yx32ly5106p8rqjipfdva0ka" } }, { @@ -27532,14 +27587,14 @@ "repo": "jjzmajic/ewal", "unstable": { "version": [ - 20190720, - 829 + 20190807, + 240 ], "deps": [ "ewal" ], - "commit": "19fb4bdd0ba81ec17e36e06812e7bee7fb265b68", - "sha256": "0x08px30dcjl0dcszba6fbj1h4g1vsbn3glslwz4ya6r3c2cmhf9" + "commit": "9807c3d7bb3bab3676ef15b1b438eb9ea8c419f8", + "sha256": "10dprjijh10npgh0k3vxcmcdsxg8yx32ly5106p8rqjipfdva0ka" } }, { @@ -27557,8 +27612,8 @@ "ewal", "spacemacs-theme" ], - "commit": "19fb4bdd0ba81ec17e36e06812e7bee7fb265b68", - "sha256": "0x08px30dcjl0dcszba6fbj1h4g1vsbn3glslwz4ya6r3c2cmhf9" + "commit": "9807c3d7bb3bab3676ef15b1b438eb9ea8c419f8", + "sha256": "10dprjijh10npgh0k3vxcmcdsxg8yx32ly5106p8rqjipfdva0ka" } }, { @@ -27574,6 +27629,15 @@ ], "commit": "3d0217c4d6cdb5c308b6cb4293574f470d4faacf", "sha256": "0ilwvx0qryv3v6xf0gxqwnfm6pf96gxap8h9g3f6z6lk9ff4n1wi" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "commit": "3d0217c4d6cdb5c308b6cb4293574f470d4faacf", + "sha256": "0ilwvx0qryv3v6xf0gxqwnfm6pf96gxap8h9g3f6z6lk9ff4n1wi" } }, { @@ -27923,14 +27987,14 @@ "repo": "walseb/exwm-firefox-core", "unstable": { "version": [ - 20190608, - 2213 + 20190812, + 2110 ], "deps": [ "exwm" ], - "commit": "86acbc4b4f50f497929508e59d054f97398a5218", - "sha256": "0s54hwa2k8g6ls5d0mbcq7kgzzghpqbi5p4rvwjx75h2hdf7adrk" + "commit": "e2fe2a895e8f973307ef52f8c9976b26e701cbd0", + "sha256": "0k5jkjzx6f8nfmbkc61raj585p9pymycgzv7rr3fhv2drgkaa4yi" } }, { @@ -28257,11 +28321,11 @@ "repo": "WJCFerguson/emacs-faff-theme", "unstable": { "version": [ - 20190506, - 1513 + 20190711, + 1511 ], - "commit": "de12f6a11711955fbbcdf7c042459aa2206f8deb", - "sha256": "193d6s759kmkwfmwc9367grkgf46gm9ppczppcrk2h3alzr1hba6" + "commit": "49710f7bf8bebf6cd82e67f0ca3a718cff3b504d", + "sha256": "0ba1ayc1ccs1ygr66zpihm4wmnrhbvb48rrhha6lidyvmbxrxsa6" }, "stable": { "version": [ @@ -28500,11 +28564,11 @@ "repo": "cute-jumper/fcitx.el", "unstable": { "version": [ - 20170914, - 200 + 20190806, + 1923 ], - "commit": "095332fbeb994c908c533fe2ad068c0728211c3d", - "sha256": "01sm50rqajylah2hx6n5ig0xmrrhxbamzs4bg97qzxzr4nlnjcaz" + "commit": "12dc2638ddd15c8f6cfaecb20e1f428ab2bb5624", + "sha256": "0ahw2pi6i693s4mdjdkisy94yvg0wgmd3c6zi0z4yi60b6irskdn" }, "stable": { "version": [ @@ -28601,11 +28665,11 @@ "repo": "technomancy/fennel-mode", "unstable": { "version": [ - 20190401, - 1808 + 20190807, + 17 ], - "commit": "17678a7fc073c64cb0ec78f913154df377a42575", - "sha256": "0n2vz6vsi380gcgg3ihwjs3z2rc1hb8yh4xlzjwz01dhahj08p1x" + "commit": "7f146605feeeebdf5452450662e2f3bc1e435e6f", + "sha256": "0yr6f2gzgprkqhc22mq64mn119aljihziix712kk1vq59yx2l22f" } }, { @@ -29587,8 +29651,8 @@ 20190321, 2313 ], - "commit": "921ff298da71366eca3d1e4fc410126d405d5366", - "sha256": "0gqsr0xsxrbxsdfn3yhf76wxpqp63m1652ryvc2hwskkgj41y3nl" + "commit": "ec4b20dd5471ee20d5dd6d2e140225ad607550dc", + "sha256": "0bazkkdv3gyyxv3ci9wgwnm3mn9yzb1l8h2mjap5xzy4hm6zj627" } }, { @@ -29607,6 +29671,25 @@ } }, { + "ename": "flutter-l10n-flycheck", + "commit": "6714760b205a2da8727229a4f8d4b656877890cb", + "sha256": "13symbzw16h0sl0j6q4n47vwgaifbmj9572n2ihfz0ml5iww1vyy", + "fetcher": "github", + "repo": "amake/flutter.el", + "unstable": { + "version": [ + 20190729, + 401 + ], + "deps": [ + "flutter", + "flycheck" + ], + "commit": "a5de449cd10f98e7ea4340940b7726f299a0854a", + "sha256": "0v20yirkg04szaw0l7abq8qpqnhqlhgpm5hg5i8dks01dlczw29h" + } + }, + { "ename": "fluxus-mode", "commit": "a3396e0da67153ad051b8551bf34630d32f974f4", "sha256": "1xn2aw9gxwkmr1miam63lrdx6n0qxsgph3rlaqy9cbs0vkb254an", @@ -29713,8 +29796,8 @@ "repo": "flycheck/flycheck", "unstable": { "version": [ - 20190709, - 1443 + 20190807, + 813 ], "deps": [ "dash", @@ -29722,8 +29805,8 @@ "pkg-info", "seq" ], - "commit": "410103bb40db8684cb03756ab98ba813afbf214e", - "sha256": "1z2szbad80b4xx4sdp051i987mp4x4rr6v82s7ql5h510i1bv51r" + "commit": "37c1f9d65c4a16c58aff9f2fa210ccf070a97c86", + "sha256": "1yqrb7r6ykjzmflk3259xpasmz2xgxxazvvhhjcy36krhwwj825x" }, "stable": { "version": [ @@ -30668,6 +30751,24 @@ } }, { + "ename": "flycheck-indicator", + "commit": "25d59829ca2f4fbedfee500885b45bc358faf47b", + "sha256": "1h2d7dw94agrdrks41npjdmf5m628n1jg060pv1mrjysj4xm2n45", + "fetcher": "github", + "repo": "gexplorer/flycheck-indicator", + "unstable": { + "version": [ + 20190729, + 1501 + ], + "deps": [ + "flycheck" + ], + "commit": "937f93afc0605c8e6c7cc56041a52b1312fff0fe", + "sha256": "1r7da45kmypz1qvpj07m7q9z2bjbx6ds5cx055gq5v03gzyg6n7i" + } + }, + { "ename": "flycheck-ini-pyinilint", "commit": "c2a1d0b4be0dd3e238ad2e3a157b11ecc82c0639", "sha256": "028ksrlrrsn2wsz7kqf3qk4pp3scs7zvp74c4xj52rm4hh7ycbl7", @@ -30832,25 +30933,25 @@ "repo": "whirm/flycheck-kotlin", "unstable": { "version": [ - 20170122, - 1137 + 20190808, + 630 ], "deps": [ "flycheck" ], - "commit": "cbb9fbf70dbe8efcc3971b3606ee95c97469b1fe", - "sha256": "0bxjx7xcpscv6vv4yxll8hh43aabv2dnrvkymb47jm3yvjr9cs1c" + "commit": "5104ee9a3fdb7f0a0a3d3bcfd8dd3c45a9929310", + "sha256": "193l9amk45b0bkrqqm6cxx8y4a6jvm0mcncwq6kvhq2kj9slw7g2" }, "stable": { "version": [ 0, - 3 + 4 ], "deps": [ "flycheck" ], - "commit": "cbb9fbf70dbe8efcc3971b3606ee95c97469b1fe", - "sha256": "0bxjx7xcpscv6vv4yxll8hh43aabv2dnrvkymb47jm3yvjr9cs1c" + "commit": "5104ee9a3fdb7f0a0a3d3bcfd8dd3c45a9929310", + "sha256": "193l9amk45b0bkrqqm6cxx8y4a6jvm0mcncwq6kvhq2kj9slw7g2" } }, { @@ -31533,24 +31634,6 @@ } }, { - "ename": "flycheck-soar", - "commit": "15cae578c5ba5152be0726f046b5f2dc4719a387", - "sha256": "14xpq3pdfwacmhl9x8fdzcsanpf6zljdzh6gwclw724k720acbdl", - "fetcher": "github", - "repo": "tszg/flycheck-soar", - "unstable": { - "version": [ - 20181106, - 852 - ], - "deps": [ - "flycheck" - ], - "commit": "d2f03a0af9b625a645f3194dc24cfeee94d92760", - "sha256": "02ll2nw2x45nfmxdj1ps62jr663spy01vy8gfg1qh2rl1pjviwqw" - } - }, - { "ename": "flycheck-stack", "commit": "b77f55989d11d1efacbad0fd3876dd27006f2679", "sha256": "1r9zppqmp1i5i06jhkrgvwy1p3yc8kmcvgibricydqsij26lhpmf", @@ -32541,6 +32624,30 @@ } }, { + "ename": "flymake-quickdef", + "commit": "8e9d6121472d6a82ac5371bef7dc2dbe5acfc63f", + "sha256": "08w8i5rr3g7rwmrr29rah1rh68mpvfbabsik81vxlzpq1c7hhqk5", + "fetcher": "github", + "repo": "karlotness/flymake-quickdef", + "unstable": { + "version": [ + 20190727, + 2028 + ], + "commit": "5b3980a7c1763171e8cdb28ebfd5f4eaad32f9f9", + "sha256": "0rhg29jcpa4314ld9shhvf81m1ar8xp2853hxm94bxpnnza5d8x7" + }, + "stable": { + "version": [ + 0, + 1, + 1 + ], + "commit": "53bf206f1a71b2fc12f49741832a94f6498ae6a6", + "sha256": "0wqfn068ylb30f8988knrcd9v3r3xck5yb1fj9jnrw2bs6qxxc57" + } + }, + { "ename": "flymake-racket", "commit": "67f2b469ea8df6d0db6b9ece91f544c0e7dd3ab2", "sha256": "173dyn8bxggyh0g97gg5f0si3905116i3k6s3islsblgrz00gjcn", @@ -33350,8 +33457,8 @@ "repo": "magit/forge", "unstable": { "version": [ - 20190726, - 1558 + 20190809, + 1808 ], "deps": [ "closql", @@ -33363,8 +33470,8 @@ "markdown-mode", "transient" ], - "commit": "1b940e5ac3ec98c7bd5e9b2364a3c5b1d61d3ffd", - "sha256": "0prx5kckaiwc1h4lvjwh70g930jy0v90zl3gswkynpibcgfacii7" + "commit": "a60bd64056ec910fdbd1400dd8f583b8eec6145b", + "sha256": "1dhpsnb82mxpv3krf3apsbcirlcizw3g9gac9sfn0fad20qjwpgj" }, "stable": { "version": [ @@ -33826,16 +33933,16 @@ "repo": "waymondo/frog-jump-buffer", "unstable": { "version": [ - 20190715, - 151 + 20190810, + 1749 ], "deps": [ "avy", "dash", "frog-menu" ], - "commit": "257c5b8ffe523850904d0445a00c72213ebed2fd", - "sha256": "0xlxcw2k8c0gl2kikvqbi2ypzf1rn49vb0r94qlcbzprhymjggnn" + "commit": "2d7b342785ae27d45f5d252272df6eb773c78e20", + "sha256": "1z00by8hiss1r2lwmzrl8pnz6jykia2849dqqm4l3z5rf6lwvc0f" } }, { @@ -33953,8 +34060,8 @@ "deps": [ "cl-lib" ], - "commit": "d8c1eef9f3ab07bae25ddf2b337553ae523961ce", - "sha256": "1238b3zj2wpnpfh32g4cgwfjn74sdq52i75j5asgyqd8nacp1xq3" + "commit": "2f2cb869f19e1ab10931a2228ad02b2cfbf8fc0e", + "sha256": "1pg1i85cx1zk10k333qzmc8i9dmry7nz6h57p13ysa7pnyi6d521" }, "stable": { "version": [ @@ -34077,11 +34184,11 @@ "repo": "cosven/emacs-fuo", "unstable": { "version": [ - 20180314, - 1648 + 20190812, + 927 ], - "commit": "5318bef9d935b53031e6312652554920def69af2", - "sha256": "02f4kl1y277pry13hz1jscdh2nrbn3xp7zm1dmqyn8yfhn1s1yx2" + "commit": "0e4122f94a336a50c02bc96652d25ac3d74bedeb", + "sha256": "1cv30sgjngnl0274viaf42dw9sr0v1kdw31na7lzznqx6q8laz47" } }, { @@ -34359,11 +34466,11 @@ "repo": "koral/gcmh", "unstable": { "version": [ - 20190626, - 750 + 20190807, + 2023 ], - "commit": "1953d913b5aa8822b83db8e20e17145470e01d79", - "sha256": "1s130fypags36240qlifify6645rpxlnfhar9akf22y2zywaxfhq" + "commit": "f542908b9ae4405d70fa70f42bd62618c5de4b95", + "sha256": "0mpi6x06kg5a7dr13q69irv58j3rda62fbscm5b7d1b9vlp4vcqi" } }, { @@ -34466,11 +34573,11 @@ "repo": "jaor/geiser", "unstable": { "version": [ - 20190624, - 1807 + 20190806, + 149 ], - "commit": "fbdfbee56a03a1a0396d61fdc8f0b0af87273fc9", - "sha256": "1xzmsvw0wnq1yyyi6ya25hrn1537qq60cd556y0c1cg9i3qqm4vq" + "commit": "8f801fbf01586e33bcf0060bd1d3172d4afb48cf", + "sha256": "0cxd8zjgzkxjsgv1wfb6afc75brvs6hal7if31cj5ip7z38qzksx" }, "stable": { "version": [ @@ -34495,8 +34602,8 @@ "deps": [ "cl-lib" ], - "commit": "ff18b7b05b91c5af7a4069df618608c3c4487377", - "sha256": "1r74mb368p6ahcklz58468hzncxzvhnwdz998lbz0f0adk9cn56s" + "commit": "1907358fed4ad1ee61fb2a2e1a353b27822a3edd", + "sha256": "1v3645sgpr5i7alh08ik2dmlc3bl6idpfgdgf8763l7x8r41wa55" } }, { @@ -34844,16 +34951,16 @@ "repo": "magit/ghub", "unstable": { "version": [ - 20190710, - 2214 + 20190806, + 959 ], "deps": [ "dash", "let-alist", "treepy" ], - "commit": "a8191c6a63dfa630af418105b58434266859d21b", - "sha256": "1y1pfqzyn28j0b6w1xrrxwx24fc022r5grw4jn6bs6qqcdh73qd7" + "commit": "7d59937d7782d0062216130a4d059b45e8396f82", + "sha256": "1ngb61nij9gznqplwg1fmr1vq1czry759hmdibzngl4wqhxpfsjq" }, "stable": { "version": [ @@ -35148,8 +35255,8 @@ "dash", "with-editor" ], - "commit": "9e2df13e5338b7bde31dceca4e64494bc0fd68a8", - "sha256": "0pxqbwd6fwhnr844m3k82yy26f74favmj5jzidypim0f1x2rmr82" + "commit": "75d0810d131e2e61ae3c683797a10a2caca96073", + "sha256": "19ynyx1648riwnpiwzk1mk36z4fw4j4bggr7mf7pinsvv9191zmq" }, "stable": { "version": [ @@ -35843,16 +35950,16 @@ "repo": "charignon/github-review", "unstable": { "version": [ - 20190327, - 732 + 20190803, + 1701 ], "deps": [ "dash", "ghub", "s" ], - "commit": "9c3ffe30fba5d02e9951e76d1a5be2ed046663da", - "sha256": "078rv6f2p3wrznhgvmkhd071bwy72007f5l2m2a0r1k2i3vbfaja" + "commit": "20b2e47f54587a39dbd8db9ec5ca33d5970dbcc1", + "sha256": "1slnggvsjzsqvdvm4nxnxba93hfjnz676bagmw79g7z6iswwz4sg" } }, { @@ -36833,8 +36940,8 @@ "cl-lib", "go-mode" ], - "commit": "3ba198280bf8d5f2a4079618abfd3db2ebe04f58", - "sha256": "01fh1zx24ns06glmcw9l1fp9mlmysx60qnr7gn5gh6r48b6bx1rv" + "commit": "fdc1545d0ca494eb533d006b42c4bb4a6fb73d6e", + "sha256": "0scmn5vg6bprshcipkf09lif93al3wrx3y8fm2v09jfpz1wghgi5" }, "stable": { "version": [ @@ -36926,11 +37033,11 @@ "repo": "dominikh/go-mode.el", "unstable": { "version": [ - 20190731, - 1751 + 20190808, + 2249 ], - "commit": "3ba198280bf8d5f2a4079618abfd3db2ebe04f58", - "sha256": "01fh1zx24ns06glmcw9l1fp9mlmysx60qnr7gn5gh6r48b6bx1rv" + "commit": "fdc1545d0ca494eb533d006b42c4bb4a6fb73d6e", + "sha256": "0scmn5vg6bprshcipkf09lif93al3wrx3y8fm2v09jfpz1wghgi5" }, "stable": { "version": [ @@ -37028,14 +37135,14 @@ "repo": "dominikh/go-mode.el", "unstable": { "version": [ - 20180627, - 648 + 20190805, + 2101 ], "deps": [ "go-mode" ], - "commit": "3ba198280bf8d5f2a4079618abfd3db2ebe04f58", - "sha256": "01fh1zx24ns06glmcw9l1fp9mlmysx60qnr7gn5gh6r48b6bx1rv" + "commit": "fdc1545d0ca494eb533d006b42c4bb4a6fb73d6e", + "sha256": "0scmn5vg6bprshcipkf09lif93al3wrx3y8fm2v09jfpz1wghgi5" }, "stable": { "version": [ @@ -37327,8 +37434,8 @@ 20180130, 1736 ], - "commit": "9c6b371f419b1dd33c338846e3e7c1ce7304baff", - "sha256": "0yh9dqj7xrq1why1xnldb6zypvalralxx4sgzrn2w9m5g0jqv90v" + "commit": "5beae3f4dacad9b0b86a8a4ab308459475feda0e", + "sha256": "0f1x1vjzlr0i41b7nqziw7yiawfw8sb1ssqwii7a5nfgzsv19z7w" } }, { @@ -37701,8 +37808,8 @@ "magit-popup", "s" ], - "commit": "ee35ba9e79122df9873f2dc948bcce912a9c9d7f", - "sha256": "0ab5y8dcx7krphgjd21yd1f635lr6j1y5304pq9vxx1nw0g3c0f8" + "commit": "7b40d3e162becb69c99f2b71a26e1966adb34384", + "sha256": "16yqh892rfpg6mbzqxc8isxh3z3s9h14n6chm1h2qxsa82wqrrk2" }, "stable": { "version": [ @@ -38049,11 +38156,11 @@ "repo": "davazp/graphql-mode", "unstable": { "version": [ - 20190731, - 1825 + 20190812, + 2240 ], - "commit": "e757919fe3cf6d687d5d970662964fc37115b1d6", - "sha256": "037f73giyjrr2iqxhfmw1k4qhww2f1vi4anl4fqf07rjy1k4674j" + "commit": "3581ad03e04b11c67d4882cbaa9ab6af71eaf78d", + "sha256": "0mabd677yi7phzvvil9fyic5i9z4nyp224d0ifzp5mw0jpsvfxv1" } }, { @@ -38836,14 +38943,14 @@ "repo": "hhvm/hack-mode", "unstable": { "version": [ - 20190718, - 1518 + 20190809, + 1810 ], "deps": [ "s" ], - "commit": "7f94e1fdc18b8722b56028e7532a68aa783138b5", - "sha256": "053xv6k9lplp68xnk465349khw7a4lfmff3fc4grdrxqjif11v70" + "commit": "6ccad0581775eb5a777382b37175c1ec230ae5cb", + "sha256": "0yixpz25bi7cbji7jk2azkpbnxvc56fymsg2zxvwjrb8dh6gwapk" }, "stable": { "version": [ @@ -39627,16 +39734,16 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20190801, - 1347 + 20190811, + 602 ], "deps": [ "async", "helm-core", "popup" ], - "commit": "6836fdbe30d45207a1090907b290275bd37dbc84", - "sha256": "03ydgbih60jj0f5mlf9p28mczk4clx3sddmdms5j8mpv0kfladzm" + "commit": "b3ca0c03188afd173c7f8c6bb51a5aa0457e10c3", + "sha256": "1f5395949i6hb01cm932slxnqn3wlz8zrj51b1shqn0yiv0vqhvg" }, "stable": { "version": [ @@ -40449,28 +40556,28 @@ "repo": "Sodel-the-Vociferous/helm-company", "unstable": { "version": [ - 20190725, - 247 + 20190812, + 1429 ], "deps": [ "company", "helm" ], - "commit": "b8c214f92c1e4287174f51a042ca950d53c161de", - "sha256": "1x69ww7a3c91rwnxnvpjdv4dpngb0383g6wgra7ypcbgibxshc00" + "commit": "6eb5c2d730a60e394e005b47c1db018697094dde", + "sha256": "1ci37w6ahnqrfpb284gjvxmimlf61sdxb9k192yy9q983cksv2hx" }, "stable": { "version": [ 0, 2, - 3 + 5 ], "deps": [ "company", "helm" ], - "commit": "5b5c15745d92aff7280698c7619994e2481098b4", - "sha256": "1r5b24hamq8d5n418xpf80jn37s357hbc9rd5siw6gwkjn2jykx7" + "commit": "6eb5c2d730a60e394e005b47c1db018697094dde", + "sha256": "1ci37w6ahnqrfpb284gjvxmimlf61sdxb9k192yy9q983cksv2hx" } }, { @@ -40481,14 +40588,14 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20190801, - 708 + 20190809, + 1008 ], "deps": [ "async" ], - "commit": "6836fdbe30d45207a1090907b290275bd37dbc84", - "sha256": "03ydgbih60jj0f5mlf9p28mczk4clx3sddmdms5j8mpv0kfladzm" + "commit": "b3ca0c03188afd173c7f8c6bb51a5aa0457e10c3", + "sha256": "1f5395949i6hb01cm932slxnqn3wlz8zrj51b1shqn0yiv0vqhvg" }, "stable": { "version": [ @@ -40538,10 +40645,10 @@ }, { "ename": "helm-css-scss", - "commit": "9b985973ff12135f893e6d2742223725c2143720", - "sha256": "0iflwl0rijbkx1b7i1s7984dw7sz1wa1cb74fqij0kcn76kal7ak", + "commit": "7a4e84530b4607a277fc3b678fe7b34b1c5e3b4f", + "sha256": "14k29g4zm302r00n49k8b6p4bz115s0jcidiaf6nrhba9y40i0wz", "fetcher": "github", - "repo": "ShingoFukuyama/helm-css-scss", + "repo": "emacsorphanage/helm-css-scss", "unstable": { "version": [ 20140627, @@ -42361,6 +42468,35 @@ } }, { + "ename": "helm-org", + "commit": "5c14f6b048ec9983e31fcd3e7cdea45ebe806ce8", + "sha256": "02zyc7nssl4zvbbw03fl0nbf4d6qmqxywa2hnfyiwfzn5jzxkl95", + "fetcher": "github", + "repo": "emacs-helm/helm-org", + "unstable": { + "version": [ + 20190813, + 604 + ], + "deps": [ + "helm" + ], + "commit": "7926896aa1195db7ca6394c1ce60152b98f5fca1", + "sha256": "0cxxjxh89qhxfxc5gwqm5jwvdcnmsyipzwibvmqmq800ims09fka" + }, + "stable": { + "version": [ + 1, + 0 + ], + "deps": [ + "helm" + ], + "commit": "3a20d0eca0e95943cd9fdd40882cec65628f4a67", + "sha256": "0j3xz59hl84asv332fk94j5c06w3ix6b14zrkhxr8vb5ci1b2b1k" + } + }, + { "ename": "helm-org-rifle", "commit": "f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615", "sha256": "0hx764vql2qgw9i8qrr3kkn23lw6jx3x604dm1y33ig6a15gy3a3", @@ -42368,8 +42504,8 @@ "repo": "alphapapa/helm-org-rifle", "unstable": { "version": [ - 20181216, - 1129 + 20190809, + 1831 ], "deps": [ "dash", @@ -42377,14 +42513,14 @@ "helm", "s" ], - "commit": "23f4ae05f5a9d1894f4afdb9ef774c342eb7e787", - "sha256": "040jmacydgp56gd48ddfn1yk8bsdaawhdkpb0nr898q0bkk5arzj" + "commit": "dbda48031bad6fec1e130ee6e0d1a3bfea8ad8b8", + "sha256": "058zvh7cdall7dl3xay9ibcjvs13fbqp8fli3lz980pinmsds3r2" }, "stable": { "version": [ 1, - 6, - 1 + 7, + 0 ], "deps": [ "dash", @@ -42392,8 +42528,8 @@ "helm", "s" ], - "commit": "f2c7f9e203287e3f6e5647406d21454218553e5a", - "sha256": "1r38xhwvgbv6kn5x159phz3xgss7f1rc7icq27rnr4d8aj91wm6k" + "commit": "dbda48031bad6fec1e130ee6e0d1a3bfea8ad8b8", + "sha256": "058zvh7cdall7dl3xay9ibcjvs13fbqp8fli3lz980pinmsds3r2" } }, { @@ -43357,15 +43493,15 @@ "repo": "wandersoncferreira/helm-spotify-plus", "unstable": { "version": [ - 20190706, - 1409 + 20190807, + 2115 ], "deps": [ "helm", "multi" ], - "commit": "0cf321dcc766d1f451ed667d4fba7fa36a8e09f1", - "sha256": "0bhvyaj136hnjbla4jkxpih1d9qa6pbwb2h8wgdag9zl3i2c3ryv" + "commit": "e52233523917596dd3862e1151a027ce89a80a38", + "sha256": "0h4lj18rvhwcsb0k7ckp81h1aank9pf0dsa3qb578n10i9p6bb4y" } }, { @@ -43388,20 +43524,20 @@ }, { "ename": "helm-swoop", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "1b3nyh4h5kcvwam539va4gzxa3rl4a0rdcriif21yq340yifjbdx", + "commit": "7a4e84530b4607a277fc3b678fe7b34b1c5e3b4f", + "sha256": "0dbn0mzzsjhpxh0dpxrrzqam9hl2sjsp1izq2qv3z11iv2hylzx4", "fetcher": "github", - "repo": "ShingoFukuyama/helm-swoop", + "repo": "emacsorphanage/helm-swoop", "unstable": { "version": [ - 20180215, - 1154 + 20190813, + 920 ], "deps": [ "helm" ], - "commit": "c66336b8245ddc51c4206f19c119f1081920985c", - "sha256": "0b23j1bkpg4pm310hqdhgnl4mxsj05gpl08b6kb2ja4fzrg6adsk" + "commit": "8ae7c47365d3cef4b81abe97af1532340821a21b", + "sha256": "06rfhd38fvfnzjxk119pwwddszv1sczxn5dn6r7qki39wwxcsqww" }, "stable": { "version": [ @@ -43424,15 +43560,15 @@ "repo": "emacs-helm/helm-system-packages", "unstable": { "version": [ - 20190731, - 1551 + 20190809, + 1508 ], "deps": [ "helm", "seq" ], - "commit": "8f8f50a1b2ef0dfb0734057a737abe7e5d77bd86", - "sha256": "18rcr4mdspbsk8wrl9rnhfxr3c7isdhmiz4qf4qm1x79db1j0km2" + "commit": "427c40d18ae1b5593df6bef72aa1d62ce89fc652", + "sha256": "0msil7niva1fy1lw5h7jwzfn398c5msml4vshplz13ry1ip33vih" }, "stable": { "version": [ @@ -43825,8 +43961,8 @@ "repo": "Wilfred/helpful", "unstable": { "version": [ - 20190723, - 2348 + 20190807, + 2141 ], "deps": [ "dash", @@ -43835,8 +43971,8 @@ "f", "s" ], - "commit": "8ac851e7c0f8345046d053d136befe28fd75dcd9", - "sha256": "17kzflrkxcmhh480csaxjxy55gszcwy62yihd0hp73mdx6pw4g4x" + "commit": "69474e9c49076ce82cea4eff237933b6cec0b5cf", + "sha256": "1jf0rj5k9aa1gbsvwwhnj5vkwpv1am5ya1xw5sxhzl3iabqz680i" }, "stable": { "version": [ @@ -44097,8 +44233,8 @@ 20190425, 842 ], - "commit": "a5bc6bf2e1bbd48cc17c508043134f24abb41944", - "sha256": "18y5xj8j07hca7qk5ygxqpiybv58qf4c85hqw52a59fkn0vvdbhg" + "commit": "a1d13c40102e833192c3bd6acf930013bdcbc819", + "sha256": "1hg3hvz11ncsh7xhsgv0id4szypj7cv2cffqnk3hphyl073dyic6" }, "stable": { "version": [ @@ -44492,14 +44628,6 @@ } }, { - "ename": "himp", - "commit": "51b31fb1fa7052d16d659313d249eef01ca3ee88", - "sha256": "1igzlvm4g4rcnlvnwi5kn1jfvyrw2vnmp1kpvfnv7w9n6d8kflla", - "error": "Not in archive", - "fetcher": "github", - "repo": "mkcms/himp" - }, - { "ename": "hindent", "commit": "9a15a17a5aa78aed72958b2a1bde53f0c0ab5be7", "sha256": "0az2zhdi73sa3h1q1c0bayqdk22a7ngrvsg9fr8b0i39sn3w8y07", @@ -44792,11 +44920,11 @@ "repo": "tarsius/hl-todo", "unstable": { "version": [ - 20190720, - 1147 + 20190807, + 1831 ], - "commit": "3010adfe09ee64cf403c2c7806581e5ea6823d05", - "sha256": "1h426q8r4xn44hr4fk0mv5mmxiskw65p58i78ngkl6cnvq80hnyv" + "commit": "be57dbc5a4667e4a60b8249b53fa176db1019c8e", + "sha256": "12swld4a723wqkh5h9jf3l4lj5rsidgmna53n8g48w8qvi2gz8l8" }, "stable": { "version": [ @@ -45087,25 +45215,6 @@ } }, { - "ename": "how-many-lines-in-project", - "commit": "3416586d4d782cdd61a56159c5f80a0ca9b3ddf4", - "sha256": "0rsl8f0ww2q5w87a8ddfjadw4mx4g2ahb62yb6xw7pzadmmz89f8", - "fetcher": "github", - "repo": "kaihaosw/how-many-lines-in-project", - "unstable": { - "version": [ - 20140807, - 442 - ], - "commit": "8a37ef885d004fe2ce231bfe05ed4867c6192d9b", - "error": [ - "exited abnormally with code 1\n", - "", - "warning: unknown setting 'system-features'\nerror: unable to download 'https://github.com/kaihaosw/how-many-lines-in-project/archive/8a37ef885d004fe2ce231bfe05ed4867c6192d9b.tar.gz': HTTP error 404 (curl error: No error)\n" - ] - } - }, - { "ename": "howdoi", "commit": "d08f4d6c8bdf16f47d2474f92273fd214179cb18", "sha256": "12vgbypawxhhrnjp8dgh0wrcp7pvjccfaxw4yhq7msai7ik3h83b", @@ -45556,17 +45665,17 @@ }, { "ename": "hydandata-light-theme", - "commit": "413c617f15947782891159a240e0c9014f1f7d11", - "sha256": "0jw43m91m10ifqg335y6d52r6ri77hcmxkird8wsyrpsnk3cfb60", + "commit": "51edfd2eed17b79058bbef836bc3edff50defa6e", + "sha256": "1x4hf3ysjq3nwzr8jg0zs5lgalgxriyby4rww24w9xi3jc1bx5f1", "fetcher": "github", - "repo": "hydandata/hydandata-light-theme", + "repo": "chkhd/hydandata-light-theme", "unstable": { "version": [ - 20160816, - 418 + 20190809, + 1925 ], - "commit": "0fbc91678ef65e1f65d7ec6792ff0b2f104d16a9", - "sha256": "0bkj5cw173l829fkgigghs07mc2i84ngvs2y9g6kamrpg6zhq7g8" + "commit": "180c3797fa7ef3e4bb679baaf5b492c33bbb9b8b", + "sha256": "157s8lssp6b4sjlm84qjg5wzgvgsgzqzpdh4y6g042xpgaz8b8nw" }, "stable": { "version": [ @@ -47223,11 +47332,11 @@ "repo": "kwrooijen/indy", "unstable": { "version": [ - 20150610, - 1706 + 20190807, + 625 ], - "commit": "4604867d8111f0e186a5351e68e054a77cb14abf", - "sha256": "17xvi39v358nff4h1f6l3l3xwjlcr9hzln5v8qmk0kq9b8gkzgxa" + "commit": "abc5bee424780ad2de5520f8fefbf8e120c0d9ed", + "sha256": "1mvmd8vm9w6vhr7ablxk5pylwrga6knhjjbin9l1xlgrpdh2pglp" } }, { @@ -47330,25 +47439,6 @@ } }, { - "ename": "inferior-spim", - "commit": "3416586d4d782cdd61a56159c5f80a0ca9b3ddf4", - "sha256": "0p0g8diqijxpgr21890lnmzkyl74sv42ddgpfpv51b9fwnqky524", - "fetcher": "github", - "repo": "kaihaosw/inferior-spim", - "unstable": { - "version": [ - 20160826, - 1346 - ], - "commit": "fb9aa091f6058bf320793f1a608c1ed7322c1f47", - "error": [ - "exited abnormally with code 1\n", - "", - "warning: unknown setting 'system-features'\nerror: unable to download 'https://github.com/kaihaosw/inferior-spim/archive/fb9aa091f6058bf320793f1a608c1ed7322c1f47.tar.gz': HTTP error 404 (curl error: No error)\n" - ] - } - }, - { "ename": "inflections", "commit": "392c7616d27bf12b29ef3c2ea71e42ffaea81cc6", "sha256": "0f02bhm2a5xiaxnf2c2hlpa4p121xfyyj3c59fy0yldipdxhvw70", @@ -48241,11 +48331,11 @@ "repo": "casouri/isolate", "unstable": { "version": [ - 20190206, - 329 + 20190808, + 731 ], - "commit": "3bb82f52b0df39c9b57fb68ba622b2906d0eecff", - "sha256": "00h9d6d6l8cxih8ix6kckc6dhzmq9hbfmgfmfpmf6f67c4ikcv8m" + "commit": "e93cb652f150705347480a2ee13b63fa625b1edf", + "sha256": "0fa4z1mm62s1x4fd6d4pwl6zvksx1xiv6id9fy7rdbs0vznsjgqb" }, "stable": { "version": [ @@ -48406,11 +48496,11 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20190801, - 1148 + 20190809, + 1551 ], - "commit": "4389a261b30c8fbfc6e31228b33b1764221daac7", - "sha256": "153a9nn0m6q5a4psw2vvnmqixkny56dlbrfvvw45zc9ikdd1wv2b" + "commit": "20d604c139b82d98010aabbbc00ad487438bdf8e", + "sha256": "0clg04az8v5ia3z5fxcimprqp4kbf2g1z6na3js60gmi689ks8ll" }, "stable": { "version": [ @@ -48658,8 +48748,8 @@ "hydra", "ivy" ], - "commit": "4389a261b30c8fbfc6e31228b33b1764221daac7", - "sha256": "153a9nn0m6q5a4psw2vvnmqixkny56dlbrfvvw45zc9ikdd1wv2b" + "commit": "20d604c139b82d98010aabbbc00ad487438bdf8e", + "sha256": "0clg04az8v5ia3z5fxcimprqp4kbf2g1z6na3js60gmi689ks8ll" }, "stable": { "version": [ @@ -50826,8 +50916,8 @@ "repo": "dzop/emacs-jupyter", "unstable": { "version": [ - 20190801, - 2126 + 20190809, + 349 ], "deps": [ "cl-lib", @@ -50835,8 +50925,8 @@ "websocket", "zmq" ], - "commit": "6b1baf1fde00ce97ac9d2f96ea6147b68f297640", - "sha256": "0dlb7nn2ifiw0b8psq2kszlkm58mklc8avlnpby4bwfh0vb1bsjc" + "commit": "c4dc513c52c57a6f67d3c25c09079365dd2b06f5", + "sha256": "1bfxv5y8w0c3n81yb59f74014sdvdqf294kw01bq68kcg0xk6bx8" }, "stable": { "version": [ @@ -51031,16 +51121,16 @@ "repo": "jmorag/kakoune.el", "unstable": { "version": [ - 20190601, - 2338 + 20190803, + 1525 ], "deps": [ "expand-region", "multiple-cursors", "ryo-modal" ], - "commit": "50488df2eeb6e8bfe72cfad4de24060819b148eb", - "sha256": "0ym3hbiwjraqsk3clcrkllr7jlj5zqsbxqq94ds2vj0x3f9i81fq" + "commit": "fe8f8a02c38538f5f7776df3402b270639281ad8", + "sha256": "15wnwjlh333c3aykk6w4xxy93ic6lzb7wmxaigxahg37a9qlp3hs" } }, { @@ -51119,15 +51209,15 @@ "repo": "ogdenwebb/emacs-kaolin-themes", "unstable": { "version": [ - 20190724, - 714 + 20190812, + 1835 ], "deps": [ "autothemer", "cl-lib" ], - "commit": "0c6d0cb40fd686686dcf08a4902f871066f8717e", - "sha256": "13jzcbgcxq1xix6vkiiz5dic4dk1sj7idrh4r6aqrz3hj6cjg0kj" + "commit": "9bc8dc1b69e6d858a523b98603201f60a51825fa", + "sha256": "0jb0z1p1n3fdmqlwrv7x0ndcccijdw6025gw6sm6qdyj09a241vw" }, "stable": { "version": [ @@ -51756,8 +51846,8 @@ 20180702, 2029 ], - "commit": "68dade8a209d498721f425e1ffd7e8c4d9de532b", - "sha256": "1zffkh46gk5as18fkgmzzr5kr9x2jak5mrhrhqb3fhhvfj9dd3xs" + "commit": "3ab5fde4ba63865333766685e025aae01933dbaf", + "sha256": "1k5qnrih9y8w49cbgi6prg98qqxrrn106g7h71azgpbav1mlfyk7" }, "stable": { "version": [ @@ -51777,14 +51867,14 @@ "repo": "stardiviner/kiwix.el", "unstable": { "version": [ - 20190325, - 352 + 20190811, + 1116 ], "deps": [ "cl-lib" ], - "commit": "c662f3dc5d924a4b64b7af4af28f15f27b7cea1e", - "sha256": "0i11sfnqvjqqb625cgfzibs6yszx891y4dy7fd6wzmdpclcyzr8z" + "commit": "d2ae3386b52a25c080d8502fc19207d997676cd2", + "sha256": "0fsndh8nwpmnbv505r26cxxgxx8wlvx9h8pgb95im6q6pj2g7p9x" }, "stable": { "version": [ @@ -52035,16 +52125,16 @@ "repo": "chrisbarrett/kubernetes-el", "unstable": { "version": [ - 20190605, - 134 + 20190813, + 239 ], "deps": [ "dash", "magit", "magit-popup" ], - "commit": "95d5c934f2955388bdd2f568b8e5c706ce15c21b", - "sha256": "1kahnk2cy96zpxb35vj7f9zanb1nm79p3wxgq4cwgmi6h6gj0arq" + "commit": "e0eff360c83c61d531bf0a0032efa6b963ce2b57", + "sha256": "09zqayzl05yszxh619i2ri12g3c0lbbvbh4m4isyxvancxk88igs" }, "stable": { "version": [ @@ -52075,8 +52165,8 @@ "evil", "kubernetes" ], - "commit": "95d5c934f2955388bdd2f568b8e5c706ce15c21b", - "sha256": "1kahnk2cy96zpxb35vj7f9zanb1nm79p3wxgq4cwgmi6h6gj0arq" + "commit": "e0eff360c83c61d531bf0a0032efa6b963ce2b57", + "sha256": "09zqayzl05yszxh619i2ri12g3c0lbbvbh4m4isyxvancxk88igs" }, "stable": { "version": [ @@ -52774,11 +52864,11 @@ "repo": "ledger/ledger-mode", "unstable": { "version": [ - 20190709, - 548 + 20190811, + 2340 ], - "commit": "08462cdf1e9c58c45ce3d4909bed7e69a25ed52c", - "sha256": "04g305qnhj14vi54iq0w4mkw1gjbnbzvinw94kyss9w75rwm213g" + "commit": "0114525803860b18a34624339825219bb6b8943e", + "sha256": "04di2f51i0gqvwj8x2wn1f85a4iyg6gf8hkig4z244j8jv489v6d" }, "stable": { "version": [ @@ -53094,11 +53184,11 @@ "repo": "magit/libegit2", "unstable": { "version": [ - 20190728, - 701 + 20190810, + 1757 ], - "commit": "72d6b273159dd034fa2fb7bffb1ebff5e7ccba11", - "sha256": "15vs68x7lcav5ihl27y3wwxv05whabahx6l7w3jbr9g5c8w38f8g" + "commit": "60e1e7d360b376534c4b6258ddf7d5b5f0a68133", + "sha256": "18y3wdfy6pnyv0slggagdyy41mjwsprnr57ab1qmyz5dd8ryfwwn" } }, { @@ -53186,14 +53276,14 @@ "repo": "elpa-host/line-reminder", "unstable": { "version": [ - 20190716, - 715 + 20190807, + 440 ], "deps": [ "cl-lib" ], - "commit": "24b3916f7714039a704f11b450479f4e843bafe6", - "sha256": "04krsprkgl4k9cn0iywf21qphd7k8x6bg331mh4749mcbmmw8k9g" + "commit": "707dc65001778e6476085fd7c30e1a1a3f84563a", + "sha256": "07fd1gw1fwzc1ynfp59b06hm9hz93fnjhgkgxmhk464ri0nv0l60" } }, { @@ -53452,8 +53542,8 @@ "repo": "abo-abo/lispy", "unstable": { "version": [ - 20190730, - 1215 + 20190802, + 1214 ], "deps": [ "ace-window", @@ -53462,8 +53552,8 @@ "iedit", "zoutline" ], - "commit": "3d1afdd8ecca7c28ddb66268c9121a074a6752ba", - "sha256": "0w8m3x53ipyqny9b4yy34rsf588719p9q5n21dh3q1w4qidl2pjy" + "commit": "beb939a1afaf8ee39955b7bc0bc65326df817f48", + "sha256": "101hqw794a8hcrcwvjjzxydcdlwdvxxfhbablcafpiqj1dr4vn9m" }, "stable": { "version": [ @@ -53751,25 +53841,25 @@ "repo": "jingtaozf/literate-elisp", "unstable": { "version": [ - 20190609, - 840 + 20190804, + 602 ], "deps": [ "cl-lib" ], - "commit": "d00a7fe92c9e74aaa60574e9109fd38c471e606f", - "sha256": "018spl2zkm0nrm0d4f7i10jw72as29c45n61dfsl3966y0qy7kvx" + "commit": "1dd1aad8c4049423d1a7980191c25b4120681296", + "sha256": "07gp0l2y7ysl13n368jaqnj52fpqcirj0faz95rrzrysq9ap8xn8" }, "stable": { "version": [ 0, - 5 + 6 ], "deps": [ "cl-lib" ], - "commit": "d00a7fe92c9e74aaa60574e9109fd38c471e606f", - "sha256": "018spl2zkm0nrm0d4f7i10jw72as29c45n61dfsl3966y0qy7kvx" + "commit": "1dd1aad8c4049423d1a7980191c25b4120681296", + "sha256": "07gp0l2y7ysl13n368jaqnj52fpqcirj0faz95rrzrysq9ap8xn8" } }, { @@ -54081,11 +54171,11 @@ "repo": "ionrock/lodgeit-el", "unstable": { "version": [ - 20150312, - 1349 + 20190802, + 1308 ], - "commit": "ec9b8e5cbb17bcf8ac4bdddd1d361cb60e59384c", - "sha256": "1cdnm270kzixa0kpis0xw2ybkw8lqh7kykc7blxkxjrr9yjvbawl" + "commit": "442637194d48a7105b7747b8d98772f5899f9e21", + "sha256": "1lw9d6908si7rw5802vwpnfklpahqsabkl21nzg77a4pp3pgy80v" } }, { @@ -54514,8 +54604,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20190801, - 732 + 20190813, + 451 ], "deps": [ "dash", @@ -54525,8 +54615,8 @@ "markdown-mode", "spinner" ], - "commit": "720b8b6f2a11a8d7e783b905bc764573b93f5a87", - "sha256": "0548iqaq8q5jsajj08gxg9nls7iln80nzzm5wl2ff4v0ykf5w4gz" + "commit": "e4efbab6704e6b1241cccfa0992dbcc4ba08cdcb", + "sha256": "0by7frvvf1swarswa7vfv1pgq2pirvx5jl61nxdw3q2l1ak4v7mr" }, "stable": { "version": [ @@ -54618,8 +54708,8 @@ "repo": "emacs-lsp/lsp-python-ms", "unstable": { "version": [ - 20190719, - 659 + 20190809, + 640 ], "deps": [ "cl-lib", @@ -54627,8 +54717,8 @@ "lsp-mode", "python" ], - "commit": "60b663c82a55613009632ee83aad8cdc1c410a84", - "sha256": "1kcdjk9j6qf5smbirc09m31i5fqzdv9d61ww745cc35jff6qygmc" + "commit": "8b18a98ad68373aa4d7ef24ec728a250ca570a2a", + "sha256": "1mz6hy1k0g3m5x4cvyqb68811aa2iabmjw4v2qbjfwd5jbmyvy21" } }, { @@ -54699,8 +54789,8 @@ "repo": "emacs-lsp/lsp-ui", "unstable": { "version": [ - 20190523, - 1521 + 20190809, + 1907 ], "deps": [ "dash", @@ -54708,8 +54798,8 @@ "lsp-mode", "markdown-mode" ], - "commit": "3ccc3e3386732c3ee22c151e6b5215a0e4c99173", - "sha256": "1k51lwrd3qy1d0afszg1i041cm8a3pz4qqdj7561sncy8m0szrwk" + "commit": "1cfff2135ffbf7ac52d9c2ece3f2bd157ac51167", + "sha256": "1pbqjrhdv3n73p785fj3gl11rpaim0my78gp530239w10q5i7g9z" }, "stable": { "version": [ @@ -55142,8 +55232,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20190731, - 934 + 20190812, + 1330 ], "deps": [ "async", @@ -55152,8 +55242,8 @@ "transient", "with-editor" ], - "commit": "9e2df13e5338b7bde31dceca4e64494bc0fd68a8", - "sha256": "0pxqbwd6fwhnr844m3k82yy26f74favmj5jzidypim0f1x2rmr82" + "commit": "75d0810d131e2e61ae3c683797a10a2caca96073", + "sha256": "19ynyx1648riwnpiwzk1mk36z4fw4j4bggr7mf7pinsvv9191zmq" }, "stable": { "version": [ @@ -55466,8 +55556,8 @@ "libgit", "magit" ], - "commit": "9e2df13e5338b7bde31dceca4e64494bc0fd68a8", - "sha256": "0pxqbwd6fwhnr844m3k82yy26f74favmj5jzidypim0f1x2rmr82" + "commit": "75d0810d131e2e61ae3c683797a10a2caca96073", + "sha256": "19ynyx1648riwnpiwzk1mk36z4fw4j4bggr7mf7pinsvv9191zmq" } }, { @@ -55653,14 +55743,14 @@ "repo": "magit/magit-tbdiff", "unstable": { "version": [ - 20190507, - 236 + 20190808, + 1639 ], "deps": [ "magit" ], - "commit": "fcde2e718974acb2b8905b623e0eca74c58b6b0f", - "sha256": "0ks2fyiwxg4zqhplbysb9wv82nrd72ihqi911hf7m48a72w7assx" + "commit": "49faa9b94c338c0d5aa064f41b3acd50e5943421", + "sha256": "0wznf26l8hvdp8p6nbvwbwg2v33yrms72nsw0gvyvnn5mqiw4v7b" }, "stable": { "version": [ @@ -55683,8 +55773,8 @@ "repo": "alphapapa/magit-todos", "unstable": { "version": [ - 20190709, - 954 + 20190805, + 552 ], "deps": [ "async", @@ -55695,13 +55785,13 @@ "pcre2el", "s" ], - "commit": "8f634a29cbd1f2b7cd7f3f62c96f14437327f29b", - "sha256": "0jllwfzk895hx9x0mjiwzah701lhprdxl2mvvb4vzdrsycjz255w" + "commit": "8a88171b2785acce59081d8b12649731e6cf20c0", + "sha256": "09pjb4k409gc0h51vb5az1shx02c1hx8cnvhi529n7dm4maildg5" }, "stable": { "version": [ 1, - 3 + 4 ], "deps": [ "async", @@ -55712,8 +55802,8 @@ "pcre2el", "s" ], - "commit": "8faad07c26afead462b94c11873e2b6d2613966b", - "sha256": "0gfm6wn2a4v5i9lfsvvin0kwpr9n96ddm3z4yf50jd3kg2igzry1" + "commit": "8a88171b2785acce59081d8b12649731e6cf20c0", + "sha256": "09pjb4k409gc0h51vb5az1shx02c1hx8cnvhi529n7dm4maildg5" } }, { @@ -56100,10 +56190,10 @@ }, { "ename": "manage-minor-mode", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "0ljdca9b08dw0kx679jmq0wc484xcpbmzwx8zkncw642pnbj9q0j", + "commit": "7a4e84530b4607a277fc3b678fe7b34b1c5e3b4f", + "sha256": "1y5a4r92b8zb2kvmsg6s3drg4q4g35jqj8nmfx4z5rrnck1r31ym", "fetcher": "github", - "repo": "ShingoFukuyama/manage-minor-mode", + "repo": "emacsorphanage/manage-minor-mode", "unstable": { "version": [ 20140310, @@ -56314,14 +56404,14 @@ "repo": "jrblevin/markdown-mode", "unstable": { "version": [ - 20190305, - 319 + 20190802, + 2215 ], "deps": [ "cl-lib" ], - "commit": "115f77df9755c6a453f3e5d9623ff885d207ea82", - "sha256": "0a26gz2m5v0jkawlqb723yiqsns4sg7inalr8fk1x08khnckkzyz" + "commit": "f3c54e34cc5228001af36a5301883325319f21d4", + "sha256": "1zvpryra1sr63192j6v62kc9mvhc9wsvm7haj2maxmv2v3akhlil" }, "stable": { "version": [ @@ -56554,6 +56644,21 @@ } }, { + "ename": "marquee-header", + "commit": "7fad3e54df480d61e5f83aab053e834e6ef72cc7", + "sha256": "09yb1ds1r54xw2hsvb1w9i33a5qm0p79vgmj5ikw18zh68pnmzza", + "fetcher": "github", + "repo": "elpa-host/marquee-header", + "unstable": { + "version": [ + 20190805, + 140 + ], + "commit": "ac33b04c5a50de95c937fce1d80001a3c3c9b26d", + "sha256": "1cq6v8wdmvi90fc3mnqpsscnv1m19cp9iv6ba1dv7y32fh1d95my" + } + }, + { "ename": "marshal", "commit": "203f2061c5c7d4aefab3175de5e0538f12158ee3", "sha256": "17ikd8f1k42f28d4v5dn83zb44bsx7g336db60q068w6z8d4jbgl", @@ -57419,8 +57524,8 @@ 20190324, 1908 ], - "commit": "09ca6d11ad88f5d3ebd6d1dfffc8a6bc5f4261a8", - "sha256": "1wgcky4lq71yxw327y9qzlam9mh8xmqqixzj1gk02pgg109m3kli" + "commit": "b18648118144c0a3f7c1d74aad3e98ff16402e2e", + "sha256": "0i8gc4n691fhfn4p99k08bcd5sddn9wjh3cr5djbfh3x78gm4m32" }, "stable": { "version": [ @@ -57440,26 +57545,26 @@ "repo": "yoshinari-nomura/mhc", "unstable": { "version": [ - 20190506, - 633 + 20190807, + 513 ], "deps": [ "calfw" ], - "commit": "88b5f938e57c28e9e2db202770f952fc0ecba945", - "sha256": "13d31wz7wyh777isimxlkdimj3vbl54bh0f00p15a8xlrs2pn7f3" + "commit": "56e58bb8f22d621d271ada64b98eb6e09595e462", + "sha256": "1bz5s7y7jb00acgk140rbd2rr1i6ajnqvxbgs3yp19cxfnspbcj5" }, "stable": { "version": [ 1, 2, - 2 + 3 ], "deps": [ "calfw" ], - "commit": "88b5f938e57c28e9e2db202770f952fc0ecba945", - "sha256": "13d31wz7wyh777isimxlkdimj3vbl54bh0f00p15a8xlrs2pn7f3" + "commit": "37898db4902cd644a0d3e8d9d02426d54fb8984a", + "sha256": "0c9kshs17b8fn8la8hlzf05vf5pajf3ksx7bsjri3m78s6bd3h4z" } }, { @@ -59158,14 +59263,14 @@ "repo": "ksato9700/mu-cite", "unstable": { "version": [ - 20160130, - 1100 + 20190803, + 439 ], "deps": [ "flim" ], - "commit": "aea3c2d01eb3284d5e0124059d368e8c6b6ffddc", - "sha256": "1gxspy50gh7j4sysvr17fvvp8p417ww39ii5dy0fxncfwczdsa19" + "commit": "b2c83bbce4646d100b942f0f0de0877a8d47298c", + "sha256": "1kg4l88k4gwv7zczmbgxzpmifkbklf3yzlk849igs01z4jvh2bkc" } }, { @@ -59821,6 +59926,29 @@ } }, { + "ename": "myrddin-mode", + "commit": "224cd200f2f399f25865b6f5b9bf5ec8b957bf35", + "sha256": "1gz126gnwgrvkxd3n7xwqfzpk9lvcll3g8v4pa2w9hsz98crwwgl", + "fetcher": "git", + "url": "https://git.sr.ht/~jakob/myrddin-mode", + "unstable": { + "version": [ + 20190804, + 2205 + ], + "commit": "b996da5e3bae842eacba4b3e429899bb841b077e", + "sha256": "0gylwdq81s89civrlwsg4zrvyjkjw37jdp1mvsihx8xpq38w4r65" + }, + "stable": { + "version": [ + 0, + 1 + ], + "commit": "b996da5e3bae842eacba4b3e429899bb841b077e", + "sha256": "0gylwdq81s89civrlwsg4zrvyjkjw37jdp1mvsihx8xpq38w4r65" + } + }, + { "ename": "mysql-to-org", "commit": "855ea20024b606314f8590129259747cac0bcc97", "sha256": "0jjdv6ywdn1618l36bw3xa3mdgg3rc8r0rdv9xdqx8mmg648a7gj", @@ -60736,11 +60864,11 @@ "repo": "aaronjensen/night-owl-emacs", "unstable": { "version": [ - 20190623, - 657 + 20190808, + 2050 ], - "commit": "340ebdde6214bee0918281672ec535ba1e8f5dbe", - "sha256": "0zg5mqbmi8qlp9zdyafjnrazzffbqb27zl7j7ay2ssr9k7czhqds" + "commit": "16fdaa15593cd86daf1100852045cdbd5c242d49", + "sha256": "0w4q9ar0kn0fgp554dwwb488za8kf80mi1dl0fh748b54m70j2c4" }, "stable": { "version": [ @@ -60814,11 +60942,11 @@ "repo": "m-cat/nimbus-theme", "unstable": { "version": [ - 20190724, - 740 + 20190810, + 1848 ], - "commit": "74614940e8e47d348d3102d767188fa6c6d879b1", - "sha256": "13n7m9jwkvcxbqvw2lp7xskmxzj6n1pisn14kb09cphlrvyg1hmj" + "commit": "0bbdedd23361ffbd7199c70481803b708fb65d59", + "sha256": "1v4cisqlqh2lqql29459lb475r4k95gz8qdvsn89hl58s27iq420" } }, { @@ -60832,8 +60960,8 @@ 20181024, 1439 ], - "commit": "e0bc2e5fd9036a31d507881e1383adde3672aaef", - "sha256": "1kcz81v09fm2fasx9wymrckgxvxb9d5y6kywcfi6mbn4mz6laww8" + "commit": "bd17f236231a58c44f1f5f09ff925aa666d672b7", + "sha256": "0xgb954shsahj8vm0mncl85cmy74xxxdqh4fp4bjv10gl8z2p8hf" }, "stable": { "version": [ @@ -61086,15 +61214,18 @@ "repo": "dickmao/nnreddit", "unstable": { "version": [ - 20190726, - 2200 + 20190812, + 2056 ], "deps": [ + "anaphora", + "dash", "json-rpc", + "request", "virtualenvwrapper" ], - "commit": "8e901b207f717227b4fe25e6a4a5dc61b103e8b7", - "sha256": "1hdna9y6jk10s3mx45k39k6cb670s1wx79pfgaivkpjqhcdj5xx5" + "commit": "3e6c4a5cd073d3d02aad0620cb00201e1f659fa5", + "sha256": "0k85hvp88i4rmv4igwhflw1rf307wxqk7l0qipybgbccs2zca5hc" } }, { @@ -61120,14 +61251,14 @@ "repo": "emacscollective/no-littering", "unstable": { "version": [ - 20190729, - 642 + 20190730, + 2037 ], "deps": [ "cl-lib" ], - "commit": "7480853e0fe7d3ddd89407122ebe8068f96ae579", - "sha256": "0nbrsyjjq6mc116hzqn9fd0lmqrqcnf9jzzwyv8mp22szk39zyvp" + "commit": "b36e1d28b97693850da258e103f24c40ec882753", + "sha256": "17y0m1n8vn6p0qykphbpbjbm3gzd2wprw6i2nwfd4g718hbsrkwi" }, "stable": { "version": [ @@ -61376,20 +61507,20 @@ }, { "ename": "nordless-theme", - "commit": "3de9da6cb8c1a75ff1d41a69e156c21be00713b6", - "sha256": "1ylvqh5hf7asdx2mn57fsaa7ncfgfzq1ss50k9665k32zvv3zksx", - "fetcher": "github", - "repo": "lthms/nordless-theme.el", + "commit": "d16babc1f37d62cb8e9e983dfd92dabb83c8b9b3", + "sha256": "0nf9pkyrv0qvbpmp2kqdqmli6cg0bvn9q815p9pdpvacmjsnfpvj", + "fetcher": "git", + "url": "https://git.sr.ht/~lthms/colorless-themes.el", "unstable": { "version": [ - 20190729, - 1556 + 20190802, + 725 ], "deps": [ "colorless-themes" ], - "commit": "30926ee9e8de50ae3ccc83956e048f68ed69736b", - "sha256": "0mqgwbjgwz3mdi6q66y816pj5sac7mv35jlzfkfv1d0kl7r7abcr" + "commit": "4f9d0ec5a078ab8442abdba0c35eb748728f3052", + "sha256": "1h8ggaqvrdj8cyknps9anh2xz08ar94137gydvxy8xgrmpa3jnc1" } }, { @@ -61947,16 +62078,16 @@ "repo": "zwild/ob-ammonite", "unstable": { "version": [ - 20190604, - 1351 + 20190813, + 59 ], "deps": [ "ammonite-term-repl", "s", "xterm-color" ], - "commit": "e9d431acc014fb064d77fab0201c626126e7922c", - "sha256": "1cmpczl9p8ig1ql85kqhshzd64rc8xjpq0qgx0jq9yk4syaayk4h" + "commit": "39937dff395e70aff76a4224fa49cf2ec6c57cca", + "sha256": "0aibvrhwj2swv9ixl6hx4b2yicbpi095mvs0fib7i1nhlg0zciqd" } }, { @@ -62960,8 +63091,8 @@ 20190726, 1452 ], - "commit": "8389c2ac0420036426337ed24ff3dab984b00cd5", - "sha256": "00l7jvzhd9cr9yx8rxadkw87rq7bimj872vsggvi7vjpxn2q0ck0" + "commit": "bdd84a71da8eac87447e35b55782ec07f0d2aead", + "sha256": "0cvfzz1i3lh9q5fl26sp98cqpv3mqjxlzlflv8hc3cdr8ascjm4g" }, "stable": { "version": [ @@ -63296,8 +63427,8 @@ "repo": "OmniSharp/omnisharp-emacs", "unstable": { "version": [ - 20190702, - 1945 + 20190809, + 341 ], "deps": [ "auto-complete", @@ -63309,8 +63440,8 @@ "popup", "s" ], - "commit": "cb05dfe213a8dae355b72c6df5bf75327dacafef", - "sha256": "0zfhax0djy8a05j9n76ggw3srgxmn5b0m31jbxp1ixbx9icymshn" + "commit": "b5afa053c8d3771d5567538bae89a03cc66e826c", + "sha256": "0vhjfig0yx2ihqbq9ah6w7vs84lbnn5zlkjlda63kfs5cwwi43vp" }, "stable": { "version": [ @@ -63917,14 +64048,14 @@ "repo": "Kungsgeten/org-brain", "unstable": { "version": [ - 20190731, - 1217 + 20190809, + 1315 ], "deps": [ "org" ], - "commit": "6261549545af690313839b456d4c8486b39288bb", - "sha256": "01z8z78h6095lpbsi0f8y99az3nhdh04dnfmng8y0iqkmbqkqkq9" + "commit": "0f984e01a982ded563df9fab5355a29f781b2430", + "sha256": "09m4vsfmqfni5jdwxpkhfg3jzbd69d3di1z9wdc9bvbxrrd03a3a" } }, { @@ -63935,11 +64066,11 @@ "repo": "emacsorphanage/org-bullets", "unstable": { "version": [ - 20180208, - 2343 + 20190802, + 927 ], - "commit": "b56f2e3812626f2c4ac1686073d102c71f4a8513", - "sha256": "0a0dml6y49n3469vrfpgci40k4xxlk0q4kh2b27shjb440wrmv4x" + "commit": "c19b13be00df8d8dc596e4f1aef4a094b08ac801", + "sha256": "1rvhinwnz660mfz4wkr2wa51ss5cm4gzpwfvwc0s0srk14s2h66h" }, "stable": { "version": [ @@ -63959,14 +64090,14 @@ "repo": "dengste/org-caldav", "unstable": { "version": [ - 20180403, - 2036 + 20190812, + 1918 ], "deps": [ "org" ], - "commit": "8d3492c27a09f437d2d94f2736c56d7652e87aa0", - "sha256": "19q83xgbdabkidx26xvff1x7kixk2wllplnwfsy7kggdj9wqpm9l" + "commit": "1fd520490303d9a3e45187f2fe56f00ac403c214", + "sha256": "1m1ics2pd7x07ylbkmm1darbqdzrp29x3jlckr1bwizk9dwaz0r4" } }, { @@ -64022,14 +64153,14 @@ "repo": "Chobbes/org-chef", "unstable": { "version": [ - 20190608, - 1559 + 20190807, + 1453 ], "deps": [ "org" ], - "commit": "8f1a1845542925e4ecafe8d68ee752b404ecc51c", - "sha256": "0r9ax5yxvb1fqiil881yhywvypwxv9bafgqgjx4sl59y4ilksx15" + "commit": "f42d75a9787f9644f03b6f9a379bbc40f6397605", + "sha256": "0ra8ky67i2f4saqv265dby0r1x9n4lv8vn607g0z7c9myff6bxnf" } }, { @@ -64569,8 +64700,8 @@ "repo": "kidd/org-gcal.el", "unstable": { "version": [ - 20190401, - 1741 + 20190812, + 951 ], "deps": [ "alert", @@ -64578,8 +64709,8 @@ "org", "request-deferred" ], - "commit": "3874040bd86050db60b982bb62acafb69b6a4d9b", - "sha256": "1dffrws0rvxvsg9jqjx239zxssd6sskqv3x58mm5vvhna423cm67" + "commit": "f0f9dc2ba7a5075b4f6755f96399c9dfee299ac7", + "sha256": "0s6bcyhg059409s0w191m1hpd8nfi1478jsilnby5fn1jhgdjmga" }, "stable": { "version": [ @@ -64797,16 +64928,16 @@ "repo": "gizmomogwai/org-kanban", "unstable": { "version": [ - 20190528, - 507 + 20190802, + 2107 ], "deps": [ "dash", "org", "s" ], - "commit": "dcf5e8c0a2d82bc4101c03ba21a2d38b406ea00b", - "sha256": "02n5753kqvb6ankqrynrlalik5r9g367rg4yzmf8mhx52x1h5va4" + "commit": "1f9e420fd0030049714690c3d98cc75da83255bb", + "sha256": "0m9l4xsalavwm82wvlyfphi65lb65mkyp5dvpyjf86ijc9w8crvf" }, "stable": { "version": [ @@ -65000,14 +65131,14 @@ "repo": "org-mime/org-mime", "unstable": { "version": [ - 20190702, - 1129 + 20190805, + 57 ], "deps": [ "cl-lib" ], - "commit": "286330fa15167add4b17eb62b0c52695f08a76e8", - "sha256": "1b6mcvhcyyf84g4yg44i0f7vpisw6dyimm5h9kqfzw8npx6gmfah" + "commit": "4bd5d55ba9bca84ffd938b477c72d701cf3736df", + "sha256": "0a9vjlg5rz3c61wvy0wsj9l5y3p6b1v8hz84ksh97xnmmzclp1nx" }, "stable": { "version": [ @@ -65159,15 +65290,15 @@ "repo": "weirdNox/org-noter", "unstable": { "version": [ - 20190502, - 1425 + 20190807, + 1809 ], "deps": [ "cl-lib", "org" ], - "commit": "920798e2a977ca74b77cf728ee40bb48450f941b", - "sha256": "1sx4pf5hwbq7r967zigzq3jhhisd3x9pf3nmp7iickyd1jcg3qbv" + "commit": "d3df267a7432ecf0fb287a645e06dee7e7b80671", + "sha256": "0hj2h88zcg6vp3h1dash91gg2k1dqw2bib2glv0cp39b0xaspcsf" }, "stable": { "version": [ @@ -65372,8 +65503,8 @@ "org", "pdf-tools" ], - "commit": "09ef4bf8ff8319c1ac78046c7e6b89f6a0beb82c", - "sha256": "15zxdq6f6w3l8pzg3b58cj37z61dx106jwslpqni71m8wczdqkz1" + "commit": "8b71f313634b95a1fac42fc701934fd796565f3b", + "sha256": "1gd4ari970vb4631f9a4czvql8gafaqh7iir75n4wxqdcnglnymw" }, "stable": { "version": [ @@ -65622,16 +65753,17 @@ "repo": "alphapapa/org-ql", "unstable": { "version": [ - 20190726, - 2139 + 20190813, + 146 ], "deps": [ "dash", "org", - "s" + "s", + "ts" ], - "commit": "51af2a16a7944f1b902a7fcfb39ae4018da30330", - "sha256": "0bn4f9v3ii516sp6x8i6qqj3hlb7x4s24iymd7jixly5is89sby2" + "commit": "5174aca4e8fe956abae7161d15058702bc8874c1", + "sha256": "1r2a1j4cdkw7rf981r06c3qc30c2irs3gawzkwxiflslkimpav42" }, "stable": { "version": [ @@ -65723,28 +65855,28 @@ "repo": "oer/org-re-reveal", "unstable": { "version": [ - 20190801, - 1848 + 20190802, + 642 ], "deps": [ "htmlize", "org" ], - "commit": "48f3880009d2e31943790eb3d78d06c875ec4c17", - "sha256": "1npd51z16ibchms4qc6c43q22nva074f65hzahi01bvz1j981d69" + "commit": "dcbfcb80a3c6fd0f5af25d1fd17d8e0c6582e791", + "sha256": "0nm87rmbljw9mjv7fc6ivpqxnwak4xs0wjc903ihwd3y9vmc36p8" }, "stable": { "version": [ 1, 1, - 8 + 10 ], "deps": [ "htmlize", "org" ], - "commit": "48f3880009d2e31943790eb3d78d06c875ec4c17", - "sha256": "1npd51z16ibchms4qc6c43q22nva074f65hzahi01bvz1j981d69" + "commit": "dcbfcb80a3c6fd0f5af25d1fd17d8e0c6582e791", + "sha256": "0nm87rmbljw9mjv7fc6ivpqxnwak4xs0wjc903ihwd3y9vmc36p8" } }, { @@ -65755,15 +65887,15 @@ "repo": "oer/org-re-reveal-ref", "unstable": { "version": [ - 20190727, - 543 + 20190804, + 846 ], "deps": [ "org-re-reveal", "org-ref" ], - "commit": "a69e5bcc38d67ff99c0677f6187da67493fda876", - "sha256": "1mbg7v2jl507zxl5n6wxkl1kwz6m6yr4av0ylwz5d95b1rbrjahj" + "commit": "094fd1d320c64ac361a57402501f0e43787b357c", + "sha256": "0r1ns3fm22yxc6zf4p5rvbk49r6966fqfl1caf0w3fyqgvwvllxi" } }, { @@ -65774,16 +65906,18 @@ "repo": "alphapapa/org-recent-headings", "unstable": { "version": [ - 20190731, - 2203 + 20190807, + 1016 ], "deps": [ "dash", + "dash-functional", "frecency", - "org" + "org", + "s" ], - "commit": "0cc5a30d11c64db5d3f0ab5c4a7739b38a763c42", - "sha256": "0dzfdlhw3dslrjwpjff96xavackabz6h1kaip5k88hlqcmj0rnsk" + "commit": "c1984fe70322c35ee48b2d8bc410dd0a13ffbbc5", + "sha256": "13kcrki9v0w594g8q6rdzfx4002xzs8sz7c5fg7rvrm03sp93dqa" }, "stable": { "version": [ @@ -65813,8 +65947,8 @@ "deps": [ "org" ], - "commit": "b121da04ac9d3f30894a60b7c7a83c5ba2f32a6a", - "sha256": "1z8g49f4wpiav4vpd7fbh4chbc7id1p3c621a3wwrkxj2xkq3xnr" + "commit": "23c3c3a85d9042dc09ed6147b274f4043cfa50f7", + "sha256": "1sw9h6543zgsyss5ns3bjviz0nblsr077hp8b15pva0ch2836vg5" } }, { @@ -65840,8 +65974,8 @@ "repo": "jkitchin/org-ref", "unstable": { "version": [ - 20190706, - 2059 + 20190802, + 1327 ], "deps": [ "dash", @@ -65855,8 +65989,8 @@ "pdf-tools", "s" ], - "commit": "45152736e332e50f8257248efbb31e069a2c81c5", - "sha256": "0lhbi5wcqr1yj7pqn0va42za438dbpr2gkmxf8i0fkfg0ndmsblq" + "commit": "9ab74270c1543e4743ca0436de567d8205403b43", + "sha256": "0ma9zaxzrd1dzmk8633bkw6wrp03wrm9bjhrgsp9qp7vhm597fdq" }, "stable": { "version": [ @@ -65911,14 +66045,14 @@ "repo": "akirak/org-reverse-datetree", "unstable": { "version": [ - 20190706, - 203 + 20190806, + 1412 ], "deps": [ "dash" ], - "commit": "bd78e007f972642a8733696ab51b37a8228a1beb", - "sha256": "130w438g9hdsmips1ki909qy1ddhv41qjr0df7qaqvbf1yrymd9b" + "commit": "0c70a06474921638eba3c287472879ce903ee8b7", + "sha256": "0fdndpy7j8idbrqpn85hnwj8caf737hcind00blbvc5rka85vaq4" } }, { @@ -66004,11 +66138,11 @@ "repo": "lordnik22/org-shoplist", "unstable": { "version": [ - 20190730, - 2320 + 20190809, + 2156 ], - "commit": "267407c9157214fb20edb882da8f5c0064a74a8d", - "sha256": "0pvfxrxkd8hbcl1nh5w7nr9s1phcqbg2awkkbmhz53n3c4q83gfx" + "commit": "9591a4747eb2e5cab53203a120f9b854c75e629b", + "sha256": "1b721xp6dn54x2j73ysnzw9qxd9fxpvnqiy2y0issmz6xmccgzac" } }, { @@ -66068,8 +66202,8 @@ "dash", "dash-functional" ], - "commit": "02f4482f1efe840f0e720ec9764c07e72e0e76c2", - "sha256": "0nf2nh1ghg2k21z087q4q75f56h9m7xsxg50r4gv9mbvd9xklcik" + "commit": "cf99a57ec95773a765e71b764abaff974d7fa278", + "sha256": "0ipqzbc3az4mayz49kc504kw0q3pcy6izbcdg8fmqrckgv79x54y" } }, { @@ -66080,15 +66214,15 @@ "repo": "akirak/org-starter", "unstable": { "version": [ - 20190720, - 1023 + 20190812, + 215 ], "deps": [ "org-starter", "swiper" ], - "commit": "02f4482f1efe840f0e720ec9764c07e72e0e76c2", - "sha256": "0nf2nh1ghg2k21z087q4q75f56h9m7xsxg50r4gv9mbvd9xklcik" + "commit": "cf99a57ec95773a765e71b764abaff974d7fa278", + "sha256": "0ipqzbc3az4mayz49kc504kw0q3pcy6izbcdg8fmqrckgv79x54y" } }, { @@ -66153,8 +66287,8 @@ "repo": "alphapapa/org-super-agenda", "unstable": { "version": [ - 20190724, - 308 + 20190809, + 1550 ], "deps": [ "dash", @@ -66162,8 +66296,8 @@ "org", "s" ], - "commit": "375bde4ca72494ac88a2a9738754f047fe45cc4e", - "sha256": "0hrwf02fqjm0d9gj146ax67ib76093qpqh7066dcxj2gy20625yj" + "commit": "4ad333643276ba1a604e8bec4a72ab68bafb8a94", + "sha256": "1rbivi5xjpbs4rbfldhrf0lw7q1nh99nlf8yi11kxf76z6d75vik" }, "stable": { "version": [ @@ -66585,11 +66719,11 @@ "repo": "flexibeast/org-vcard", "unstable": { "version": [ - 20170929, - 1110 + 20190810, + 124 ], - "commit": "dbe266b79df4fb31f1766010322bf4e383ce1c03", - "sha256": "1rcqcgxvjshbz3n1p376h618xapj03n6m7b3cxgv9gnryviyr6ax" + "commit": "df5e2d3bc0c3970e5fd553ee9d55878c4f9a163d", + "sha256": "0x862pqya2q4pg8448qlp5267x8ycqq1zmkbvcyrzanag3983d8v" }, "stable": { "version": [ @@ -66906,16 +67040,16 @@ "repo": "elpa-host/organize-imports-java", "unstable": { "version": [ - 20190517, - 426 + 20190807, + 1218 ], "deps": [ "cl-lib", "f", "s" ], - "commit": "e1604b86673476444593906f024f541371305b67", - "sha256": "024vr43znfb2r6ab64jmk4wzifbfyacxy9468gnq8scdg6pnz5vk" + "commit": "df209ce7f8055bd9fbd93e7a03b42f1705a1933d", + "sha256": "1fx05xn22zj5dgdyxrz0ifzxwfpf1s5gcszkjyhzfg1g2r8kmf0v" } }, { @@ -66933,8 +67067,8 @@ "cl-lib", "org" ], - "commit": "609e5e37348815ec3ba53ab6d643e38b0cc4fe17", - "sha256": "0kg5ns87p8v6vsb7abgqcfnzi55fbgi7b5dj98hrvnlkv4sqz7pc" + "commit": "3982f56efd67ec016389cad82ce5a44f619b36a9", + "sha256": "1vr00ql7izfxswrnbyzq0avlhqy3p0jyw16gnjhczqhg09iln6rw" }, "stable": { "version": [ @@ -67063,11 +67197,11 @@ "repo": "tbanel/orgaggregate", "unstable": { "version": [ - 20180731, - 2154 + 20190812, + 604 ], - "commit": "7e87e0fb0784be9370462614ec0ffc9d9ae6ef1c", - "sha256": "1yhs2v4s690cj1xgvbjx04d42fndd8lp6kry4w9vk24ibx9fzgcn" + "commit": "1a13f7f70357f369e16bfa3038a9fb760cbffb46", + "sha256": "11qygmgvjqc53gy5f3pz0hh5zsam1li8vbyr42wflfkv6cwxypdb" } }, { @@ -67527,10 +67661,10 @@ }, { "ename": "ov", - "commit": "18d8a10ba3018cb61924af3a1682b82f543f2d98", - "sha256": "0d71mpv74cfxcnwixbrl90nr22cw4kv5sdgpny5wycvh6cgmd6qb", + "commit": "7a4e84530b4607a277fc3b678fe7b34b1c5e3b4f", + "sha256": "0brwf4xng72ybdjz253r3bld5crbi76y341rnhz4l9jg26k2b3hx", "fetcher": "github", - "repo": "ShingoFukuyama/ov.el", + "repo": "emacsorphanage/ov", "unstable": { "version": [ 20150312, @@ -67614,14 +67748,14 @@ "repo": "anticomputer/ovpn-mode", "unstable": { "version": [ - 20190615, - 48 + 20190811, + 2200 ], "deps": [ "cl-lib" ], - "commit": "c424e269bd1132182bc26d371ed0dcf818b41262", - "sha256": "0gxk20cwdyhllzkdfz3cylb8mddyrhrdpscx2ydi5phvgjknf939" + "commit": "dce04d9f35fd203afd098ba413595db6c2cbc051", + "sha256": "0ix53rlwzi1mh35msh6gahfnip67p53jc3qxkbaxji7hlxi130fb" } }, { @@ -67817,14 +67951,14 @@ "repo": "kaushalmodi/ox-hugo", "unstable": { "version": [ - 20190729, - 2221 + 20190802, + 1755 ], "deps": [ "org" ], - "commit": "301e072ddd93f09c3310f6da97e8e2e7f7145d8e", - "sha256": "1isk5yjrassllh16nr2f8nyn2x4craw3fv4hjqpaa6z6dycs71wc" + "commit": "470a708152c4a17eca80c49e042d4eeb57645539", + "sha256": "0dv068ghbci85y88zcqp6w4qkc8xpgwayh1van05r1k6krms8jms" }, "stable": { "version": [ @@ -67924,6 +68058,38 @@ } }, { + "ename": "ox-json", + "commit": "c648b95620bc7194e18f37fc7bb526e5578d883a", + "sha256": "0v0hn0fd6jx2009na1y18bnah7qvmng9riidng0kglkx208a04ay", + "fetcher": "github", + "repo": "jlumpe/ox-json", + "unstable": { + "version": [ + 20190802, + 350 + ], + "deps": [ + "org", + "s" + ], + "commit": "ce99a8a7cb2e2a483d23ebc2f821f3a183cf4b50", + "sha256": "0lgcrd4ckjfph4h0ias6cr83bnj903xiyak6pcvskp3wfgwg09wa" + }, + "stable": { + "version": [ + 0, + 2, + 0 + ], + "deps": [ + "org", + "s" + ], + "commit": "aba3face2786d53380ee29459c04d16c999e72ac", + "sha256": "1y1l7in0fxlyrbd6fz4ixydc6kihfx42n7yh5glpjxahhbzqg9b3" + } + }, + { "ename": "ox-latex-subfigure", "commit": "cf83b7597bd6a23b82b88b0927424c9aeb49a03d", "sha256": "19nglrlg4q350vgi13x6yg97nrgav5d51z7jrqg8vim7mbafq7fg", @@ -68096,14 +68262,14 @@ "repo": "yjwen/org-reveal", "unstable": { "version": [ - 20190728, - 1601 + 20190810, + 1655 ], "deps": [ "org" ], - "commit": "dfcf21fe4526728a3971ee27966079837db77c8d", - "sha256": "1kz3d3n94dmy2micxmwsahnsky5kbb8aicxzq05s8c181207va7n" + "commit": "4abd898da3b24530a80336327ec29d3ae6ad4ec9", + "sha256": "0ik5r99hv407yalvdwba62rppaf9g0r9qzyp4iz0i3n1mhcnv0h1" } }, { @@ -68132,14 +68298,14 @@ "repo": "msnoigrs/ox-rst", "unstable": { "version": [ - 20180315, - 13 + 20190813, + 427 ], "deps": [ "org" ], - "commit": "a74b60883b0d844c80efb364dac1560b85f2548f", - "sha256": "0smgz2q7bjj2svx1gdr187m58yxq1hs878bciz9h6jcp03a9sb61" + "commit": "25ea7a8a7ff1f57a9cd4f65b53899da3487bad8a", + "sha256": "0b7ybvpj1m48s2zdqk3xjyyzqxa9hjcaz29pgbsd9zg8q9mrnmas" } }, { @@ -68480,14 +68646,14 @@ "repo": "melpa/package-build", "unstable": { "version": [ - 20190727, - 1248 + 20190805, + 1628 ], "deps": [ "cl-lib" ], - "commit": "1db490a6a6a95087a56ec4c26bc482343e8e937c", - "sha256": "0kqi6h71nhj0aczzgsvsprakmhnc5y19051y866fgcsffw5gyc7s" + "commit": "64a6ac2343c791092ec2e43bab0c91293509c230", + "sha256": "0ac6kq9k6n3mznl0x5sgpalfa3v4cx9m0b7jc3s89dnyw6m4wp6h" }, "stable": { "version": [ @@ -68524,14 +68690,14 @@ "repo": "purcell/package-lint", "unstable": { "version": [ - 20190707, - 1456 + 20190807, + 1837 ], "deps": [ "cl-lib" ], - "commit": "4a3ea9abda3ddfbd535a8eee7dbb776f9ccb5c27", - "sha256": "024ic4qcp2nfl8z8ff3742zk2rc7zjl3nrfg1r2mbakf0aa00dvm" + "commit": "c5ba20dead0df743a699f502f5d034d03b367f65", + "sha256": "0pshjm6swgm6pfpx8ri8zfixazc7bjhdvy7md905lf8a8byr7zk2" }, "stable": { "version": [ @@ -68559,8 +68725,8 @@ "deps": [ "package-lint" ], - "commit": "4a3ea9abda3ddfbd535a8eee7dbb776f9ccb5c27", - "sha256": "024ic4qcp2nfl8z8ff3742zk2rc7zjl3nrfg1r2mbakf0aa00dvm" + "commit": "c5ba20dead0df743a699f502f5d034d03b367f65", + "sha256": "0pshjm6swgm6pfpx8ri8zfixazc7bjhdvy7md905lf8a8byr7zk2" }, "stable": { "version": [ @@ -69507,16 +69673,16 @@ "repo": "zx2c4/password-store", "unstable": { "version": [ - 20190611, - 418 + 20190804, + 2004 ], "deps": [ "f", "s", "with-editor" ], - "commit": "c22cdbd4674a25dec71fe42ec1ef0b4829b6c7f3", - "sha256": "0czs41vz0ggl46qp87x3dwi6b84znyl0n1wczbin33x37ds5hbh5" + "commit": "e93e03705fb5b81f3af85f04c07ad0ee2190b6aa", + "sha256": "0sxwz6awr60xh27q3ng90mmgjs9dpcjkags9dyvr3kc45dmdb931" }, "stable": { "version": [ @@ -70925,14 +71091,14 @@ "repo": "emacs-php/php-mode", "unstable": { "version": [ - 20190801, - 1149 + 20190812, + 1711 ], "deps": [ "cl-lib" ], - "commit": "3801694b299e99e753173d0dfabed8d9485a9a29", - "sha256": "1vlvz6lais1aryb17s6m3qj9algm672kr2si86qmbs3szbzc9qqv" + "commit": "6969d273992fd49c730fcc3170f17771a272b67c", + "sha256": "0p1bqabzlxp56vgvz42salqfjv7h3ffmnjv76wbzpx1jx5hx8yqd" }, "stable": { "version": [ @@ -71023,8 +71189,8 @@ "repo": "emacs-php/phpactor.el", "unstable": { "version": [ - 20190724, - 102 + 20190812, + 1454 ], "deps": [ "cl-lib", @@ -71032,8 +71198,8 @@ "f", "php-runtime" ], - "commit": "fcdbae4b12735d6d1595f76275e5a6a589a20c7a", - "sha256": "1kx9pk6a4kc3x58qfv35fvh9hkp2xgw2yxj98n065xr82yzzd6m1" + "commit": "01ced487c673e027332ecb99c444f819b05ab40b", + "sha256": "0ish3kvzn1j1arg6n1mglzsb46sc7hr7gqgnw2084kj56y5q6rjp" }, "stable": { "version": [ @@ -71212,11 +71378,11 @@ "repo": "flexibeast/picolisp-mode", "unstable": { "version": [ - 20190801, - 1116 + 20190811, + 1431 ], - "commit": "c1f25707cb56b50c678b367bc9f452303fb4e68f", - "sha256": "060ldl4kx787bas8f0l28j744f60is4faqlxmyxjd67jiaw4phrh" + "commit": "bf358e5e75adb7cfa1b7cde24209428a88d86b56", + "sha256": "15zb3g6b3n9242p10frzcyxa9gasnbmdjplsvjibzhxrrnhapans" } }, { @@ -71659,9 +71825,9 @@ }, { "ename": "plain-theme", - "commit": "b147fb05a1b4296e1b85d31ba018d132a5bb5ed2", - "sha256": "10qq7cy6hqh6c8qi796y9lk4wyyjbhdn1pvkcw3g29cfh857x50m", - "fetcher": "gitlab", + "commit": "d4bd77883375b229e344384e42c3603ca096891c", + "sha256": "0igncivhnzzirglmz451czx69cwshjkigqvqddj0a77b1cwszfw8", + "fetcher": "github", "repo": "yegortimoshenko/plain-theme", "unstable": { "version": [ @@ -71717,23 +71883,26 @@ "repo": "skuro/plantuml-mode", "unstable": { "version": [ - 20190531, - 853 + 20190812, + 1540 ], "deps": [ "dash" ], - "commit": "e9c8e76ff25013e05ab83de9462bbcdd74e27237", - "sha256": "0y7qfn283m40r3b8gbigwli9jha5afxizqhdil91pg5z9nfgq4r7" + "commit": "1e5f8beedd940458d043832c7d972dbfe492155e", + "sha256": "1pf9jpsbxqxd90y3md1h1fyd2v9swhf10kkknfln102k6chyy1jx" }, "stable": { "version": [ 1, - 2, - 10 + 3, + 1 ], - "commit": "92c490d3fc07b4cfa8c5263c15a4bbc16d10da9e", - "sha256": "1xmhgc49jyxj7wwlzhpjrdh4nynxjf3dlwg77hgzdracgldq8sra" + "deps": [ + "dash" + ], + "commit": "648feb5b12372bbf8ea37544c44ffcde0aceba69", + "sha256": "0xpnd9r2d2pb6dj3sj1b0bvhg6rm1m6y1ksvngc9yfpynrxgrxwv" } }, { @@ -73061,11 +73230,11 @@ "repo": "tumashu/posframe", "unstable": { "version": [ - 20190608, - 2318 + 20190805, + 956 ], - "commit": "fc90a1a558200e5c3688c65add9afdea695a2c10", - "sha256": "1fhjxj7gi2pj5rdnmf0gddiwd8iifgjgjp01c01npz1gwwixyqh3" + "commit": "bfd2e55219e0911980f4ea97b5995ce8553dce60", + "sha256": "19vvhx9x6646va4s4yy77inll9d2mhipakvz4pyz4pjw8pjcd94x" }, "stable": { "version": [ @@ -73523,6 +73692,36 @@ } }, { + "ename": "proced-narrow", + "commit": "7e1bb8de59729a6690f8423b5531380c8293bf0b", + "sha256": "1sqxp9jdhh8iy9pvgz0s9jm6p93ib12gn2gpkasxbx93b1jkdlbc", + "fetcher": "github", + "repo": "travisjeffery/proced-narrow", + "unstable": { + "version": [ + 20190810, + 420 + ], + "deps": [ + "seq" + ], + "commit": "df5cce50b3d1219b23d28e23cbf68e0c7807a15c", + "sha256": "00b2g7prijad6q2zw0vhwq1xb49kcc8ym116zfj5r8wxz9cmpzpr" + }, + "stable": { + "version": [ + 1, + 0, + 5 + ], + "deps": [ + "seq" + ], + "commit": "df5cce50b3d1219b23d28e23cbf68e0c7807a15c", + "sha256": "00b2g7prijad6q2zw0vhwq1xb49kcc8ym116zfj5r8wxz9cmpzpr" + } + }, + { "ename": "processing-mode", "commit": "ba59561e8a2f259fde170a79844af5e1ef5ed34f", "sha256": "184yg9z14ighz9djg53ji5dgnb98dnxkkwx55m8f0f879x31i89m", @@ -74042,15 +74241,15 @@ "repo": "anshulverma/projectile-speedbar", "unstable": { "version": [ - 20170517, - 243 + 20190807, + 2010 ], "deps": [ "projectile", "sr-speedbar" ], - "commit": "dcab13db72c2084edbebe808e35f1126fe0b3bcd", - "sha256": "106a4y5r1adjpbnjn734s7d910r6akhjlyjpd6bnczjhp357wyc7" + "commit": "93320e467ee78772065e599a5dba94889a77db22", + "sha256": "1byk8ylm6c922jsaa8lg8wk17qjnhh7p26lp2h0nbl7qdz928ss8" } }, { @@ -74322,11 +74521,11 @@ "repo": "ksjogo/proportional", "unstable": { "version": [ - 20171025, - 2337 + 20190806, + 1901 ], - "commit": "f671ffe8fd803e2fc462e2e1844aeeab1a13918e", - "sha256": "02sbrcb9c27djk64xv41vii6pbw83b6iljrd66w4ad9hgz2pkxzk" + "commit": "f600b7ed2ab19a3072adad3f47048a5bbdb82703", + "sha256": "03vyyi5n5rq2hcd5yz7yirsnrgs6cin2y8xhly5skqsv60zs15p1" } }, { @@ -74358,17 +74557,17 @@ 20170526, 1650 ], - "commit": "d1eeb852fcbe46b29a3bc47001e997d79358d9f8", - "sha256": "11k3vbn0nh7c3kqravcd0kv872kplbdbm4ah323gpizgibkp9f41" + "commit": "c132a4aa165d8ce2b65af62d4bde4a7ce08d07c3", + "sha256": "06cqi10q6w07pshmfkzd40k40rm5slgsrbb6n0jdskhbw97wqk6h" }, "stable": { "version": [ 3, 9, - 0 + 1 ], - "commit": "6a59a2ad1f61d9696092f79b6d74368b4d7970a3", - "sha256": "1xq2njqrbmizwg91ggi1lqr0n26cm2jdyk668ljc24ihrpk0z9bw" + "commit": "655310ca192a6e3a050e0ca0b7084a2968072260", + "sha256": "0vv85xb65dx6fa76fsnyps13kaamvwfzd8hr6ii1payr73x4zy2h" } }, { @@ -74482,15 +74681,15 @@ "repo": "thierryvolpiatto/psession", "unstable": { "version": [ - 20190502, - 1838 + 20190808, + 1626 ], "deps": [ "async", "cl-lib" ], - "commit": "2557ca67a7a81f5270fb98a0b0a92838d09343b8", - "sha256": "0wspxsis3p2zm1f0wfxmi4dpyswcip6jzx2jcan7j2mqiwld6l33" + "commit": "3e97267c92b164584e06a6c70ee7491714c7c12c", + "sha256": "15frl618393bc891d0yi3mdxzvbq790a86vfvp3dyd5riz4ddg95" }, "stable": { "version": [ @@ -75180,16 +75379,16 @@ "repo": "tumashu/pyim", "unstable": { "version": [ - 20190731, - 452 + 20190812, + 222 ], "deps": [ "async", "popup", "pyim-basedict" ], - "commit": "c9941c91bb3aace2f151d120e55398061f12b8bb", - "sha256": "17ckfx4p1pm6axzaf9a0csplmpiicb7fbgb4c1kycjhvw20adkj7" + "commit": "d096fc941f3844825415e2d3a3a627babe003428", + "sha256": "10i54v0v8x8ljh5h06cw3zljfi1g8bdkiprainn59ik8mc8rhhlw" }, "stable": { "version": [ @@ -75334,8 +75533,8 @@ 20170402, 1255 ], - "commit": "41c95225fe398dd3f62f48d777080dc8827b145c", - "sha256": "17zlid67j7hgk1wbqxva19rj11kix84rxpc6ms208hc24ca0ws0c" + "commit": "a6b1e810df608430b04b65ad1ddc9ba1b8a22c89", + "sha256": "06cv6mah6wjbbwi196vn3fncf4drrhhr3gn1jndf2s14j98zpkh4" } }, { @@ -76131,14 +76330,14 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20190725, - 1732 + 20190803, + 1820 ], "deps": [ "faceup" ], - "commit": "ebf3009415d1ff19d51eee5ba4e78f1d5e63dea2", - "sha256": "1g8kjxpp049mn4wryv77v3rfa46b4k3bwm1jrk9kvjx333y1r0pc" + "commit": "5300aa004f08535c3fac99f1af78462f129aca81", + "sha256": "1gkpm4fl1ybsm9qqgrkwyjbd9znddy438x266k27fs90lkxrfray" } }, { @@ -76693,10 +76892,10 @@ }, { "ename": "readability", - "commit": "eed9bcb1aa238746c9a9f6ecba9dd61b83d8b612", - "sha256": "0kg91ma9k3p5ps467jjz2lw13rv1l8ivwc3zpg6c1rl474ds0qqv", + "commit": "7a4e84530b4607a277fc3b678fe7b34b1c5e3b4f", + "sha256": "06kykmf1yrk4jiazahk7qqf1ds34ppg9zbj9my5l52j3gjr7v9zq", "fetcher": "github", - "repo": "ShingoFukuyama/emacs-readability", + "repo": "emacsorphanage/readability", "unstable": { "version": [ 20140716, @@ -77387,8 +77586,8 @@ 20181121, 21 ], - "commit": "692892d634056c926525c4c97efc041c19e05810", - "sha256": "148vhl7hfc3yjzdnask1cvsqmw0lpaz776zx3v9alzv47xhfzf4n" + "commit": "5069c89fb0cd8fc1936ac8aa1e5dd6f4c1691db4", + "sha256": "00l3zraignzlz5vmn7cqjizin8h0gbgvpyd3jbl5vza4r9bp1l2j" } }, { @@ -77526,11 +77725,11 @@ "repo": "alvarogonzalezsotillo/region-occurrences-highlighter", "unstable": { "version": [ - 20190617, - 901 + 20190804, + 1931 ], - "commit": "b3e2eb48e342791aca6c9586ad2fe44540df0463", - "sha256": "0j73vlj1576jjhjac79b3p9cdwg75gj142is3ak28vs04frzi1x8" + "commit": "3e08d7bc123d6fbb84f7f8a5a6fc28aae4ec8c19", + "sha256": "0cwi5b89l7f21xq5cfms96vshz7swz0m2kjd5f71206f38rlcir3" } }, { @@ -78592,20 +78791,20 @@ "repo": "emacs-php/robots-txt-mode", "unstable": { "version": [ - 20180919, - 1541 + 20190812, + 1858 ], - "commit": "f8fc7ee50a3d5d7a2838772ed298fb69b9051c5c", - "sha256": "11qyzsfp2kmi6sd24m30y537mic9xg7y29npninrjihr6k9rw3a2" + "commit": "8bf67285a25a6756607354d184e36583f2847e7d", + "sha256": "07255pn80w4742sz2h9vbmfxxd8ps2kcn73p7m2bgy02kgbzw42b" }, "stable": { "version": [ 0, 0, - 3 + 9 ], - "commit": "431efda01e08426d671d51fcf1f98cfbc87f8c16", - "sha256": "1mpg62ai721aasd1lm5xwcygpkyh9kp4x5zvmd62agmp3i8s78gc" + "commit": "8bf67285a25a6756607354d184e36583f2847e7d", + "sha256": "07255pn80w4742sz2h9vbmfxxd8ps2kcn73p7m2bgy02kgbzw42b" } }, { @@ -79781,8 +79980,8 @@ 20190413, 1246 ], - "commit": "e34d129d5eb3e3e3eec76c78644d7f5e4f880700", - "sha256": "1xpicrjap52ysps5qw4m46kvfwqxn5yizgg7wxhd94j1ldwy5afp" + "commit": "fc91c81ffafe07691cec7466399b18f267964328", + "sha256": "0i7jrxdfxin6aaz1v578vy50j0g5l3j9yj2pgn5dw5v04xk42822" } }, { @@ -79877,25 +80076,6 @@ } }, { - "ename": "scheme-here", - "commit": "6440f81aed1fcddcaf7afeedb74520e605211986", - "sha256": "17r77b99nh03v79r97fzr3pyvigp4w8gr41k6zzj82xka2swhr2h", - "fetcher": "github", - "repo": "kaihaosw/scheme-here", - "unstable": { - "version": [ - 20141028, - 718 - ], - "commit": "430ba017cc530865218de23a8f7985095a58343f", - "error": [ - "exited abnormally with code 1\n", - "", - "warning: unknown setting 'system-features'\nerror: unable to download 'https://github.com/kaihaosw/scheme-here/archive/430ba017cc530865218de23a8f7985095a58343f.tar.gz': HTTP error 404 (curl error: No error)\n" - ] - } - }, - { "ename": "schrute", "commit": "505fc4d26049d4e2973a54b24117ccaf4f2fb7e7", "sha256": "1sr49wr3738sqfzix7v9rj6bvv7q2a46qdkimn9z7rnsjys9i7zy", @@ -79920,6 +80100,21 @@ } }, { + "ename": "scihub", + "commit": "93a89f2c198c29fa1b62839f51610eb881d1d0ed", + "sha256": "12m2yiwr1hkzwjykm400x549yzkrkqmypfip5xsarawnb87g9czy", + "fetcher": "github", + "repo": "emacs-pe/scihub.el", + "unstable": { + "version": [ + 20190801, + 920 + ], + "commit": "a32e8f47961d606c1315a972f2dab4d3a61945af", + "sha256": "06qcs7jq68ylmvw0kf1myhpgzci7i9qbb2h0hxh0g21mz8ssna3f" + } + }, + { "ename": "scion", "commit": "faf180d15c3847fc6f832866338494dd99b6654d", "sha256": "17qmc7fpvbamqkzyk8jspp2i0nw93iya4iwddvas7vdpjy7mk81d", @@ -79973,24 +80168,6 @@ } }, { - "ename": "scp", - "commit": "62f5c9284de51373a4015cf053d66977cf00d175", - "sha256": "1q7v2cr89syw682zqxhavaggv6aqi69rl94vm8bmn745a868gliw", - "fetcher": "github", - "repo": "tszg/emacs-scp", - "unstable": { - "version": [ - 20171204, - 251 - ], - "deps": [ - "cl-lib" - ], - "commit": "447305db246d9c9240678dd9c734ed920300463a", - "sha256": "0f8dv17rjknlkw32dd4xmdxbkwby5dn8mychaqwlk8vanhm74n7w" - } - }, - { "ename": "scpaste", "commit": "9007fb32097bc63731c3615dae9342fcef2558a2", "sha256": "02dqmx6v3jxdn5yz1z74624sc6sz2bm4qjyi78w9akhp2jplwlk1", @@ -81325,11 +81502,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20190731, - 733 + 20190808, + 238 ], - "commit": "216aed66e2d5517365da9c16b2d1d2aa9876c871", - "sha256": "0bkdv31di311nrlk0lqrz055n8mnwnrbjs79bq7p9qd37k5nbjs0" + "commit": "8fd65dd9c7d2393ab66c65ee1de67a84dcc779ce", + "sha256": "1yqbw8ikfrwya59xa0a17f2wwgswkdqcxj9y64fb00syps09fv0m" } }, { @@ -81491,16 +81668,16 @@ "repo": "bennya/shrink-path.el", "unstable": { "version": [ - 20170813, - 247 + 20190208, + 1335 ], "deps": [ "dash", "f", "s" ], - "commit": "9d06c453d1537df46a4b703a29213cc7f7857aa0", - "sha256": "021bpgpzysag1s11m9pyq2bk6a0mf9ayx10yxhf5cw56x3d0jj1b" + "commit": "c14882c8599aec79a6e8ef2d06454254bb3e1e41", + "sha256": "1xnby24gpxij1z03wvx89s459jw0f8bwhgi80xvdq8gxhbbz2w7a" }, "stable": { "version": [ @@ -82197,8 +82374,8 @@ "repo": "yuya373/emacs-slack", "unstable": { "version": [ - 20190710, - 749 + 20190803, + 1406 ], "deps": [ "alert", @@ -82208,8 +82385,8 @@ "request", "websocket" ], - "commit": "df605f45f15f9e78c5e622827a5e31475859983b", - "sha256": "0gpisd3mkdwbj0xg8f3r99v4z51z20nglfkfh80g6p0wf934l69r" + "commit": "ea89ac4291532a136d02bb8852b5dc641622ab73", + "sha256": "0gnmhlv3gzv5n8ydbg84n9m6i9d0akcvn032ipsyss6bqw1vzl1m" } }, { @@ -82518,14 +82695,14 @@ "repo": "mmgeorge/sly-asdf", "unstable": { "version": [ - 20190619, - 806 + 20190807, + 553 ], "deps": [ "sly" ], - "commit": "7fe3fedc110c2622ffc8d6517a38b03fb774a997", - "sha256": "1vyvvqcxccwg2ar9jl41zwg12a7iz42mv8bycy07nawwcbyq2l7q" + "commit": "c387ba34a75b172e8a75747220c416462ae9de31", + "sha256": "1cr6p11vsplb6afh2avwb585q606npp692gb5vqs377nni5vx7km" } }, { @@ -83595,15 +83772,15 @@ "repo": "bbatsov/solarized-emacs", "unstable": { "version": [ - 20190716, - 634 + 20190809, + 1202 ], "deps": [ "cl-lib", "dash" ], - "commit": "6d11d3e45e2def5ce5efb45541f9096b9e264f9a", - "sha256": "0gv202102p998mp1yj9dlhqvv5zqhnl51gfagy2wdmyslbkj1bfi" + "commit": "55cd77b61b6968048c61e13358ba487d217f24c0", + "sha256": "15ql8xcixgm7mbs7rsbybwszanqibq057j5b5ds89a31dw7zxf1g" }, "stable": { "version": [ @@ -84915,8 +85092,8 @@ 20190610, 1256 ], - "commit": "e2db9c7dee6fd755d4667a74461639d7257f2948", - "sha256": "0fjl0rba79nzir2h9ifclwhbnpsl6dkw3xhcs0ff50xpjnq5n95p" + "commit": "e1507feccf581160daece98b436dfac63020bb68", + "sha256": "1bbs2k65fggab61pgl8p5jgg8jxsggqkfcs55k6kg4s78gj2rqma" }, "stable": { "version": [ @@ -84973,11 +85150,11 @@ "repo": "stan-dev/stan-mode", "unstable": { "version": [ - 20180110, - 2241 + 20190805, + 1427 ], - "commit": "a8e88473ef996b455523dc3fbcf2d8520659652f", - "sha256": "13qw6n26jpr208h2366pcfv10d11880wlfzr0kiadrsg219wjgsi" + "commit": "e60fe0caecb8e84d0b8fc160a0cdf8343e33d905", + "sha256": "16wl8r1409v3cjfb91fkv42gf9cbzgcd1cvqpypj3jm3hdmlz9gz" }, "stable": { "version": [ @@ -84997,15 +85174,15 @@ "repo": "stan-dev/stan-mode", "unstable": { "version": [ - 20161024, - 258 + 20190805, + 1427 ], "deps": [ "stan-mode", "yasnippet" ], - "commit": "a8e88473ef996b455523dc3fbcf2d8520659652f", - "sha256": "13qw6n26jpr208h2366pcfv10d11880wlfzr0kiadrsg219wjgsi" + "commit": "e60fe0caecb8e84d0b8fc160a0cdf8343e33d905", + "sha256": "16wl8r1409v3cjfb91fkv42gf9cbzgcd1cvqpypj3jm3hdmlz9gz" }, "stable": { "version": [ @@ -85789,11 +85966,11 @@ "repo": "bbatsov/super-save", "unstable": { "version": [ - 20180929, - 727 + 20190806, + 915 ], - "commit": "2a905b8bdfc93bee16e2d62a61c6211bbe009331", - "sha256": "066fyg4r4pksyandpd7s53hagpvm2rw90q5ks4jlpgy7x00hw09l" + "commit": "279aa8e0103d6bd367619b7f57f9d60d7a3c5cfd", + "sha256": "14x3w6czyrw48bw7cfkdyv51jksf67nznv9wyp0hb4hrjdxaq1aq" }, "stable": { "version": [ @@ -86093,8 +86270,8 @@ "deps": [ "ivy" ], - "commit": "4389a261b30c8fbfc6e31228b33b1764221daac7", - "sha256": "153a9nn0m6q5a4psw2vvnmqixkny56dlbrfvvw45zc9ikdd1wv2b" + "commit": "20d604c139b82d98010aabbbc00ad487438bdf8e", + "sha256": "0clg04az8v5ia3z5fxcimprqp4kbf2g1z6na3js60gmi689ks8ll" }, "stable": { "version": [ @@ -86191,10 +86368,10 @@ }, { "ename": "swoop", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "0zcxasc0bpldvlp6032f9v1s4vm9r76pzd7sjgwa9dxbajw5h7fs", + "commit": "7a4e84530b4607a277fc3b678fe7b34b1c5e3b4f", + "sha256": "1hbldd9cqh3vfa3h7idf0rjjnib7ih44l1p4hzc8p36q5fqbh0xp", "fetcher": "github", - "repo": "ShingoFukuyama/emacs-swoop", + "repo": "emacsorphanage/swoop", "unstable": { "version": [ 20160120, @@ -86325,8 +86502,8 @@ "repo": "countvajhula/symex.el", "unstable": { "version": [ - 20190729, - 2303 + 20190809, + 443 ], "deps": [ "cider", @@ -86343,14 +86520,14 @@ "slime", "smartparens" ], - "commit": "1fd0b833948e21de40732f7f11536c34518e0411", - "sha256": "0nw5d7dzkxfs4512k9hzangfayl7qgjhy2v8afgnixbvl2akxgbs" + "commit": "163d54eb483a9986587c586cabfcaa15210a2b5d", + "sha256": "1y8va209v32f6rd7f420aqyh8fs9srxyc9hinb9q6i1bs92vkry9" }, "stable": { "version": [ 0, - 1, - 2 + 3, + 0 ], "deps": [ "cider", @@ -86367,8 +86544,8 @@ "slime", "smartparens" ], - "commit": "b139ace5e95a976b55791291170b61c887a92c03", - "sha256": "08nf3p2q4xk1vpgw76a4z8agf7d66vxmhfv7234cyk4vly8n5z20" + "commit": "88d09bdae222ae4ad0e40fbb1a724d63d06af214", + "sha256": "0nd96apnmdi4iv4pcai1bp9s5zrq5nsqqq1k5kdjbpiybhjdzk98" } }, { @@ -86962,11 +87139,11 @@ "repo": "saf-dmitry/taskpaper-mode", "unstable": { "version": [ - 20190516, - 1512 + 20190805, + 1153 ], - "commit": "7004ef65eea954742054f0f68109004828fd6fd8", - "sha256": "003bv5932902bpmgv79m2hamwla1sw95ymap10xpxmv42ldyka52" + "commit": "3f5b0981a87f1c4895961f36e0a67b69ccbbb18d", + "sha256": "194m2rm1yv7jp6nb7mm3m4hyhj81i379ky7ifaisrvc1jm3dwp6n" }, "stable": { "version": [ @@ -87059,8 +87236,8 @@ 20181109, 428 ], - "commit": "5496f8dee27c4d925977da3cca6fcacf9b45bc58", - "sha256": "1clf56sxvrky05qzk5kri01r0jz4zfwysxzs3iix0aljrz8mdi8w" + "commit": "cb3403fb134dc62d8a48253027891785849cff31", + "sha256": "14q01mar66x3bv0ghfws0pv3qrpg9szgzb99ql3qfhbnkw0m859d" } }, { @@ -87143,14 +87320,14 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20190730, - 1750 + 20190812, + 2131 ], "deps": [ "visual-fill-column" ], - "commit": "501d11e8ae7e5499c6234787affeb67e9dddbbf9", - "sha256": "0cf1amcw57a6hwaif11h299jiyjdyfpsdx4qy6w1g1n5hhy8bfbv" + "commit": "5444e2a02374c245769417148ccf2dad0a0c633a", + "sha256": "0byddvnkyabcxy64f2w64sqcki4zfxjwkvzvkrcan46san6hsn87" }, "stable": { "version": [ @@ -88138,8 +88315,8 @@ 20180905, 1050 ], - "commit": "fabeafc20c1fed96030123362e2e09eb542bb682", - "sha256": "06virfzf71wj8ayd4kkcgy5rwf1ilq59kpgph1q2j8s33p1vhzvq" + "commit": "01ea3cb8cee36e31a0ab8015426b57eb4ce29cdc", + "sha256": "0mfgr1303lpfa0nzh4lbxpiiijwv41bh3r631hjj9cpz8jkwicc7" }, "stable": { "version": [ @@ -88685,8 +88862,8 @@ "deps": [ "cl-lib" ], - "commit": "d52853e93b40fc54ffd4552df9b8c07ad5446013", - "sha256": "0jdy1lqg3s01dxlpigqm0ss4kid2kzrhhyqm15rlj9s0ghdrbnby" + "commit": "ef0c6b84d92eecd05aa5cd4a35b73652f21b311a", + "sha256": "0wh0fwl2mimb48g2sf2nhmr3xxwvgkgr3566187x3kw8zxgh1nv7" } }, { @@ -89071,14 +89248,14 @@ "repo": "magit/transient", "unstable": { "version": [ - 20190630, - 1359 + 20190812, + 1336 ], "deps": [ "dash" ], - "commit": "01a166fcb8bbd9918ba741e9b5428a4b524eab33", - "sha256": "0wnp1wq9k67dghdlkpa2l302p7vdz2grw0nmw53c33f8mczxgf7b" + "commit": "9fb3f797f10fd069c2bffa7a3ead746aa53d1a25", + "sha256": "1xyj9ncqz0mrdgn6wg252p8kv2k9h391ni0bvkw8dqwz7xwgfl3g" }, "stable": { "version": [ @@ -89213,8 +89390,8 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20190801, - 1501 + 20190812, + 546 ], "deps": [ "ace-window", @@ -89226,8 +89403,8 @@ "pfuture", "s" ], - "commit": "b8692a6a72a41d93b637ba58354ac195aca2cb08", - "sha256": "1qwfvxjz9cvnmbz7v9kljlwh5yyi30m8i6g2lwp72i1ngs0srfvg" + "commit": "d06e2d3f3b3ce77639c0a085d1f3b0e620b1a936", + "sha256": "1wlssi1ndi8mi01k2ndz9v77r6wdxjblazaz108jcnpkyiinhyyk" }, "stable": { "version": [ @@ -89263,8 +89440,8 @@ "evil", "treemacs" ], - "commit": "b8692a6a72a41d93b637ba58354ac195aca2cb08", - "sha256": "1qwfvxjz9cvnmbz7v9kljlwh5yyi30m8i6g2lwp72i1ngs0srfvg" + "commit": "d06e2d3f3b3ce77639c0a085d1f3b0e620b1a936", + "sha256": "1wlssi1ndi8mi01k2ndz9v77r6wdxjblazaz108jcnpkyiinhyyk" }, "stable": { "version": [ @@ -89294,8 +89471,8 @@ "cl-lib", "treemacs" ], - "commit": "b8692a6a72a41d93b637ba58354ac195aca2cb08", - "sha256": "1qwfvxjz9cvnmbz7v9kljlwh5yyi30m8i6g2lwp72i1ngs0srfvg" + "commit": "d06e2d3f3b3ce77639c0a085d1f3b0e620b1a936", + "sha256": "1wlssi1ndi8mi01k2ndz9v77r6wdxjblazaz108jcnpkyiinhyyk" }, "stable": { "version": [ @@ -89326,8 +89503,8 @@ "pfuture", "treemacs" ], - "commit": "b8692a6a72a41d93b637ba58354ac195aca2cb08", - "sha256": "1qwfvxjz9cvnmbz7v9kljlwh5yyi30m8i6g2lwp72i1ngs0srfvg" + "commit": "d06e2d3f3b3ce77639c0a085d1f3b0e620b1a936", + "sha256": "1wlssi1ndi8mi01k2ndz9v77r6wdxjblazaz108jcnpkyiinhyyk" }, "stable": { "version": [ @@ -89358,8 +89535,8 @@ "projectile", "treemacs" ], - "commit": "b8692a6a72a41d93b637ba58354ac195aca2cb08", - "sha256": "1qwfvxjz9cvnmbz7v9kljlwh5yyi30m8i6g2lwp72i1ngs0srfvg" + "commit": "d06e2d3f3b3ce77639c0a085d1f3b0e620b1a936", + "sha256": "1wlssi1ndi8mi01k2ndz9v77r6wdxjblazaz108jcnpkyiinhyyk" }, "stable": { "version": [ @@ -89521,6 +89698,37 @@ } }, { + "ename": "ts", + "commit": "d8b0b0b20e2812a0ced3d38c07b466b3d200699d", + "sha256": "1pk2x9hjr57ph51w91zss46q8xrca34mgr6n5pbii5w8j1rgyd60", + "fetcher": "github", + "repo": "alphapapa/ts.el", + "unstable": { + "version": [ + 20190812, + 1655 + ], + "deps": [ + "dash", + "s" + ], + "commit": "31bd5a86aa35f7b8143170892ffaf6425284f3fd", + "sha256": "004z24vxk7xrc9in7q8rpaif79sw219zh86hj2fyczv2jixl6i9r" + }, + "stable": { + "version": [ + 0, + 1 + ], + "deps": [ + "dash", + "s" + ], + "commit": "abf67b63ca562cb2304dfe445f67ed6c6f7c3c05", + "sha256": "1i93dfm6lw63q1r2fnk5yn95pifvpkfy654yg8mfczss1mz00q35" + } + }, + { "ename": "ts-comint", "commit": "4a1c08c22704ac689235b8d5cc36cc437ba7356a", "sha256": "0cmh8ww6myiaz42867d0dqfi64lxrbna1lcwl6x6rmdgf15k6c1m", @@ -89602,14 +89810,14 @@ "repo": "ocaml/tuareg", "unstable": { "version": [ - 20190709, - 2158 + 20190805, + 958 ], "deps": [ "caml" ], - "commit": "c83f22780310415d885470766d38b0f9d6f55767", - "sha256": "16nnadl7037hglrrr3prak0sx20f4611xcks0hd2hgg2c3my5ig8" + "commit": "74e7f66f31290f6599fda0067d795e201270be43", + "sha256": "1fgaa3kq3aj6ddkkbag8bcqq67y8xq51cmsp2cvmzsx5lfwv0y3p" }, "stable": { "version": [ @@ -90924,17 +91132,17 @@ 20190715, 1836 ], - "commit": "9da0951274af3fcadfd7b40fc582ab00539c5884", - "sha256": "18skj7zqg84wvhwd5fsl0bn7v8l0w4ashr8rx45rvddqmgf1h36g" + "commit": "2405c8dd8f1cb995baeffb90324dc9c0e1966edc", + "sha256": "1jm3sagissbw8012mnppknsxl9dqd9514b891b64disqhdb5awg3" }, "stable": { "version": [ 2, 4, - 0 + 1 ], - "commit": "1fa416862f4bf95ded4ce3bc01a5ebdb9842ce56", - "sha256": "0sklms0crkmknlgjw2lrqbyslvfjg5mrc8cnz2ar98css4509qph" + "commit": "2405c8dd8f1cb995baeffb90324dc9c0e1966edc", + "sha256": "1jm3sagissbw8012mnppknsxl9dqd9514b891b64disqhdb5awg3" } }, { @@ -91607,29 +91815,29 @@ "repo": "csantosb/vhdl-tools", "unstable": { "version": [ - 20190730, - 752 + 20190809, + 922 ], "deps": [ "ggtags", "helm-rg", "outshine" ], - "commit": "d0cdafadf2fdc5ae96e6d57628e98106a38afeb9", - "sha256": "1ljda898xg8dvmka9z8am3fwfwn8i87kzdd8j6g8kchisjx1abjn" + "commit": "5202db4c6a511a90a950a723293d11d55ec05264", + "sha256": "1ygx8g9cxyyhhpcqan1ca4g741s3dd141bcmp6jjqbjfn2gqraz6" }, "stable": { "version": [ 6, - 1 + 2 ], "deps": [ "ggtags", "helm-rg", "outshine" ], - "commit": "cf8de6a3160532e2ce0018ecd52f2aefd0199a65", - "sha256": "11hzd6hrxcm9ip2gz8jkay4g53l3yvgwkl212wrd6a8sad34rb1p" + "commit": "5202db4c6a511a90a950a723293d11d55ec05264", + "sha256": "1ygx8g9cxyyhhpcqan1ca4g741s3dd141bcmp6jjqbjfn2gqraz6" } }, { @@ -92064,11 +92272,11 @@ "repo": "akermu/emacs-libvterm", "unstable": { "version": [ - 20190731, - 1429 + 20190812, + 1520 ], - "commit": "ee07b5a1e798a8b45c242de2bcdabc009ff055be", - "sha256": "1xb37vl54imfnlncj2zvyy32dnwwrxkx726h1c49dnpik0hwf5lf" + "commit": "fad40c1436afcf73fe39ea2ec535628866c72b23", + "sha256": "0kbb2f7p8ivznyqxx1ji60iqks3sbp6fb6nzfw9q5phagryl5bys" } }, { @@ -92079,14 +92287,14 @@ "repo": "jixiuf/vterm-toggle", "unstable": { "version": [ - 20190731, - 1623 + 20190803, + 1103 ], "deps": [ "vterm" ], - "commit": "1850981b8c6303089ac60d9aa9a316cac65c40b6", - "sha256": "1c763jnxsf27s238ga35ksxw7yd8ria355g0xm9mn4l4hll0wcbs" + "commit": "96cac28e72dc5739958fa674acd51ceed8835556", + "sha256": "1scfbjr3vksn0d93gb3n0mi8gi49579szn24f78vkqwd99ivifwr" } }, { @@ -92192,11 +92400,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20190801, - 156 + 20190808, + 238 ], - "commit": "216aed66e2d5517365da9c16b2d1d2aa9876c871", - "sha256": "0bkdv31di311nrlk0lqrz055n8mnwnrbjs79bq7p9qd37k5nbjs0" + "commit": "8fd65dd9c7d2393ab66c65ee1de67a84dcc779ce", + "sha256": "1yqbw8ikfrwya59xa0a17f2wwgswkdqcxj9y64fb00syps09fv0m" } }, { @@ -92369,14 +92577,14 @@ "repo": "wanderlust/wanderlust", "unstable": { "version": [ - 20190725, - 823 + 20190812, + 818 ], "deps": [ "semi" ], - "commit": "3a64923f40e1b274f4bff39e28c1eb8173b47541", - "sha256": "17y09vz5d3d1fs58pbz96w4dp0n5xkbdzj55f1ng5wy5gkmjzpd7" + "commit": "ba07b99ee146c7945823874102e7db38e7aa8bd0", + "sha256": "14fp8s1baq3r6gxaf1c50zyk59bnzpnpbpxnp3lvcz1a1i5377ql" } }, { @@ -93072,11 +93280,11 @@ "repo": "justbur/emacs-which-key", "unstable": { "version": [ - 20190801, - 1932 + 20190802, + 240 ], - "commit": "a256c4bce66d3805af07cc9f3dec5baeae1808de", - "sha256": "0h63gxw80yghq4kpbqixwk48y57m92spll3w60r5r789wqws2wrf" + "commit": "42a25055163141165aa0269dbca69735e704825c", + "sha256": "0d27ka6pgkzv6bj31q4c5ksm30dspl9zy42ynnh4y2xb5wzp5ml2" }, "stable": { "version": [ @@ -93210,20 +93418,20 @@ "repo": "whizzml/whizzml-mode", "unstable": { "version": [ - 20190618, - 58 + 20190802, + 1637 ], - "commit": "ec4c8ba184a135bd3f5adf2cd98dbc4d324a0190", - "sha256": "0iv47m9gk2cb5k7mamkyakdn20jsspcbhmljsi3wijk3qzwwnd0k" + "commit": "fe8dd75941aac0749b97c9e4fd3709f828d784cd", + "sha256": "091gyi2qxx96hcq3r6rxkc9jdwmb5kbcsyp4cb6sm0rhiczvif79" }, "stable": { "version": [ 0, - 33, + 34, 0 ], - "commit": "ec4c8ba184a135bd3f5adf2cd98dbc4d324a0190", - "sha256": "0iv47m9gk2cb5k7mamkyakdn20jsspcbhmljsi3wijk3qzwwnd0k" + "commit": "fe8dd75941aac0749b97c9e4fd3709f828d784cd", + "sha256": "091gyi2qxx96hcq3r6rxkc9jdwmb5kbcsyp4cb6sm0rhiczvif79" } }, { @@ -93693,9 +93901,16 @@ "ename": "wisp-mode", "commit": "5b7972602399f9df9139cff177e38653bb0f43ed", "sha256": "10zkp1qbvl8dmxij7zz4p1fixs3891xr1nr57vyb3llar9fgzglc", - "error": "Not in archive", "fetcher": "bitbucket", - "repo": "ArneBab/wisp" + "repo": "ArneBab/wisp", + "unstable": { + "version": [ + 20190718, + 1218 + ], + "commit": "5e860c746ee02c764bf378aeb8f436a1a341bd5c", + "sha256": "12qcq5k7xdlqwnq01qdkjf1035idrdmjxb24ya1xsxdkd3jra9dw" + } }, { "ename": "wispjs-mode", @@ -93883,20 +94098,19 @@ "repo": "hsjunnesson/wolfram.el", "unstable": { "version": [ - 20170123, - 756 + 20190805, + 1007 ], - "commit": "6b5dceae3fd6cdb4d7562510deeafa02c93c010b", - "sha256": "1ijyjw2793i7n00i30ma8lw4fzi9w63m6k0xgjx6j78r5y7pfj2g" + "commit": "a172712d5045834f5434cca2843a7c3506805db8", + "sha256": "10z04y8p72rqs2b2bgf1xfq99iidgbwg3ipxwkhwcaq32027h36z" }, "stable": { "version": [ 1, - 1, - 1 + 2 ], - "commit": "6b5dceae3fd6cdb4d7562510deeafa02c93c010b", - "sha256": "1ijyjw2793i7n00i30ma8lw4fzi9w63m6k0xgjx6j78r5y7pfj2g" + "commit": "a172712d5045834f5434cca2843a7c3506805db8", + "sha256": "10z04y8p72rqs2b2bgf1xfq99iidgbwg3ipxwkhwcaq32027h36z" } }, { @@ -95820,11 +96034,11 @@ "repo": "bbatsov/zenburn-emacs", "unstable": { "version": [ - 20190715, - 915 + 20190809, + 1324 ], - "commit": "7e22834dea334abe30f170bef54bbeeca566355c", - "sha256": "0l5fil8950471ffgr0aq6zrj4kn23vw0j5if07am703l1qmd3yhz" + "commit": "4db36d32207613340dfc6a48fcf8e57a60d97ba3", + "sha256": "0xkchyg3qsv7nwbl8idypr0wc90c9qhw5s1pbg6xwcyvn9751sba" }, "stable": { "version": [ @@ -95977,14 +96191,14 @@ "repo": "dzop/emacs-zmq", "unstable": { "version": [ - 20190613, - 138 + 20190812, + 1910 ], "deps": [ "cl-lib" ], - "commit": "6120251d86bc85138305c1bf02b1000dc435fdb5", - "sha256": "0ngxm5mm0kqgvn8977ryrngamx0khzlw86d8vz5s0jhm2kgwnqp8" + "commit": "0544b70bf99b6eb95f46e0fcd788d98da50cb892", + "sha256": "0r9aq933b2pk9m70phfz3ah3dk1c5axmjixcf8cf19sjsv1hcc9x" }, "stable": { "version": [ diff --git a/pkgs/applications/editors/emacs-modes/redshank/default.nix b/pkgs/applications/editors/emacs-modes/redshank/default.nix deleted file mode 100644 index e03d2fdc90f..00000000000 --- a/pkgs/applications/editors/emacs-modes/redshank/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchgit }: - -stdenv.mkDerivation rec { - pname = "redshank"; - name = "${pname}-20120510"; - - src = fetchgit { - url = "http://www.foldr.org/~michaelw/projects/redshank.git"; - rev = "f98e68f532e622bcd464292ca4a9cf5fbea14ebb"; - sha256 = "1jdkgvd5xy9hl5q611jwah2n05abjp7qcy9sj4k1z11x0ii62b6p"; - }; - - installPhase = '' - mkdir -p $out/share/emacs/site-lisp - cp *.el *.elc $out/share/emacs/site-lisp/ - ''; - - meta = { - description = "Common Lisp Editing Extensions (for Emacs)"; - homepage = http://www.foldr.org/~michaelw/emacs/redshank/; - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/applications/editors/emacs-modes/stgit/default.nix b/pkgs/applications/editors/emacs-modes/stgit/default.nix deleted file mode 100644 index b615accd721..00000000000 --- a/pkgs/applications/editors/emacs-modes/stgit/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "stgit"; - name = "${pname}-2009-10-28"; - - dontUnpack = true; - - src = fetchurl { - url = "https://raw.githubusercontent.com/miracle2k/stgit/master/contrib/stgit.el"; - sha256 = "0pl8q480633vdkylr85s7cbd4653xpzwklnxrwm8xhsnvw9d501q"; - name = "stgit.el"; - }; - - installPhase = '' - mkdir -p $out/share/emacs/site-lisp - cp $src $out/share/emacs/site-lisp/stgit.el - ''; - - meta = { - description = "An emacs mode for Stgit"; - homepage = http://procode.org/stgit/; - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/applications/editors/emacs-modes/update-elpa b/pkgs/applications/editors/emacs-modes/update-elpa new file mode 100755 index 00000000000..ba2964b2ead --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/update-elpa @@ -0,0 +1,4 @@ +#! /usr/bin/env nix-shell +#! nix-shell --show-trace ./emacs2nix.nix -i bash + +exec elpa-packages.sh --names $EMACS2NIX/names.nix -o elpa-generated.nix diff --git a/pkgs/applications/editors/emacs-modes/update-melpa b/pkgs/applications/editors/emacs-modes/update-melpa index 2b2af5cb2bb..5c636416a5e 100755 --- a/pkgs/applications/editors/emacs-modes/update-melpa +++ b/pkgs/applications/editors/emacs-modes/update-melpa @@ -1,8 +1,6 @@ #! /usr/bin/env nix-shell -#! nix-shell --show-trace -i sh -p git nix nix-prefetch-git nix-prefetch-hg "import ./updater-emacs.nix" +#! nix-shell --show-trace ./updater-emacs.nix -i bash -# "with import ../../../.. {}; emacsWithPackages (epkgs: with epkgs.melpaPackages; [ promise semaphore ])" +SCRIPT_DIR="$( cd "$(dirname "$0")" ; pwd -P )" -exec emacs --fg-daemon=updater --quick -l update-melpa.el -f run-updater "$@" - -# exec emacs update-melpa.el "$@" +exec emacs --fg-daemon=updater --quick -l $SCRIPT_DIR/update-melpa.el -f run-updater "$@" diff --git a/pkgs/applications/editors/emacs-modes/update-org b/pkgs/applications/editors/emacs-modes/update-org new file mode 100755 index 00000000000..2119a167228 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/update-org @@ -0,0 +1,4 @@ +#! /usr/bin/env nix-shell +#! nix-shell --show-trace ./emacs2nix.nix -i bash + +exec org-packages.sh --names $EMACS2NIX/names.nix -o org-generated.nix diff --git a/pkgs/applications/editors/emacs-modes/updater-emacs.nix b/pkgs/applications/editors/emacs-modes/updater-emacs.nix index b64a410e7b4..c7e858078e6 100644 --- a/pkgs/applications/editors/emacs-modes/updater-emacs.nix +++ b/pkgs/applications/editors/emacs-modes/updater-emacs.nix @@ -1,29 +1,40 @@ -with import ../../../.. {}; -(emacsPackagesNgFor emacs26). -emacsWithPackages (epkgs: let - promise = epkgs.trivialBuild { - pname = "promise"; - version = "1"; - src = fetchFromGitHub { - owner = "bendlas"; - repo = "emacs-promise"; - rev = "4da97087c5babbd8429b5ce62a8323b9b03c6022"; - sha256 = "0yin7kj69g4zxs30pvk47cnfygxlaw7jc7chr3b36lz51yqczjsy"; - +let + pkgs = import ../../../.. {}; + + emacsEnv = (pkgs.emacsPackagesNgFor pkgs.emacs26).emacsWithPackages (epkgs: let + + promise = epkgs.trivialBuild { + pname = "promise"; + version = "1"; + src = pkgs.fetchFromGitHub { + owner = "bendlas"; + repo = "emacs-promise"; + rev = "4da97087c5babbd8429b5ce62a8323b9b03c6022"; + sha256 = "0yin7kj69g4zxs30pvk47cnfygxlaw7jc7chr3b36lz51yqczjsy"; + }; }; - }; - semaphore = epkgs.trivialBuild { - pname = "semaphore"; - version = "1"; - packageRequires = [ promise ]; - src = fetchFromGitHub { - owner = "webnf"; - repo = "semaphore.el"; - rev = "93802cb093073bc6a6ccd797328dafffcef248e0"; - sha256 = "09pfyp27m35sv340xarhld7xx2vv5fs5xj4418709iw6l6hpk853"; - + + semaphore = epkgs.trivialBuild { + pname = "semaphore"; + version = "1"; + packageRequires = [ promise ]; + src = pkgs.fetchFromGitHub { + owner = "webnf"; + repo = "semaphore.el"; + rev = "93802cb093073bc6a6ccd797328dafffcef248e0"; + sha256 = "09pfyp27m35sv340xarhld7xx2vv5fs5xj4418709iw6l6hpk853"; + }; }; - }; - in [ promise semaphore ] - # ++ (with epkgs.melpaPackages; [ smex rainbow-delimiters paredit ]) -) + + in [ promise semaphore ]); + +in pkgs.mkShell { + buildInputs = [ + pkgs.git + pkgs.nix + pkgs.bash + pkgs.nix-prefetch-git + pkgs.nix-prefetch-hg + emacsEnv + ]; +} diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index 748fbfc42d5..740d65838c3 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -42,11 +42,11 @@ let in stdenv.mkDerivation rec { pname = "gnome-builder"; - version = "3.32.3"; + version = "3.32.4"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1vlr69sgiv3kg2qa3n7aw3913bmvlcpyhy3w8lls13wjrgif4wny"; + sha256 = "0xip58m206p8wa28p0a3y4ykylzr5xzmirjl3dspg4j25r08i8qr"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix index 8dfcc485668..065657d16e2 100644 --- a/pkgs/applications/editors/kakoune/default.nix +++ b/pkgs/applications/editors/kakoune/default.nix @@ -4,12 +4,12 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "kakoune-unwrapped"; - version = "2019.01.20"; + version = "2019.07.01"; src = fetchFromGitHub { repo = "kakoune"; owner = "mawww"; rev = "v${version}"; - sha256 = "04ak1jm7b1i03sx10z3fxw08rn692y2fj482jn5kpzfzj91b2ila"; + sha256 = "0jdkldq5rygzc0wcxr1j4fmp2phciy8602ghhf6xq21a9bq2v639"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ncurses asciidoc docbook_xsl libxslt ]; @@ -25,6 +25,11 @@ stdenv.mkDerivation rec { export version="v${version}" ''; + doInstallCheckPhase = true; + installCheckPhase = '' + $out/bin/kak -ui json -E "kill 0" + ''; + meta = { homepage = http://kakoune.org/; description = "A vim inspired text editor"; diff --git a/pkgs/applications/editors/kdevelop5/kdev-php.nix b/pkgs/applications/editors/kdevelop5/kdev-php.nix index e6f95f74011..30e46448c5b 100644 --- a/pkgs/applications/editors/kdevelop5/kdev-php.nix +++ b/pkgs/applications/editors/kdevelop5/kdev-php.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "kdev-php"; - version = "5.3.3"; + version = "5.4.0"; src = fetchurl { url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz"; - sha256 = "0nn3yfbi60h7p7p1w2pvgg098qplbds79rk2iadyvhvl3sjd77wf"; + sha256 = "1lfl8y1nmai7kp7jil8cykalw2ib0f3n47jvnz7302qsrs3lvhf2"; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; diff --git a/pkgs/applications/editors/kdevelop5/kdev-python.nix b/pkgs/applications/editors/kdevelop5/kdev-python.nix index 099153995c9..41dbc6d541e 100644 --- a/pkgs/applications/editors/kdevelop5/kdev-python.nix +++ b/pkgs/applications/editors/kdevelop5/kdev-python.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "kdev-python"; - version = "5.3.3"; + version = "5.4.0"; src = fetchurl { url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz"; - sha256 = "0bqsny2jgi6wi1cz65i2j9r1hiwna2x10mzy7vdk8bz7b4z766yg"; + sha256 = "1bsls5gf8jcb5zmswz82x8whfqadpgcapfc8sxvpjv5yhnjknk8c"; }; cmakeFlags = [ diff --git a/pkgs/applications/editors/kdevelop5/kdevelop.nix b/pkgs/applications/editors/kdevelop5/kdevelop.nix index 989432fc65d..8993adf92ea 100644 --- a/pkgs/applications/editors/kdevelop5/kdevelop.nix +++ b/pkgs/applications/editors/kdevelop5/kdevelop.nix @@ -7,16 +7,13 @@ , libksysguard, konsole, llvmPackages, makeWrapper, kpurpose, boost }: -let - qtVersion = "5.${lib.versions.minor qtbase.version}"; -in mkDerivation rec { pname = "kdevelop"; - version = "5.3.3"; + version = "5.4.0"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz"; - sha256 = "0778587qvi268ab2fgggfl40cv2swgr8q891q1paflp3m1xirpff"; + sha256 = "0zi59xlw6facak1jfzlyviwmpjn98dmircmjyqiv3ac5xr30f0ll"; }; nativeBuildInputs = [ @@ -44,13 +41,6 @@ mkDerivation rec { dontWrapQtApps = true; - postPatch = '' - # FIXME: temporary until https://invent.kde.org/kde/kdevelop/merge_requests/8 is merged - substituteInPlace kdevplatform/language/backgroundparser/parsejob.cpp --replace \ - 'if (internalFilePath.startsWith(dataPath.canonicalPath() + QStringLiteral("/kdev"))) {' \ - 'if (internalFilePath.startsWith(dataPath.canonicalPath() + QStringLiteral("/kdev")) || localFile.startsWith(path + QStringLiteral("/kdev"))) {' - ''; - postInstall = '' # The kdevelop! script (shell environment) needs qdbus and kioclient5 in PATH. wrapProgram "$out/bin/kdevelop!" \ diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index 6bbdaf77a69..d1ecaae373b 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -20,11 +20,11 @@ let in stdenv.mkDerivation rec { name = "nano-${version}"; - version = "3.2"; + version = "4.3"; src = fetchurl { url = "mirror://gnu/nano/${name}.tar.xz"; - sha256 = "0jb3zq0v84xb0chyynkcp2jhs9660wmpkic294p4p6c96npp69yi"; + sha256 = "108dzj6azqmini9bvgl26r0q1y59s3nnrw75hfzv91bs50davlq0"; }; nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext; diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index aa1e2a6b5bd..ec799c0fa49 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -100,7 +100,7 @@ let # Only display the log on error since it will contain a few normally # irrelevant messages. if ! $out/bin/nvim \ - -u ${vimUtils.vimrcFile (configure // { customRC = ""; })} \ + -u ${vimUtils.vimrcFile (configure // { customRC = ""; beforePlugins = ''filetype indent plugin on | syn on''; })} \ -i NONE -n \ -E -V1rplugins.log -s \ +UpdateRemotePlugins +quit! > outfile 2>&1; then diff --git a/pkgs/applications/editors/netbeans/default.nix b/pkgs/applications/editors/netbeans/default.nix index fa547875a17..3d215b28856 100644 --- a/pkgs/applications/editors/netbeans/default.nix +++ b/pkgs/applications/editors/netbeans/default.nix @@ -3,7 +3,7 @@ }: let - version = "10.0"; + version = "11.0"; desktopItem = makeDesktopItem { name = "netbeans"; exec = "netbeans"; @@ -18,7 +18,7 @@ stdenv.mkDerivation { name = "netbeans-${version}"; src = fetchurl { url = "mirror://apache/incubator/netbeans/incubating-netbeans/incubating-${version}/incubating-netbeans-${version}-bin.zip"; - sha512 = "ba83575f42c1d5515e2a5336a621bc2b4087b2e0bcacb6edb76f376f8272555609bdd4eefde8beae8ffc6c1a7db2fb721b844638ce27933c3dd78f71cbb41ad8"; + sha512 = "15mv59njrnq3sjfzb0n7xcc79kpixygf37cxvbswnvm651cw6lb1i9w8wbjivh0z4zcf3f62vbmshxh5pkaxqpqsg0iyy6gddfbwzwx"; }; buildCommand = '' diff --git a/pkgs/applications/editors/notepadqq/default.nix b/pkgs/applications/editors/notepadqq/default.nix index ab79c3e780b..efda2c58360 100644 --- a/pkgs/applications/editors/notepadqq/default.nix +++ b/pkgs/applications/editors/notepadqq/default.nix @@ -1,9 +1,8 @@ -{ stdenv, fetchFromGitHub, pkgconfig, which, qtbase, qtsvg, qttools, qtwebkit}: +{ mkDerivation, lib, fetchFromGitHub, pkgconfig, which, qtbase, qtsvg, qttools, qtwebkit }: -let +mkDerivation rec { + pname = "notepadqq"; version = "1.4.8"; -in stdenv.mkDerivation { - name = "notepadqq-${version}"; src = fetchFromGitHub { owner = "notepadqq"; repo = "notepadqq"; @@ -24,13 +23,19 @@ in stdenv.mkDerivation { export LRELEASE="lrelease" ''; + dontWrapQtApps = true; + + preFixup = '' + wrapQtApp $out/bin/notepadqq + ''; + enableParallelBuilding = true; - meta = { + meta = with lib; { homepage = https://notepadqq.com/; description = "Notepad++-like editor for the Linux desktop"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ rszibele ]; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.rszibele ]; }; } diff --git a/pkgs/applications/editors/quilter/default.nix b/pkgs/applications/editors/quilter/default.nix index 43ff16deb2d..f5c62b6f36e 100644 --- a/pkgs/applications/editors/quilter/default.nix +++ b/pkgs/applications/editors/quilter/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "quilter"; - version = "1.9.2"; + version = "1.9.3"; src = fetchFromGitHub { owner = "lainsce"; repo = pname; rev = version; - sha256 = "10r6d695avxj31yghb82ymgnd7f1dawwbqz3gfy0rycjza9dxvv8"; + sha256 = "09acknajbkfpw8f5pay2qj69dzhwbiplsvpp1hy9ma6msmxkr6cm"; }; nativeBuildInputs = [ @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { description = "Focus on your writing - designed for elementary OS"; homepage = https://github.com/lainsce/quilter; license = licenses.gpl2Plus; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = pantheon.maintainers; platforms = platforms.linux; }; } diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 27c956dcd14..f90e17a6065 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { sha256 = "19x000m3jwnkqgi6ic81lkzyjvvxcfacw2j0vcfcaknvvagzhyhb"; }; - hunspellDictionaries = with stdenv.lib; filter isDerivation (attrValues hunspellDicts); + hunspellDictionaries = with stdenv.lib; filter isDerivation (unique (attrValues hunspellDicts)); mathJaxSrc = fetchurl { url = https://s3.amazonaws.com/rstudio-buildtools/mathjax-26.zip; diff --git a/pkgs/applications/editors/sigil/default.nix b/pkgs/applications/editors/sigil/default.nix index 871ca1c671d..90d89ce7799 100644 --- a/pkgs/applications/editors/sigil/default.nix +++ b/pkgs/applications/editors/sigil/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, makeWrapper +{ stdenv, mkDerivation, fetchFromGitHub, cmake, pkgconfig, makeWrapper , boost, xercesc , qtbase, qttools, qtwebkit, qtxmlpatterns , python3, python3Packages }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "sigil-${version}"; version = "0.9.14"; @@ -17,17 +17,18 @@ stdenv.mkDerivation rec { pythonPath = with python3Packages; [ lxml ]; - propagatedBuildInputs = with python3Packages; [ lxml ]; - nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; buildInputs = [ boost xercesc qtbase qttools qtwebkit qtxmlpatterns - python3 python3Packages.lxml ]; + python3Packages.lxml ]; + + dontWrapQtApps = true; preFixup = '' wrapProgram "$out/bin/sigil" \ - --prefix PYTHONPATH : $PYTHONPATH:$(toPythonPath ${python3Packages.lxml}) + --prefix PYTHONPATH : $PYTHONPATH \ + ''${qtWrapperArgs[@]} ''; enableParallelBuilding = true; @@ -36,7 +37,7 @@ stdenv.mkDerivation rec { description = "Free, open source, multi-platform ebook (ePub) editor"; homepage = https://github.com/Sigil-Ebook/Sigil/; license = licenses.gpl3; - maintainers =[ maintainers.ramkromberg ]; + # currently unmaintained platforms = platforms.linux; }; } diff --git a/pkgs/applications/editors/standardnotes/default.nix b/pkgs/applications/editors/standardnotes/default.nix index d20f413700e..2d52aedc831 100644 --- a/pkgs/applications/editors/standardnotes/default.nix +++ b/pkgs/applications/editors/standardnotes/default.nix @@ -1,7 +1,7 @@ { stdenv, appimage-run, fetchurl, runtimeShell }: let - version = "3.0.6"; + version = "3.0.15"; plat = { "i386-linux" = "i386"; @@ -9,8 +9,8 @@ let }.${stdenv.hostPlatform.system}; sha256 = { - "i386-linux" = "0czhlbacjks9x8y2w46nzlvk595psqhqw0vl0bvsq7sz768dk0ni"; - "x86_64-linux" = "0haji9h8rrm9yvqdv6i2y6xdd0yhsssjjj83hmf6cb868lwyigsf"; + "i386-linux" = "0v2nsis6vb1lnhmjd28vrfxqwwpycv02j0nvjlfzcgj4b3400j7a"; + "x86_64-linux" = "130n586cw0836zsbwqcz3pp3h0d4ny74ngqs4k4cvfb92556r7xh"; }.${stdenv.hostPlatform.system}; in diff --git a/pkgs/applications/editors/thonny/default.nix b/pkgs/applications/editors/thonny/default.nix index 5f87aad8a87..a6179452f4d 100644 --- a/pkgs/applications/editors/thonny/default.nix +++ b/pkgs/applications/editors/thonny/default.nix @@ -4,13 +4,13 @@ with python3.pkgs; buildPythonApplication rec { pname = "thonny"; - version = "3.1.2"; + version = "3.2.0b7"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1simqqxm72k5zhavhllkinsyw8ggy6fjs5ppj82g3l5g3919pfna"; + sha256 = "0p0hi5rj873cszx9rpbjjq51vs6xys3rlq9v1rya710i3fnw0hqh"; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index ec2d75ffaf6..369184a35e2 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -27,13 +27,13 @@ in stdenv.mkDerivation rec { name = "macvim-${version}"; - version = "8.1.1517"; + version = "8.1.1722"; src = fetchFromGitHub { owner = "macvim-dev"; repo = "macvim"; - rev = "snapshot-156"; - sha256 = "17plmqcn49gqwr1km77mkxflrg0f4sn06r3n0fbxa8zcz9zmb1q2"; + rev = "snapshot-157"; + sha256 = "1gmgc4pwaqy78gj4p7iib94n7j52ir0aa03ks595h3vy1hkcwwky"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 438292b7683..7e4035ac336 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -11,13 +11,13 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - "x86_64-linux" = "1ck13xpnfklfc81jd8d5md09fcp0gjypacdqj276mzhr5mig29cd"; - "x86_64-darwin" = "0xpzm372swv0by22saxib16fvvvfjr7d68aj3l5dsl5c9a8v23qj"; + "x86_64-linux" = "17g7mra9a52qlrrj77cw16vqvc7fsvbhc03wrl4iq1afzxsyqi22"; + "x86_64-darwin" = "1is04anvhl2b354h5w7i5qi7ixhzna277f7xdy4qj9gjby6zydc6"; }.${system}; in callPackage ./generic.nix rec { - version = "1.36.1"; + version = "1.37.0"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index 02af754a72c..3f922530e73 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "11.1.1"; + version = "11.1.4"; src = fetchurl { url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/draw.io-x86_64-${version}.rpm"; - sha256 = "1jibkxx00rma641c3xr7720qj9slqsvhbpi7nawi6f2f91gzyc10"; + sha256 = "0ca8wkkdr7kbb8il84nq05qgd5ykjq15fdv9432wr5p9xmqixz1q"; }; nativeBuildInputs = [ @@ -70,18 +70,18 @@ stdenv.mkDerivation rec { # Application icon mkdir -p $out/share/icons/hicolor - cp -r usr/share/icons/hicolor/0x0 $out/share/icons/hicolor/1024x1024 + cp -r usr/share/icons/hicolor/* $out/share/icons/hicolor/ # XDG desktop item cp -r usr/share/applications $out/share/applications # Symlink wrapper mkdir -p $out/bin - ln -s $out/share/draw.io/draw.io $out/bin/draw.io + ln -s $out/share/draw.io/drawio $out/bin/drawio # Update binary path - substituteInPlace $out/share/applications/draw.io.desktop \ - --replace /opt/draw.io/draw.io $out/bin/draw.io + substituteInPlace $out/share/applications/drawio.desktop \ + --replace /opt/draw.io/drawio $out/bin/drawio ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index 8f0fe00a85e..b8f4d544503 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, ninja, coin3d, xercesc, ode, eigen, qt5, opencascade-occt, gts +{ stdenv, mkDerivation, fetchurl, cmake, ninja, coin3d, xercesc, ode, eigen, qt5, opencascade-occt, gts , hdf5, vtk, medfile, zlib, python3Packages, swig, gfortran, libXmu , soqt, libf2c, libGLU, makeWrapper, pkgconfig , mpi ? null }: @@ -7,7 +7,7 @@ assert mpi != null; let pythonPackages = python3Packages; -in stdenv.mkDerivation rec { +in mkDerivation rec { name = "freecad-${version}"; version = "0.18.3"; @@ -46,22 +46,23 @@ in stdenv.mkDerivation rec { # Their main() removes PYTHONPATH=, and we rely on it. preConfigure = '' sed '/putenv("PYTHONPATH/d' -i src/Main/MainGui.cpp - ''; - postInstall = '' - wrapProgram $out/bin/FreeCAD --prefix PYTHONPATH : $PYTHONPATH \ - --set COIN_GL_NO_CURRENT_CONTEXT_CHECK 1 + qtWrapperArgs+=(--prefix PYTHONPATH : "$PYTHONPATH") ''; + qtWrapperArgs = [ + "--set COIN_GL_NO_CURRENT_CONTEXT_CHECK 1" + ]; + postFixup = '' mv $out/share/doc $out ''; meta = with stdenv.lib; { description = "General purpose Open Source 3D CAD/MCAD/CAx/CAE/PLM modeler"; - homepage = https://www.freecadweb.org/; + homepage = "https://www.freecadweb.org/"; license = licenses.lgpl2Plus; - maintainers = [ maintainers.viric ]; + maintainers = with maintainers; [ viric gebner ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/graphics/ideogram/default.nix b/pkgs/applications/graphics/ideogram/default.nix new file mode 100644 index 00000000000..1511901ab91 --- /dev/null +++ b/pkgs/applications/graphics/ideogram/default.nix @@ -0,0 +1,68 @@ +{ stdenv +, fetchFromGitHub +, fetchpatch +, pkgconfig +, python3 +, glib +, gtk3 +, meson +, ninja +, libgee +, pantheon +, desktop-file-utils +, xorg +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "ideogram"; + version = "1.2.2"; + + src = fetchFromGitHub { + owner = "cassidyjames"; + repo = pname; + rev = version; + sha256 = "1qakgg3y4n2vcnykk2004ndvwmjbk2yy0p4j30mlb7p14dxscif6"; + }; + + nativeBuildInputs = [ + desktop-file-utils + meson + ninja + pantheon.vala + pkgconfig + python3 + wrapGAppsHook + ]; + + buildInputs = [ + glib + gtk3 + libgee + pantheon.granite + xorg.libX11 + xorg.libXtst + ]; + + patches = [ + # See: https://github.com/cassidyjames/ideogram/issues/26 + (fetchpatch { + url = "https://github.com/cassidyjames/ideogram/commit/65994ee11bd21f8316b057cec01afbf50639a708.patch"; + sha256 = "12vrvvggpqq53dmhbm7gbbbigncn19m1fjln9wxaady21m0w776c"; + }) + ]; + + postPatch = '' + chmod +x meson/post_install.py + patchShebangs meson/post_install.py + ''; + + meta = with stdenv.lib; { + description = "Insert emoji anywhere, even in non-native apps - designed for elementary OS"; + homepage = https://github.com/cassidyjames/ideogram; + license = licenses.gpl2Plus; + maintainers = pantheon.maintainers; + platforms = platforms.linux; + }; + +} diff --git a/pkgs/applications/graphics/openimageio/2.x.nix b/pkgs/applications/graphics/openimageio/2.x.nix index 837446190fb..4e61fccaa37 100644 --- a/pkgs/applications/graphics/openimageio/2.x.nix +++ b/pkgs/applications/graphics/openimageio/2.x.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "openimageio"; - version = "2.0.9"; + version = "2.0.10"; src = fetchFromGitHub { owner = "OpenImageIO"; repo = "oiio"; rev = "Release-${version}"; - sha256 = "17diyfk586hll54cl476kbhbcm3nihw6cb4bgjkjxxzxbd3wx839"; + sha256 = "0k60kgfahsqcgmydsf1kh1qzshn8mksaw772z48a40qnx28pfjys"; }; outputs = [ "bin" "out" "dev" "doc" ]; @@ -45,8 +45,6 @@ stdenv.mkDerivation rec { "-DUSE_PYTHON=OFF" "-DUSE_QT=OFF" # GNUInstallDirs - "-DCMAKE_INSTALL_BINDIR=${placeholder "bin"}/bin" - "-DCMAKE_INSTALL_INCLUDEDIR=${placeholder "dev"}/include" "-DCMAKE_INSTALL_LIBDIR=lib" # needs relative path for pkgconfig ]; diff --git a/pkgs/applications/graphics/openimageio/default.nix b/pkgs/applications/graphics/openimageio/default.nix index 00b33b65216..7225efadebd 100644 --- a/pkgs/applications/graphics/openimageio/default.nix +++ b/pkgs/applications/graphics/openimageio/default.nix @@ -23,8 +23,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DUSE_PYTHON=OFF" - # GNUInstallDirs - "-DCMAKE_INSTALL_BINDIR=${placeholder "bin"}/bin" ]; makeFlags = [ diff --git a/pkgs/applications/graphics/pdfcpu/default.nix b/pkgs/applications/graphics/pdfcpu/default.nix index 56c823993f7..c1b2beadcd5 100644 --- a/pkgs/applications/graphics/pdfcpu/default.nix +++ b/pkgs/applications/graphics/pdfcpu/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pdfcpu"; - version = "0.2.1"; + version = "0.2.3"; src = fetchFromGitHub { - owner = "hhrutter"; + owner = "pdfcpu"; repo = pname; rev = "v${version}"; - sha256 = "0cg17nph3qv1ca86j3wcd33vqs6clkzi6y2nrajmk7dq5vbzr6nn"; + sha256 = "11q57j3wzmy2glkv53i9n7jkp14x4bqm20f3rqs3gkm4j9bcas4y"; }; modSha256 = "0cz4gs88s9z2yv1gc9ap92vv2j93ab6kr25zjgl2r7z6clbl5fzp"; diff --git a/pkgs/applications/graphics/rapid-photo-downloader/default.nix b/pkgs/applications/graphics/rapid-photo-downloader/default.nix index 5991a3351ee..c007f4f3de8 100644 --- a/pkgs/applications/graphics/rapid-photo-downloader/default.nix +++ b/pkgs/applications/graphics/rapid-photo-downloader/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, python3Packages +{ stdenv, mkDerivationWith, fetchurl, python3Packages , file, intltool, gobject-introspection, libgudev , udisks, gexiv2, gst_all_1, libnotify , exiftool, gdk-pixbuf, libmediainfo, vmtouch }: -python3Packages.buildPythonApplication rec { +mkDerivationWith python3Packages.buildPythonApplication rec { pname = "rapid-photo-downloader"; - version = "0.9.14"; + version = "0.9.15"; src = fetchurl { url = "https://launchpad.net/rapid/pyqt/${version}/+download/${pname}-${version}.tar.gz"; - sha256 = "1nywkkyxlpzq3s9anza9k67j5689pfclfha218frih36qdb0j258"; + sha256 = "14s8x2qp1li05pailflw1nprp79q0aa7lb92hnwa1air8756z7al"; }; # Disable version check and fix install tests @@ -64,6 +64,7 @@ python3Packages.buildPythonApplication rec { requests colorlog pyprind + tenacity ]; makeWrapperArgs = [ @@ -72,6 +73,7 @@ python3Packages.buildPythonApplication rec { "--prefix PATH : ${stdenv.lib.makeBinPath [ exiftool vmtouch ]}" "--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ libmediainfo ]}" "--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : \"$GST_PLUGIN_SYSTEM_PATH_1_0\"" + "\${qtWrapperArgs[@]}" ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/graphics/runwayml/default.nix b/pkgs/applications/graphics/runwayml/default.nix new file mode 100644 index 00000000000..f96b70a77b4 --- /dev/null +++ b/pkgs/applications/graphics/runwayml/default.nix @@ -0,0 +1,45 @@ +{ lib +, fetchurl +, appimageTools +, symlinkJoin +}: + +let + pname = "runwayml"; + version = "0.9.0"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "https://runway-releases.s3.amazonaws.com/Runway%20${version}.AppImage"; + sha256 = "0rg7ipp7kx0l4qgcymfg5d3saz0c6d2j0c6rf28rwqgbm92gbjjq"; + name="${pname}-${version}.AppImage"; + }; + + binary = appimageTools.wrapType2 { + name = "${pname}"; + inherit src; + }; + # we only use this to extract the icon + appimage-contents = appimageTools.extractType2 { + inherit name src; + }; + +in + symlinkJoin { + inherit name; + paths = [ binary ]; + + postBuild = '' + mkdir -p $out/share/pixmaps/ $out/share/applications + cp ${appimage-contents}/usr/share/icons/hicolor/1024x1024/apps/runway.png $out/share/pixmaps/runway.png + sed 's:Exec=AppRun:Exec=runwayml:' ${appimage-contents}/runway.desktop > $out/share/applications/runway.desktop + ''; + + meta = with lib; { + description = "Machine learning for creators"; + homepage = https://runwayml.com/; + license = licenses.unfree; + maintainers = with maintainers; [ prusnak ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/kde/kdenlive.nix b/pkgs/applications/kde/kdenlive.nix index a42210e6e40..fa75dd1eb97 100644 --- a/pkgs/applications/kde/kdenlive.nix +++ b/pkgs/applications/kde/kdenlive.nix @@ -1,6 +1,8 @@ { mkDerivation , lib , extra-cmake-modules +, breeze-icons +, breeze-qt5 , kdoctools , kconfig , kcrash @@ -19,7 +21,8 @@ , shared-mime-info , libv4l , kfilemetadata -, ffmpeg +, ffmpeg-full +, frei0r , phonon-backend-gstreamer , qtdeclarative , qtquickcontrols @@ -37,6 +40,8 @@ mkDerivation { kdoctools ]; buildInputs = [ + breeze-icons + breeze-qt5 kconfig kcrash kdbusaddons @@ -59,7 +64,8 @@ mkDerivation { qtwebkit shared-mime-info libv4l - ffmpeg + ffmpeg-full + frei0r rttr kpurpose kdeclarative diff --git a/pkgs/applications/misc/barrier/default.nix b/pkgs/applications/misc/barrier/default.nix index 5d3564f38e6..e401a7c0b8e 100644 --- a/pkgs/applications/misc/barrier/default.nix +++ b/pkgs/applications/misc/barrier/default.nix @@ -4,13 +4,13 @@ mkDerivation rec { pname = "barrier"; - version = "2.3.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "debauchee"; repo = pname; rev = "v${version}"; - sha256 = "1fy7xjwqyisapf8wv50gwpbgbv5b4ldf7766w453h5iw10d18kh0"; + sha256 = "1dakpgs4jcwg06f45xg6adc83jd2qnpywmjm1z7g0hzd2vd0qg4k"; }; buildInputs = [ cmake curl xorg.libX11 xorg.libXext xorg.libXtst avahiWithLibdnssdCompat qtbase ]; diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 6b4ca4e0355..c82b00e66e8 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, poppler_utils, pkgconfig, libpng +{ stdenv, mkDerivation, fetchurl, poppler_utils, pkgconfig, libpng , imagemagick, libjpeg, fontconfig, podofo, qtbase, qmake, icu, sqlite -, makeWrapper, unrarSupport ? false, chmlib, python2Packages, libusb1, libmtp +, unrarSupport ? false, chmlib, python2Packages, libusb1, libmtp , xdg_utils, makeDesktopItem, wrapGAppsHook, removeReferencesTo, qt5 }: -stdenv.mkDerivation rec { - version = "3.45.2"; +mkDerivation rec { name = "calibre-${version}"; + version = "3.46.0"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "1379g375s3h0fgv9qg43hrg16knd76ym7qkffpn1qyc7kkhv8a05"; + sha256 = "1dlss01kaz2qlg9ji8c9dn9rd73mmpm5yjg50zp49cwx9y2vjiz9"; }; patches = [ @@ -35,11 +35,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ makeWrapper pkgconfig qmake removeReferencesTo qt5.wrapQtAppsHook ]; + nativeBuildInputs = [ pkgconfig qmake removeReferencesTo wrapGAppsHook ]; buildInputs = [ poppler_utils libpng imagemagick libjpeg - fontconfig podofo qtbase chmlib icu sqlite libusb1 libmtp xdg_utils wrapGAppsHook + fontconfig podofo qtbase chmlib icu sqlite libusb1 libmtp xdg_utils ] ++ (with python2Packages; [ apsw cssselect css-parser dateutil dnspython html5-parser lxml mechanize netifaces pillow python pyqt5_with_qtwebkit sip @@ -48,11 +48,6 @@ stdenv.mkDerivation rec { odfpy ]); - qtWrapperArgs = [ - "--prefix PYTHONPATH: $PYTHONPATH" - "--prefix PATH: ${poppler_utils.out}/bin}" - ]; - installPhase = '' runHook preInstall @@ -75,10 +70,6 @@ stdenv.mkDerivation rec { sed -i "s/env python[0-9.]*/python/" $PYFILES sed -i "2i import sys; sys.argv[0] = 'calibre'" $out/bin/calibre - for program in $out/bin/*; do - wrapQtApp $program - done - # Replace @out@ by the output path. mkdir -p $out/share/applications/ cp {$calibreDesktopItem,$ebookEditDesktopItem,$ebookViewerDesktopItem}/share/applications/* $out/share/applications/ @@ -92,15 +83,23 @@ stdenv.mkDerivation rec { runHook postInstall ''; + # Wrap manually + dontWrapQtApps = true; + dontWrapGApps = true; + # Remove some references to shrink the closure size. This reference (as of # 2018-11-06) was a single string like the following: # /nix/store/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx-podofo-0.9.6-dev/include/podofo/base/PdfVariant.h preFixup = '' remove-references-to -t ${podofo.dev} $out/lib/calibre/calibre/plugins/podofo.so - ''; - - postFixup = '' + for program in $out/bin/*; do + wrapProgram $program \ + ''${qtWrapperArgs[@]} \ + ''${gappsWrapperArgs[@]} \ + --prefix PYTHONPATH : $PYTHONPATH \ + --prefix PATH : ${poppler_utils.out}/bin + done ''; disallowedReferences = [ podofo.dev ]; diff --git a/pkgs/applications/misc/clight/clightd.nix b/pkgs/applications/misc/clight/clightd.nix new file mode 100644 index 00000000000..43ff1d73f78 --- /dev/null +++ b/pkgs/applications/misc/clight/clightd.nix @@ -0,0 +1,75 @@ +{ lib, stdenv, fetchFromGitHub +, dbus, cmake, pkgconfig +, glib, udev, polkit, libmodule +, pcre, libXdmcp, utillinux, libpthreadstubs +, enableDdc ? true, ddcutil +, enableDpms ? true, libXext +, enableGamma ? true, libXrandr +, enableScreen ? true }: + +stdenv.mkDerivation rec { + pname = "clightd"; + version = "3.4"; + + src = fetchFromGitHub { + owner = "FedeDP"; + repo = "Clightd"; + rev = version; + sha256 = "0g6kawizwfhvigkwm7rbfq6rg872xn8igy8n355w4d7mmcxk0jf8"; + }; + + # dbus-1.pc has datadir=/etc + SYSTEM_BUS_DIR = "${placeholder "out"}/share/dbus-1/system-services"; + # systemd.pc has prefix=${systemd.out} + MODULE_LOAD_DIR = "${placeholder "out"}/lib/modules-load.d"; + # polkit-gobject-1.pc has prefix=${polkit.out} + POLKIT_ACTION_DIR = "${placeholder "out"}/share/polkit-1/actions"; + + postPatch = '' + sed -i "s@/etc@$out\0@" CMakeLists.txt + sed -i "s@pkg_get_variable(SYSTEM_BUS_DIR.*@set(SYSTEM_BUS_DIR $SYSTEM_BUS_DIR)@" CMakeLists.txt + sed -i "s@pkg_get_variable(MODULE_LOAD_DIR.*@set(MODULE_LOAD_DIR $MODULE_LOAD_DIR)@" CMakeLists.txt + sed -i "s@pkg_get_variable(POLKIT_ACTION_DIR.*@set(POLKIT_ACTION_DIR $POLKIT_ACTION_DIR)@" CMakeLists.txt + ''; + + cmakeFlags = with lib; + optional enableDdc "-DENABLE_DDC=1" + ++ optional enableDpms "-DENABLE_DPMS=1" + ++ optional enableGamma "-DENABLE_GAMMA=1" + ++ optional enableScreen "-DENABLE_SCREEN=1"; + + nativeBuildInputs = [ + dbus + cmake + pkgconfig + ]; + + buildInputs = with lib; [ + glib + udev + polkit + libmodule + + pcre + libXdmcp + utillinux + libpthreadstubs + ] ++ optional enableDdc ddcutil + ++ optional enableDpms libXext + ++ optional enableGamma libXrandr; + + postInstall = '' + mkdir -p $out/bin + ln -svT $out/lib/clightd/clightd $out/bin/clightd + ''; + + meta = with lib; { + description = "Linux bus interface that changes screen brightness/temperature"; + homepage = https://github.com/FedeDP/Clightd; + platforms = platforms.linux; + license = licenses.gpl3; + maintainers = with maintainers; [ + eadwu + ]; + }; +} diff --git a/pkgs/applications/misc/clight/default.nix b/pkgs/applications/misc/clight/default.nix new file mode 100644 index 00000000000..829fd4e1223 --- /dev/null +++ b/pkgs/applications/misc/clight/default.nix @@ -0,0 +1,57 @@ +{ lib, stdenv, fetchFromGitHub +, dbus, cmake, pkgconfig, bash-completion +, gsl, popt, clightd, systemd, libconfig +, withGeoclue ? true, geoclue2 +, withUpower ? true, upower }: + +stdenv.mkDerivation rec { + pname = "clight"; + version = "3.1"; + + src = fetchFromGitHub { + owner = "FedeDP"; + repo = "Clight"; + rev = version; + sha256 = "0rzcr1x9h4llnmklhgzs9r7xwhsrw1qkqvfffkp8fs90nycaqx81"; + }; + + # bash-completion.pc completionsdir=${bash-completion.out} + COMPLETIONS_DIR = "${placeholder "out"}/share/bash-completions/completions"; + # dbus-1.pc has datadir=/etc + SESSION_BUS_DIR = "${placeholder "out"}/share/dbus-1/services"; + + postPatch = '' + sed -i "s@/usr@$out@" CMakeLists.txt + sed -i "s@/etc@$out\0@" CMakeLists.txt + sed -i "s@pkg_get_variable(COMPLETIONS_DIR.*@set(COMPLETIONS_DIR $COMPLETIONS_DIR)@" CMakeLists.txt + sed -i "s@pkg_get_variable(SESSION_BUS_DIR.*@set(SESSION_BUS_DIR $SESSION_BUS_DIR)@" CMakeLists.txt + ''; + + nativeBuildInputs = [ + dbus + cmake + pkgconfig + bash-completion + ]; + + buildInputs = with lib; [ + gsl + popt + upower + clightd + systemd + geoclue2 + libconfig + ] ++ optional withGeoclue geoclue2 + ++ optional withUpower upower; + + meta = with lib; { + description = "A C daemon that turns your webcam into a light sensor"; + homepage = https://github.com/FedeDP/Clight; + platforms = platforms.linux; + license = licenses.gpl3; + maintainers = with maintainers; [ + eadwu + ]; + }; +} diff --git a/pkgs/applications/misc/cmatrix/default.nix b/pkgs/applications/misc/cmatrix/default.nix index 28f14cc1435..9a008a886fa 100644 --- a/pkgs/applications/misc/cmatrix/default.nix +++ b/pkgs/applications/misc/cmatrix/default.nix @@ -1,25 +1,24 @@ -{ stdenv, fetchurl, pkgconfig, ncurses }: +{ stdenv, fetchFromGitHub, autoreconfHook, ncurses }: -let - version = "1.2a"; -in with stdenv.lib; stdenv.mkDerivation rec { + pname = "cmatrix"; + version = "2.0"; - name = "cmatrix-${version}"; - - src = fetchurl{ - url = "http://www.asty.org/cmatrix/dist/${name}.tar.gz"; - sha256 = "0k06fw2n8nzp1pcdynhajp5prba03gfgsbj91bknyjr5xb5fd9hz"; + src = fetchFromGitHub { + owner = "abishekvashok"; + repo = "cmatrix"; + rev = "v${version}"; + sha256 = "1h9jz4m4s5l8c3figaq46ja0km1gimrkfxm4dg7mf4s84icmasbm"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ ncurses ]; - meta = { + meta = with stdenv.lib; { description = "Simulates the falling characters theme from The Matrix movie"; longDescription = '' CMatrix simulates the display from "The Matrix" and is based - on the screensaver from the movie's website. + on the screensaver from the movie's website. ''; homepage = http://www.asty.org/cmatrix/; platforms = ncurses.meta.platforms; diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix index 290801ea578..084881f75d9 100644 --- a/pkgs/applications/misc/cura/default.nix +++ b/pkgs/applications/misc/cura/default.nix @@ -1,21 +1,21 @@ { mkDerivation, lib, fetchFromGitHub, cmake, python3, qtbase, qtquickcontrols2, qtgraphicaleffects, curaengine, plugins ? [] }: mkDerivation rec { - name = "cura-${version}"; - version = "4.1.0"; + pname = "cura"; + version = "4.2.1"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "Cura"; rev = version; - sha256 = "1mfpnjrh3splpkadgml3v71k939g56zb9hbmzghwfjwlrf8valmz"; + sha256 = "1qnai8vmgy5lx3lapw96j41i8mw9p6r99i3qzs709l9yzrix6l86"; }; materials = fetchFromGitHub { owner = "Ultimaker"; repo = "fdm_materials"; - rev = version; - sha256 = "0yp2162msxfwpixzvassn23p7r3swjpwk4nhsjka5w6fm8pv0wpl"; + rev = "4.2.0"; # TODO: change back to `version` after 4.2.1 + sha256 = "17x43v0np58qbdfk3wz1k7i9pl0plndx9gmf7y0n23nl9f1qzb0m"; }; buildInputs = [ qtbase qtquickcontrols2 qtgraphicaleffects ]; @@ -29,6 +29,11 @@ mkDerivation rec { "-DCURA_VERSION=${version}" ]; + makeWrapperArgs = [ + # hacky workaround for https://github.com/NixOS/nixpkgs/issues/59901 + "--set OMP_NUM_THREADS 1" + ]; + postPatch = '' sed -i 's,/python''${PYTHON_VERSION_MAJOR}/dist-packages,/python''${PYTHON_VERSION_MAJOR}.''${PYTHON_VERSION_MINOR}/site-packages,g' CMakeLists.txt sed -i 's, executable_name = .*, executable_name = "${curaengine}/bin/CuraEngine",' plugins/CuraEngineBackend/CuraEngineBackend.py @@ -45,6 +50,7 @@ mkDerivation rec { postFixup = '' wrapPythonPrograms + wrapQtApp $out/bin/cura ''; meta = with lib; { @@ -52,6 +58,6 @@ mkDerivation rec { homepage = https://github.com/Ultimaker/Cura; license = licenses.lgpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ abbradar ]; + maintainers = with maintainers; [ abbradar gebner ]; }; } diff --git a/pkgs/applications/misc/cura/lulzbot.nix b/pkgs/applications/misc/cura/lulzbot.nix deleted file mode 100644 index f3f1972f6e6..00000000000 --- a/pkgs/applications/misc/cura/lulzbot.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ stdenv, fetchurl, dpkg, bash, python27Packages }: - -let - py = python27Packages; -in -stdenv.mkDerivation rec { - name = "cura-lulzbot-${version}"; - version = "15.02.1-1.03-5064"; - - src = - if stdenv.hostPlatform.system == "x86_64-linux" then - fetchurl { - url = "https://download.alephobjects.com/ao/aodeb/dists/jessie/main/binary-amd64/cura_${version}_amd64.deb"; - sha256 = "1gsfidg3gim5pjbl82vkh0cw4ya253m4p7nirm8nr6yjrsirkzxg"; - } - else if stdenv.hostPlatform.system == "i686-linux" then - fetchurl { - url = "http://download.alephobjects.com/ao/aodeb/dists/jessie/main/binary-i386/cura_${version}_i386.deb"; - sha256 = "0xd3df6bxq4rijgvsqvps454jkc1nzhxbdzzj6j2w317ppsbhyc1"; - } - else throw "${name} is not supported on ${stdenv.hostPlatform.system}"; - - python_deps = with py; [ pyopengl pyserial numpy wxPython30 power setuptools ]; - pythonPath = python_deps; - propagatedBuildInputs = python_deps; - buildInputs = [ dpkg bash py.wrapPython ]; - - phases = [ "unpackPhase" "installPhase" ]; - unpackPhase = "dpkg-deb -x ${src} ./"; - - installPhase = '' - mkdir -p $out/bin - cp -r usr/share $out/share - find $out/share -type f -exec sed -i 's|/usr/share/cura|$out/share/cura|g' "{}" \; - - cat <<EOT > $out/bin/cura - #!${bash}/bin/bash - PYTHONPATH=$PYTHONPATH:$out/share/cura ${py.python}/bin/python $out/share/cura/cura.py "\$@" - EOT - - chmod 555 $out/bin/cura - ''; - - meta = with stdenv.lib; { - description = "3D printing host software for the Lulzbot"; - - longDescription = '' - Cura LulzBot Edition is a fork of the 3D printing/slicing - software from Ultimaker, with changes to support 3D printers - from Aleph Objects. - ''; - - homepage = https://www.lulzbot.com/cura/; - license = licenses.agpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ pjones ]; - }; -} diff --git a/pkgs/applications/misc/cura/lulzbot/curaengine.nix b/pkgs/applications/misc/cura/lulzbot/curaengine.nix new file mode 100644 index 00000000000..e44f43d22bf --- /dev/null +++ b/pkgs/applications/misc/cura/lulzbot/curaengine.nix @@ -0,0 +1,26 @@ +{ stdenv, callPackage, fetchgit, fetchpatch, cmake, libarcusLulzbot, stb, protobuf }: + +stdenv.mkDerivation rec { + name = "curaengine-lulzBot-${version}"; + version = "3.6.18"; + + src = fetchgit { + url = https://code.alephobjects.com/source/curaengine-lulzbot.git; + rev = "ec6a1a0f0aa387ef97e5c106633cf8d7fb9cd00d"; + sha256 = "0wdkvg1hmqp1gaym804lw09x4ngf5ffasd861jhflpy7djbmkfn8"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ libarcusLulzbot stb protobuf ]; + + cmakeFlags = [ "-DCURA_ENGINE_VERSION=${version}" ]; + + meta = with stdenv.lib; { + description = "A powerful, fast and robust engine for processing 3D models into 3D printing instruction"; + homepage = https://code.alephobjects.com/source/curaengine-lulzbot/; + license = licenses.agpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ chaduffy ]; + }; +} + diff --git a/pkgs/applications/misc/cura/lulzbot/default.nix b/pkgs/applications/misc/cura/lulzbot/default.nix new file mode 100644 index 00000000000..2d32d1895f9 --- /dev/null +++ b/pkgs/applications/misc/cura/lulzbot/default.nix @@ -0,0 +1,78 @@ +{ lib, callPackage, fetchgit, cmake, jq, python3Packages, qtbase, qtquickcontrols2 }: + +let + # admittedly, we're using (printer firmware) blobs when we could compile them ourselves. + curaBinaryDataVersion = "3.6.18"; # Marlin v2.0.0.144. Keep this accurate wrt. the below. + curaBinaryData = fetchgit { + url = https://code.alephobjects.com/diffusion/CBD/cura-binary-data.git; + rev = "cdc046494bbfe1f65bfb34659a257eef9a0100a0"; + sha256 = "0v0s036gxdjiglas2yzw95alv60sw3pq5k1zrrhmw9mxr4irrblb"; + }; + + libarcusLulzbot = callPackage ./libarcus.nix { + inherit (python3Packages) buildPythonPackage sip pythonOlder; + }; + libsavitarLulzbot = callPackage ./libsavitar.nix { + inherit (python3Packages) buildPythonPackage sip pythonOlder; + }; + + inherit (python3Packages) buildPythonPackage pyqt5 numpy scipy shapely pythonOlder; + curaengine = callPackage ./curaengine.nix { + inherit libarcusLulzbot; + }; + uraniumLulzbot = callPackage ./uranium.nix { + inherit callPackage libarcusLulzbot; + inherit (python3Packages) buildPythonPackage pyqt5 numpy scipy shapely pythonOlder; + }; +in +python3Packages.buildPythonApplication rec { + name = "cura-lulzbot-${version}"; + version = "3.6.18"; + + src = fetchgit { + url = https://code.alephobjects.com/source/cura-lulzbot.git; + rev = "71f1ac5a2b9f535175a3858a565930348358a9ca"; + sha256 = "0by06fpxvdgy858lwhsccbmvkdq67j2s1cz8v6jnrnjrsxk7vzka"; + }; + + format = "other"; # using cmake to build + buildInputs = [ qtbase qtquickcontrols2 ]; + # numpy-stl temporarily disabled due to https://code.alephobjects.com/T8415 + propagatedBuildInputs = with python3Packages; [ pyserial requests zeroconf ] ++ [ libsavitarLulzbot uraniumLulzbot libarcusLulzbot ]; # numpy-stl + nativeBuildInputs = [ cmake python3Packages.wrapPython ]; + + cmakeFlags = [ + "-DURANIUM_DIR=${uraniumLulzbot.src}" + "-DCURA_VERSION=${version}" + ]; + + postPatch = '' + sed -i 's,/python''${PYTHON_VERSION_MAJOR}/dist-packages,/python''${PYTHON_VERSION_MAJOR}.''${PYTHON_VERSION_MINOR}/site-packages,g' CMakeLists.txt + sed -i 's, executable_name = .*, executable_name = "${curaengine}/bin/CuraEngine",' plugins/CuraEngineBackend/CuraEngineBackend.py + ''; + + preFixup = '' + substituteInPlace "$out/bin/cura-lulzbot" --replace 'import cura.CuraApplication' 'import Savitar; import cura.CuraApplication' + ln -sT "${curaBinaryData}/cura/resources/firmware" "$out/share/cura/resources/firmware" + ln -sT "${uraniumLulzbot}/share/uranium" "$out/share/uranium" + ${jq}/bin/jq --arg out "$out" '.build=$out' >"$out/version.json" <<'EOF' + ${builtins.toJSON { + cura = version; + cura_version = version; + binarydata = curaBinaryDataVersion; + engine = curaengine.version; + libarcus = libarcusLulzbot.version; + libsavitar = libsavitarLulzbot.version; + uranium = uraniumLulzbot.version; + }} + EOF + ''; + + meta = with lib; { + description = "3D printer / slicing GUI built on top of the Uranium framework"; + homepage = https://code.alephobjects.com/diffusion/CURA/; + license = licenses.agpl3; # a partial relicense to LGPL has happened, but not certain that all AGPL bits are expunged + platforms = platforms.linux; + maintainers = with maintainers; [ chaduffy ]; + }; +} diff --git a/pkgs/applications/misc/cura/lulzbot/libarcus.nix b/pkgs/applications/misc/cura/lulzbot/libarcus.nix new file mode 100644 index 00000000000..589111df78b --- /dev/null +++ b/pkgs/applications/misc/cura/lulzbot/libarcus.nix @@ -0,0 +1,33 @@ +{ stdenv, buildPythonPackage, fetchgit, fetchurl, cmake, sip, protobuf, pythonOlder }: + +buildPythonPackage rec { + pname = "libarcus"; + version = "3.6.18"; + format = "other"; + + src = fetchgit { + url = https://code.alephobjects.com/source/arcus.git; + rev = "c795c0644591703ce04e1fd799fc97b1539031aa"; + sha256 = "1yap9wbqxbjx3kqyqcsldny4mlcm33ywiwpdjlfgs0wjahfg4ip0"; + }; + + disabled = pythonOlder "3.4.0"; + + propagatedBuildInputs = [ sip ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ protobuf ]; + + postPatch = '' + # To workaround buggy SIP detection which overrides PYTHONPATH + sed -i '/SET(ENV{PYTHONPATH}/d' cmake/FindSIP.cmake + ''; + + meta = with stdenv.lib; { + description = "Communication library between internal components for Ultimaker software"; + homepage = https://code.alephobjects.com/source/arcus/; + license = licenses.lgpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ chaduffy ]; + }; +} + diff --git a/pkgs/applications/misc/cura/lulzbot/libsavitar.nix b/pkgs/applications/misc/cura/lulzbot/libsavitar.nix new file mode 100644 index 00000000000..7a1781f62ce --- /dev/null +++ b/pkgs/applications/misc/cura/lulzbot/libsavitar.nix @@ -0,0 +1,33 @@ +{ stdenv, buildPythonPackage, pythonOlder, fetchgit, cmake, sip }: + +buildPythonPackage rec { + pname = "libsavitar-lulzbot"; + name = "libsavitar-lulzbot"; + version = "3.6.18"; + format = "other"; + + src = fetchgit { + url = https://code.alephobjects.com/source/savitar.git; + rev = "988a26d35b2a1d042f8c38938ccda77ab146af7d"; + sha256 = "146agw3a92azkgs5ahmn2rrck4an78m2r3pcss6ihmb60lx165k7"; + }; + + postPatch = '' + # To workaround buggy SIP detection which overrides PYTHONPATH + sed -i '/SET(ENV{PYTHONPATH}/d' cmake/FindSIP.cmake + ''; + + nativeBuildInputs = [ cmake ]; + + propagatedBuildInputs = [ sip ]; + + disabled = pythonOlder "3.4.0"; + + meta = with stdenv.lib; { + description = "C++ implementation of 3mf loading with SIP python bindings"; + homepage = https://github.com/Ultimaker/libSavitar; + license = licenses.lgpl3Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ chaduffy ]; + }; +} diff --git a/pkgs/applications/misc/cura/lulzbot/uranium-qt512-support.patch b/pkgs/applications/misc/cura/lulzbot/uranium-qt512-support.patch new file mode 100644 index 00000000000..2c666a98c8f --- /dev/null +++ b/pkgs/applications/misc/cura/lulzbot/uranium-qt512-support.patch @@ -0,0 +1,16 @@ +diff --git a/UM/Qt/Bindings/i18nCatalogProxy.py b/UM/Qt/Bindings/i18nCatalogProxy.py +index 7e2bb16c..cec70dd6 100644 +--- a/UM/Qt/Bindings/i18nCatalogProxy.py ++++ b/UM/Qt/Bindings/i18nCatalogProxy.py +@@ -86,9 +86,9 @@ class i18nCatalogProxy(QObject): # [CodeStyle: Ultimaker code style requires cla + # \todo Move this to a more generic place so more things can use it. + def _wrapFunction(self, engine, this_object, function): + # JavaScript code that wraps the Python method call in a closure +- wrap_js = """function(this_object) {{ ++ wrap_js = """(function(this_object) {{ + return function({args}) {{ return this_object.{function}({args}) }} +- }}""" ++ }})""" + + # Get the function name and argument list. + function_name = function.__name__ diff --git a/pkgs/applications/misc/cura/lulzbot/uranium.nix b/pkgs/applications/misc/cura/lulzbot/uranium.nix new file mode 100644 index 00000000000..43869a0edc6 --- /dev/null +++ b/pkgs/applications/misc/cura/lulzbot/uranium.nix @@ -0,0 +1,41 @@ +{ stdenv, callPackage, fetchurl, fetchgit, buildPythonPackage, fetchFromGitHub, python, cmake +, pyqt5, numpy, scipy, shapely, libarcusLulzbot, doxygen, gettext, pythonOlder }: + +buildPythonPackage rec { + version = "3.6.18"; + pname = "uranium"; + name = "uraniumLulzbot"; + format = "other"; + + src = fetchgit { + url = https://code.alephobjects.com/diffusion/U/uranium.git; + rev = "33df88a7414375ac924ac761113baa48d2ced2b4"; + sha256 = "109cbv7y105crbrzfp70lmcr9n20ap5c97i5qd46fmxbx86yj7f8"; + }; + + disabled = pythonOlder "3.5.0"; + + buildInputs = [ python gettext ]; + propagatedBuildInputs = [ pyqt5 numpy scipy shapely libarcusLulzbot ]; + nativeBuildInputs = [ cmake doxygen ]; + + # Qt 5.12+ support; see https://code.alephobjects.com/rU70b73ba0a270799b9eacf78e400aa8b8ab3fb2ee + patches = [ ./uranium-qt512-support.patch ]; + + postPatch = '' + sed -i 's,/python''${PYTHON_VERSION_MAJOR}/dist-packages,/python''${PYTHON_VERSION_MAJOR}.''${PYTHON_VERSION_MINOR}/site-packages,g' CMakeLists.txt + sed -i \ + -e "s,Resources.addSearchPath(os.path.join(os.path.abspath(os.path.dirname(__file__)).*,Resources.addSearchPath(\"$out/share/uranium/resources\")," \ + -e "s,self._plugin_registry.addPluginLocation(os.path.join(os.path.abspath(os.path.dirname(__file__)).*,self._plugin_registry.addPluginLocation(\"$out/lib/uranium/plugins\")," \ + UM/Application.py + ''; + + meta = with stdenv.lib; { + description = "A Python framework for building Desktop applications"; + homepage = https://code.alephobjects.com/diffusion/U/; + license = licenses.lgpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ chaduffy ]; + }; +} + diff --git a/pkgs/applications/misc/cura/plugins.nix b/pkgs/applications/misc/cura/plugins.nix index a5a196a7810..bdbf8f24136 100644 --- a/pkgs/applications/misc/cura/plugins.nix +++ b/pkgs/applications/misc/cura/plugins.nix @@ -6,13 +6,13 @@ let octoprint = stdenv.mkDerivation rec { pname = "Cura-OctoPrintPlugin"; - version = "3.5.5"; + version = "3.5.8"; src = fetchFromGitHub { owner = "fieldOfView"; repo = pname; - rev = "d05a9a4c1a01c584d5cec4f4b7d170077235467a"; - sha256 = "0ik69g3kbn7rz2wh0cfq9ww8x222kagd8jvsd4xlqgq4yrf0jk7x"; + rev = "46548cbb8d32d10fe3aee12f272d5d8f34271738"; + sha256 = "0pllba8qx1746pnf5ccbkqn2j6f8hhknpgyrrv244ykvigrlczx0"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix index a7339acddee..823e6d6e2e9 100644 --- a/pkgs/applications/misc/curaengine/default.nix +++ b/pkgs/applications/misc/curaengine/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "curaengine-${version}"; - version = "4.1.0"; + version = "4.2.0"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "CuraEngine"; rev = version; - sha256 = "14zy9ir46vndsi4l8kapm6byw02fimm7ava2rfi0kvcckf5yq9w8"; + sha256 = "13hbzsx4fwrbwviyhh8z04gs9b0m8fjl8a31ci7gr2dfdmgjs6pd"; }; nativeBuildInputs = [ cmake ]; @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/Ultimaker/CuraEngine; license = licenses.agpl3; platforms = platforms.linux; - maintainers = with maintainers; [ abbradar ]; + maintainers = with maintainers; [ abbradar gebner ]; }; } diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 3e1a87a641b..82d77b65f66 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "dbeaver-ce-${version}"; - version = "6.1.3"; + version = "6.1.4"; desktopItem = makeDesktopItem { name = "dbeaver"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "1ngfypx0wbq98rv791zls07h46rnj69qixpslw0xn9bb3ky4snbf"; + sha256 = "1l4skcannbzddhm773dm3hwv3a7b3xy569gydcfczgdlgzgmlfjq"; }; installPhase = '' diff --git a/pkgs/applications/misc/firestarter/default.nix b/pkgs/applications/misc/firestarter/default.nix new file mode 100644 index 00000000000..e93d0ab69a7 --- /dev/null +++ b/pkgs/applications/misc/firestarter/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, python3, cudatoolkit, + withCuda ? true +}: + +with stdenv.lib; +stdenv.mkDerivation rec { + pname = "firestarter"; + version = "1.7.3"; + + src = fetchFromGitHub { + owner = "tud-zih-energy"; + repo = "FIRESTARTER"; + rev = "v${version}"; + sha256 = "1gc7kmzx9nw22lyfmpyz72p974jf1hvw5nvszcaq7x6h8cz9ip15"; + }; + + nativeBuildInputs = [ python3 ]; + buildInputs = optionals withCuda [ cudatoolkit ]; + preBuild = '' + mkdir -p build + cd build + python ../code-generator.py ${optionalString withCuda "--enable-cuda"} + ''; + makeFlags = optionals withCuda [ "LINUX_CUDA_PATH=${cudatoolkit}" ]; + enableParallelBuilding = true; + + installPhase = '' + mkdir -p $out/bin + cp FIRESTARTER $out/bin/firestarter + ''; + + meta = with stdenv.lib; { + homepage = https://tu-dresden.de/zih/forschung/projekte/firestarter; + description = "Processor Stress Test Utility"; + platforms = platforms.linux; + maintainers = with maintainers; [ astro ]; + license = licenses.gpl3; + }; +} diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix index edf16f806a6..d4ff7269987 100644 --- a/pkgs/applications/misc/golden-cheetah/default.nix +++ b/pkgs/applications/misc/golden-cheetah/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ stdenv, mkDerivation, fetchurl , qtbase, qtsvg, qtserialport, qtwebkit, qtmultimedia, qttools, qtconnectivity , yacc, flex, zlib, qmake, makeDesktopItem, makeWrapper }: @@ -13,7 +13,7 @@ let comment = "Performance software for cyclists, runners and triathletes"; categories = "Application;Utility;"; }; -in stdenv.mkDerivation rec { +in mkDerivation rec { name = "golden-cheetah-${version}"; version = "3.4"; src = fetchurl { @@ -29,6 +29,9 @@ in stdenv.mkDerivation rec { NIX_LDFLAGS = [ "-lz" ]; + + qtWrapperArgs = [ "--set LD_LIBRARY_PATH ${zlib.out}/lib" ]; + preConfigure = '' cp src/gcconfig.pri.in src/gcconfig.pri cp qwt/qwtconfig.pri.in qwt/qwtconfig.pri @@ -40,7 +43,6 @@ in stdenv.mkDerivation rec { mkdir -p $out/bin cp src/GoldenCheetah $out/bin - wrapProgram $out/bin/GoldenCheetah --set LD_LIBRARY_PATH "${zlib.out}/lib" install -Dm644 "${desktopItem}/share/applications/"* -t $out/share/applications/ install -Dm644 src/Resources/images/gc.png $out/share/pixmaps/goldencheetah.png diff --git a/pkgs/applications/misc/gollum/Gemfile.lock b/pkgs/applications/misc/gollum/Gemfile.lock index 9a12ba2bfd5..6cd77318754 100644 --- a/pkgs/applications/misc/gollum/Gemfile.lock +++ b/pkgs/applications/misc/gollum/Gemfile.lock @@ -36,7 +36,7 @@ GEM mime-types-data (3.2019.0331) mini_portile2 (2.4.0) mustache (0.99.8) - nokogiri (1.10.3) + nokogiri (1.10.4) mini_portile2 (~> 2.4.0) posix-spawn (0.3.13) rack (1.6.11) diff --git a/pkgs/applications/misc/gollum/gemset.nix b/pkgs/applications/misc/gollum/gemset.nix index 6de5553ac7c..f9bdf94db17 100644 --- a/pkgs/applications/misc/gollum/gemset.nix +++ b/pkgs/applications/misc/gollum/gemset.nix @@ -151,10 +151,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02bjydih0j515szfv9mls195cvpyidh6ixm7dwbl3s2sbaxxk5s4"; + sha256 = "0nmdrqqz1gs0fwkgzxjl4wr554gr8dc1fkrqjc2jpsvwgm41rygv"; type = "gem"; }; - version = "1.10.3"; + version = "1.10.4"; }; posix-spawn = { groups = ["default"]; diff --git a/pkgs/applications/misc/gsctl/default.nix b/pkgs/applications/misc/gsctl/default.nix new file mode 100644 index 00000000000..b84053b94ad --- /dev/null +++ b/pkgs/applications/misc/gsctl/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + pname = "gsctl"; + version = "0.15.4"; + + goPackagePath = "github.com/giantswarm/gsctl"; + + src = fetchFromGitHub { + owner = "giantswarm"; + repo = pname; + rev = version; + sha256 = "0s5bli08wfd9xszx3kc90k51vlgjc00r0qg4mikb6qdc4pxpgsxj"; + }; + + meta = with stdenv.lib; { + description = "The Giant Swarm command line interface"; + homepage = https://github.com/giantswarm/gsctl; + license = licenses.asl20; + maintainers = with maintainers; [ joesalisbury ]; + }; +} diff --git a/pkgs/applications/misc/hstr/default.nix b/pkgs/applications/misc/hstr/default.nix index 1eae8c57fc4..7cdf1a319f6 100644 --- a/pkgs/applications/misc/hstr/default.nix +++ b/pkgs/applications/misc/hstr/default.nix @@ -1,15 +1,29 @@ -{ stdenv, fetchurl, readline, ncurses }: +{ stdenv, fetchFromGitHub, readline, ncurses +, autoreconfHook, pkgconfig, gettext }: stdenv.mkDerivation rec { name = "hstr-${version}"; - version = "1.25"; + version = "2.0"; - src = fetchurl { - url = "https://github.com/dvorka/hstr/releases/download/${version}/hh-${version}-src.tgz"; - sha256 = "10njj0a3s5czv497wk3whka3gxr7vmhabs12vaw7kgb07h4ssnhg"; + src = fetchFromGitHub { + owner = "dvorka"; + repo = "hstr"; + rev = version; + sha256 = "1y9vsfbg07gbic0daqy569d9pb9i1d07fym3q7a0a99hbng85s20"; }; - buildInputs = [ readline ncurses ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ readline ncurses gettext ]; + + configurePhase = '' + autoreconf -fvi + ./configure + ''; + + installPhase = '' + mkdir -p $out/bin/ + mv src/hstr $out/bin/ + ''; meta = { homepage = https://github.com/dvorka/hstr; diff --git a/pkgs/applications/misc/jekyll/basic/Gemfile.lock b/pkgs/applications/misc/jekyll/basic/Gemfile.lock index 7954b6dc03e..00088aef8ad 100644 --- a/pkgs/applications/misc/jekyll/basic/Gemfile.lock +++ b/pkgs/applications/misc/jekyll/basic/Gemfile.lock @@ -17,7 +17,7 @@ GEM ffi (1.11.1) forwardable-extended (2.6.0) gemoji (3.0.1) - html-pipeline (2.11.0) + html-pipeline (2.12.0) activesupport (>= 2) nokogiri (>= 1.4) http_parser.rb (0.6.0) @@ -36,8 +36,8 @@ GEM pathutil (~> 0.9) rouge (>= 1.7, < 4) safe_yaml (~> 1.0) - jekyll-avatar (0.6.0) - jekyll (~> 3.0) + jekyll-avatar (0.7.0) + jekyll (>= 3.0, < 5.0) jekyll-mentions (1.5.1) html-pipeline (~> 2.3) jekyll (>= 3.7, < 5.0) @@ -49,7 +49,7 @@ GEM jekyll (>= 3.7, < 5.0) jekyll-watch (2.2.1) listen (~> 3.0) - jemoji (0.11.0) + jemoji (0.11.1) gemoji (~> 3.0) html-pipeline (~> 2.2) jekyll (>= 3.0, < 5.0) @@ -62,7 +62,7 @@ GEM mercenary (0.3.6) mini_portile2 (2.4.0) minitest (5.11.3) - nokogiri (1.10.3) + nokogiri (1.10.4) mini_portile2 (~> 2.4.0) pathutil (0.16.2) forwardable-extended (~> 2.6) @@ -70,7 +70,7 @@ GEM rb-fsevent (0.10.3) rb-inotify (0.10.0) ffi (~> 1.0) - rouge (3.5.1) + rouge (3.8.0) ruby_dep (1.5.0) safe_yaml (1.0.5) sass (3.7.4) diff --git a/pkgs/applications/misc/jekyll/basic/gemset.nix b/pkgs/applications/misc/jekyll/basic/gemset.nix index 741b5e2a069..1107ba745fd 100644 --- a/pkgs/applications/misc/jekyll/basic/gemset.nix +++ b/pkgs/applications/misc/jekyll/basic/gemset.nix @@ -98,10 +98,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14659ap360gzmrxl8mb28ys6mld7xw3q4q7pqy0l1cn67szdq779"; + sha256 = "0f7x70p3fda7i5wfjjljjgjgqwx8m12345bs4xpnh7fhnis42fkk"; type = "gem"; }; - version = "2.11.0"; + version = "2.12.0"; }; "http_parser.rb" = { groups = ["default"]; @@ -141,10 +141,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "124624r83pmn7sp2idnsph9m1bbdiha5jnza4ypna8w2inpih51p"; + sha256 = "03bys2pl60vq92skfhlfqr2j68zhfjc86jffpg32f94wzjk8n0wk"; type = "gem"; }; - version = "0.6.0"; + version = "0.7.0"; }; jekyll-mentions = { dependencies = ["html-pipeline" "jekyll"]; @@ -207,10 +207,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x463l6a8ikaf6pzap0dgh4gfvlkx56g6kdasj9jfb1ld3fvl99k"; + sha256 = "1yd77r5jvh9chf5qcp6z63gg40yp5n1sr7nv1hlmbq3xjzlhs6h6"; type = "gem"; }; - version = "0.11.0"; + version = "0.11.1"; }; kramdown = { groups = ["default"]; @@ -279,10 +279,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02bjydih0j515szfv9mls195cvpyidh6ixm7dwbl3s2sbaxxk5s4"; + sha256 = "0nmdrqqz1gs0fwkgzxjl4wr554gr8dc1fkrqjc2jpsvwgm41rygv"; type = "gem"; }; - version = "1.10.3"; + version = "1.10.4"; }; pathutil = { dependencies = ["forwardable-extended"]; @@ -331,10 +331,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yfhazlhjc4abgzhkgq8zqmdphvkh52211widkl4zhsbhqh8wg2q"; + sha256 = "10cyx03qjdajkkr1gfqhah4n632ma8k8g6hcf0c60pfp6iii8ffs"; type = "gem"; }; - version = "3.5.1"; + version = "3.8.0"; }; ruby_dep = { groups = ["default"]; diff --git a/pkgs/applications/misc/jekyll/full/Gemfile.lock b/pkgs/applications/misc/jekyll/full/Gemfile.lock index 7baf6a45fc5..7b9b74ef1b7 100644 --- a/pkgs/applications/misc/jekyll/full/Gemfile.lock +++ b/pkgs/applications/misc/jekyll/full/Gemfile.lock @@ -28,7 +28,7 @@ GEM ffi (1.11.1) forwardable-extended (2.6.0) gemoji (3.0.1) - html-pipeline (2.11.0) + html-pipeline (2.12.0) activesupport (>= 2) nokogiri (>= 1.4) http_parser.rb (0.6.0) @@ -47,8 +47,8 @@ GEM pathutil (~> 0.9) rouge (>= 1.7, < 4) safe_yaml (~> 1.0) - jekyll-avatar (0.6.0) - jekyll (~> 3.0) + jekyll-avatar (0.7.0) + jekyll (>= 3.0, < 5.0) jekyll-coffeescript (1.2.2) coffee-script (~> 2.2) coffee-script-source (~> 1.12) @@ -70,7 +70,7 @@ GEM jekyll (>= 3.7, < 5.0) jekyll-watch (2.2.1) listen (~> 3.0) - jemoji (0.11.0) + jemoji (0.11.1) gemoji (~> 3.0) html-pipeline (~> 2.2) jekyll (>= 3.0, < 5.0) @@ -90,7 +90,7 @@ GEM minitest (5.11.3) multi_json (1.13.1) multipart-post (2.1.1) - nokogiri (1.10.3) + nokogiri (1.10.4) mini_portile2 (~> 2.4.0) octokit (4.14.0) sawyer (~> 0.8.0, >= 0.5.3) @@ -104,8 +104,8 @@ GEM ffi (~> 1.0) rdiscount (2.2.0.1) rdoc (6.1.1) - redcarpet (3.4.0) - rouge (3.5.1) + redcarpet (3.5.0) + rouge (3.8.0) ruby_dep (1.5.0) safe_yaml (1.0.5) sass (3.7.4) diff --git a/pkgs/applications/misc/jekyll/full/gemset.nix b/pkgs/applications/misc/jekyll/full/gemset.nix index 63209d4ff45..917ba51caab 100644 --- a/pkgs/applications/misc/jekyll/full/gemset.nix +++ b/pkgs/applications/misc/jekyll/full/gemset.nix @@ -195,10 +195,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14659ap360gzmrxl8mb28ys6mld7xw3q4q7pqy0l1cn67szdq779"; + sha256 = "0f7x70p3fda7i5wfjjljjgjgqwx8m12345bs4xpnh7fhnis42fkk"; type = "gem"; }; - version = "2.11.0"; + version = "2.12.0"; }; "http_parser.rb" = { groups = ["default"]; @@ -238,10 +238,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "124624r83pmn7sp2idnsph9m1bbdiha5jnza4ypna8w2inpih51p"; + sha256 = "03bys2pl60vq92skfhlfqr2j68zhfjc86jffpg32f94wzjk8n0wk"; type = "gem"; }; - version = "0.6.0"; + version = "0.7.0"; }; jekyll-coffeescript = { dependencies = ["coffee-script" "coffee-script-source"]; @@ -358,10 +358,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x463l6a8ikaf6pzap0dgh4gfvlkx56g6kdasj9jfb1ld3fvl99k"; + sha256 = "1yd77r5jvh9chf5qcp6z63gg40yp5n1sr7nv1hlmbq3xjzlhs6h6"; type = "gem"; }; - version = "0.11.0"; + version = "0.11.1"; }; kramdown = { groups = ["default"]; @@ -518,10 +518,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02bjydih0j515szfv9mls195cvpyidh6ixm7dwbl3s2sbaxxk5s4"; + sha256 = "0nmdrqqz1gs0fwkgzxjl4wr554gr8dc1fkrqjc2jpsvwgm41rygv"; type = "gem"; }; - version = "1.10.3"; + version = "1.10.4"; }; octokit = { dependencies = ["sawyer"]; @@ -648,20 +648,20 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0h9qz2hik4s9knpmbwrzb3jcp3vc5vygp9ya8lcpl7f1l9khmcd7"; + sha256 = "0skcyx1h8b5ms0rp2zm3ql6g322b8c1adnkwkqyv7z3kypb4bm7k"; type = "gem"; }; - version = "3.4.0"; + version = "3.5.0"; }; rouge = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yfhazlhjc4abgzhkgq8zqmdphvkh52211widkl4zhsbhqh8wg2q"; + sha256 = "10cyx03qjdajkkr1gfqhah4n632ma8k8g6hcf0c60pfp6iii8ffs"; type = "gem"; }; - version = "3.5.1"; + version = "3.8.0"; }; ruby_dep = { groups = ["default"]; diff --git a/pkgs/applications/misc/kdeconnect/default.nix b/pkgs/applications/misc/kdeconnect/default.nix index d3905c8d3ea..ed3c8672269 100644 --- a/pkgs/applications/misc/kdeconnect/default.nix +++ b/pkgs/applications/misc/kdeconnect/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ mkDerivation , lib , fetchurl , extra-cmake-modules @@ -18,13 +18,13 @@ , kwayland }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "kdeconnect"; - version = "1.3.4"; + version = "1.3.5"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/${pname}-kde-${version}.tar.xz"; - sha256 = "12ijvp86wm6k81dggypxh3c0dmwg5mczxy43ra8rgv63aavmf42h"; + sha256 = "02lr3xx5s2mgddac4n3lkgr7ppf1z5m6ajs90rjix0vs8a271kp5"; }; buildInputs = [ diff --git a/pkgs/applications/misc/menumaker/default.nix b/pkgs/applications/misc/menumaker/default.nix index 56854e7863f..718f2e46fa0 100644 --- a/pkgs/applications/misc/menumaker/default.nix +++ b/pkgs/applications/misc/menumaker/default.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { name = "menumaker-${version}"; - version = "0.99.10"; + version = "0.99.11"; src = fetchurl { url = "mirror://sourceforge/menumaker/${name}.tar.gz"; - sha256 = "1mm4cvg3kphkkd8nwrhcg6d9nm5ar7mgc0wf6fxk6zck1l7xn8ky"; + sha256 = "0dprndnhwm7b803zkp4pisiq06ic9iv8vr42in5is47jmvdim0wx"; }; format = "other"; diff --git a/pkgs/applications/misc/notejot/default.nix b/pkgs/applications/misc/notejot/default.nix index a732a5ed536..b359088d6ba 100644 --- a/pkgs/applications/misc/notejot/default.nix +++ b/pkgs/applications/misc/notejot/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchFromGitHub, pkgconfig, meson, ninja, python3, pantheon -, gtk3, gtksourceview, json-glib, gnome3, wrapGAppsHook }: +, gtk3, gtksourceview, json-glib, libgee, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "notejot"; - version = "1.5.5"; + version = "1.5.8"; src = fetchFromGitHub { owner = "lainsce"; repo = pname; rev = version; - sha256 = "0khf6mwidybfgnq4zmhf3af4w6aicipmi12fvs722fqlf1lrkdmd"; + sha256 = "1v7f4xy5iwdjyf4416qpiwzifi68n466faia1hxzsq18fb1ri0af"; }; nativeBuildInputs = [ @@ -22,16 +22,15 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gnome3.libgee gtk3 gtksourceview json-glib + libgee pantheon.elementary-icon-theme pantheon.granite ]; postPatch = '' - chmod +x meson/post_install.py patchShebangs meson/post_install.py ''; diff --git a/pkgs/applications/misc/qMasterPassword/default.nix b/pkgs/applications/misc/qMasterPassword/default.nix index e0a1e33dc62..97751127342 100644 --- a/pkgs/applications/misc/qMasterPassword/default.nix +++ b/pkgs/applications/misc/qMasterPassword/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, qtbase, qmake, libX11, libXtst, openssl, libscrypt }: +{ stdenv, mkDerivation, fetchFromGitHub, qtbase, qmake, libX11, libXtst, openssl, libscrypt }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "qMasterPassword"; version = "1.2.2"; diff --git a/pkgs/applications/misc/qdirstat/default.nix b/pkgs/applications/misc/qdirstat/default.nix index a45f12293fd..4d204021247 100644 --- a/pkgs/applications/misc/qdirstat/default.nix +++ b/pkgs/applications/misc/qdirstat/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchFromGitHub, qmake , coreutils, xdg_utils, bash -, makeWrapper, perlPackages }: +, makeWrapper, perlPackages, mkDerivation }: let - version = "1.5.90"; -in stdenv.mkDerivation rec { + version = "1.6"; +in mkDerivation rec { name = "qdirstat-${version}"; src = fetchFromGitHub { owner = "shundhammer"; repo = "qdirstat"; rev = "${version}"; - sha256 = "161jzii5p0dflbpixibn3yhp13smjf6aw802rz1q4879s12gqdq6"; + sha256 = "0q4ccjmlbqifg251kyxwys8wspdskr8scqhacyfrs9cmnjxcjqan"; }; nativeBuildInputs = [ qmake makeWrapper ]; diff --git a/pkgs/applications/misc/qlandkartegt/default.nix b/pkgs/applications/misc/qlandkartegt/default.nix new file mode 100644 index 00000000000..ae0fd61c33d --- /dev/null +++ b/pkgs/applications/misc/qlandkartegt/default.nix @@ -0,0 +1,91 @@ +{ mkDerivation, lib, fetchurl, fetchpatch, cmake +, qtmultimedia, qtserialport, qtscript, qtwebkit +, garmindev, gdal, gpsd, libdmtx, libexif, libGLU, proj }: + +mkDerivation rec { + name = "qlandkartegt-${version}"; + version = "1.8.1"; + + src = fetchurl { + url = "https://bitbucket.org/maproom/qlandkarte-gt/downloads/${name}.tar.gz"; + sha256 = "1rwv5ar5jv15g1cc6pp0lk69q3ip10pjazsh3ds2ggaciymha1ly"; + }; + + patches = [ + (fetchpatch { + url = "https://aur.archlinux.org/cgit/aur.git/plain/fix-gps_read.patch?h=qlandkartegt"; + sha256 = "1xyqxdqxwviq7b8jjxssxjlkldk01ms8dzqdjgvjs8n3fh7w0l70"; + }) + (fetchpatch { + url = "https://aur.archlinux.org/cgit/aur.git/plain/fix-incomplete-type.patch?h=qlandkartegt"; + sha256 = "1q7rm321az3q6pq5mq0yjrihxl9sf3nln9z3xp20g9qldslv2cy2"; + }) + (fetchpatch { + url = "https://aur.archlinux.org/cgit/aur.git/plain/fix-proj_api.patch?h=qlandkartegt"; + sha256 = "12yibxn85z2n30azmhyv02q091jj5r50nlnjq4gfzyqd3xb9582n"; + }) + (fetchpatch { + url = "https://aur.archlinux.org/cgit/aur.git/plain/fix-qt5-build.patch?h=qlandkartegt"; + sha256 = "1wq2hr06gzq8m7zddh10vizmvpwp4lcy1g86rlpppvdc5cm3jpkl"; + }) + (fetchpatch { + url = "https://aur.archlinux.org/cgit/aur.git/plain/fix-qtgui-include.patch?h=qlandkartegt"; + sha256 = "16hql8ignzw4n1hlp4icbvaddqcadh2rjns0bvis720535112sc8"; + }) + (fetchpatch { + url = "https://aur.archlinux.org/cgit/aur.git/plain/fix-ver_str.patch?h=qlandkartegt"; + sha256 = "13fg05gqrjfa9j00lrqz1b06xf6r5j01kl6l06vkn0hz1jzxss5m"; + }) + (fetchpatch { + url = "https://aur.archlinux.org/cgit/aur.git/plain/improve-gpx-creator.patch?h=qlandkartegt"; + sha256 = "1sdf5z8qrd43azrhwfw06zc0qr48z925hgbcfqlp0xrsxv2n6kks"; + }) + (fetchpatch { + url = "https://aur.archlinux.org/cgit/aur.git/plain/improve-gpx-name.patch?h=qlandkartegt"; + sha256 = "10phafhns79i3rl4zpc7arw11x46cywgkdkxm7gw1i9y5h0cal79"; + }) + ]; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + qtmultimedia qtserialport qtscript qtwebkit + garmindev gdal gpsd libdmtx libexif libGLU proj + ]; + + cmakeFlags = [ + "-DQK_QT5_PORT=ON" + "-DEXIF_LIBRARIES=${libexif}/lib/libexif.so" + "-DEXIF_INCLUDE_DIRS=${libexif}/include" + ]; + + enableParallelBuilding = true; + + postPatch = '' + substituteInPlace ConfigureChecks.cmake \ + --replace \$\{PLUGIN_INSTALL_DIR\} "${garmindev}/lib/qlandkartegt" + ''; + + postInstall = '' + mkdir -p $out/share/mime/packages + cat << EOF > $out/share/mime/packages/qlandkartegt.xml + <mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'> + <mime-type type="application/vnd.qlandkartegt.qlb"> + <comment>QLandkarteGT File</comment> + <glob pattern="*.qlb"/> + </mime-type> + </mime-info> + EOF + ''; + + meta = with lib; { + homepage = http://www.qlandkarte.org/; + description = '' + QLandkarte GT is the ultimate outdoor aficionado's tool. + It supports GPS maps in GeoTiff format as well as Garmin's img vector map format. + ''; + license = licenses.gpl2; + maintainers = with maintainers; [ sikmir ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/applications/misc/qlandkartegt/garmindev.nix b/pkgs/applications/misc/qlandkartegt/garmindev.nix new file mode 100644 index 00000000000..f12a3021a19 --- /dev/null +++ b/pkgs/applications/misc/qlandkartegt/garmindev.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, cmake, libusb }: + +stdenv.mkDerivation rec { + name = "garmindev-${version}"; + version = "0.3.4"; + + src = fetchurl { + url = "https://bitbucket.org/maproom/qlandkarte-gt/downloads/${name}.tar.gz"; + sha256 = "1mc7rxdn9790pgbvz02xzipxp2dp9h4hfq87xgawa18sp9jqzhw6"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ libusb ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = http://www.qlandkarte.org/; + description = "Garmin Device Drivers for QlandkarteGT"; + license = licenses.gpl2; + maintainers = with maintainers; [ sikmir ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/misc/qmapshack/default.nix b/pkgs/applications/misc/qmapshack/default.nix index f7a8bc0e3a1..99a0acbcc8c 100644 --- a/pkgs/applications/misc/qmapshack/default.nix +++ b/pkgs/applications/misc/qmapshack/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { name = "qmapshack-${version}"; - version = "1.13.0"; + version = "1.13.1"; src = fetchurl { url = "https://bitbucket.org/maproom/qmapshack/downloads/${name}.tar.gz"; - sha256 = "1cv1f718r8vqyk2l6w3alz2aqjvb4msz8705pm9yr5ndi28qyrba"; + sha256 = "15x1b2q0hr1vx006f9hjc4cvfjvxvfdwybw32qvczdyc3crq0mc9"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/qpdfview/default.nix b/pkgs/applications/misc/qpdfview/default.nix index 263bc37660c..81aa18c9f24 100644 --- a/pkgs/applications/misc/qpdfview/default.nix +++ b/pkgs/applications/misc/qpdfview/default.nix @@ -1,22 +1,23 @@ -{stdenv, fetchurl, qmake, qtbase, qtsvg, pkgconfig, poppler, djvulibre, libspectre, cups +{stdenv, mkDerivation, fetchurl, qmake, qtbase, qtsvg, pkgconfig, poppler, djvulibre, libspectre, cups , file, ghostscript }: let s = # Generated upstream information rec { baseName="qpdfview"; - version = "0.4.16"; + version = "0.4.18"; name="${baseName}-${version}"; url="https://launchpad.net/qpdfview/trunk/${version}/+download/qpdfview-${version}.tar.gz"; - sha256 = "0zysjhr58nnmx7ba01q3zvgidkgcqxjdj4ld3gx5fc7wzvl1dm7s"; + sha256 = "0v1rl126hvblajnph2hkansgi0s8vjdc5yxrm4y3faa0lxzjwr6c"; }; nativeBuildInputs = [ qmake pkgconfig ]; buildInputs = [ qtbase qtsvg poppler djvulibre libspectre cups file ghostscript ]; in -stdenv.mkDerivation { - inherit (s) name version; +mkDerivation { + pname = s.baseName; + inherit (s) version; inherit nativeBuildInputs buildInputs; src = fetchurl { inherit (s) url sha256; diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix index 15cd426f1b3..462114ed272 100644 --- a/pkgs/applications/misc/qtpass/default.nix +++ b/pkgs/applications/misc/qtpass/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, git, gnupg, pass, qtbase, qtsvg, qttools, qmake, makeWrapper }: +{ stdenv, mkDerivation, fetchFromGitHub, git, gnupg, pass, qtbase, qtsvg, qttools, qmake, makeWrapper }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "qtpass"; version = "1.2.3"; @@ -17,13 +17,15 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + qtWrapperArgs = [ + "--suffix PATH : ${git}/bin" + "--suffix PATH : ${gnupg}/bin" + "--suffix PATH : ${pass}/bin" + ]; + postInstall = '' install -D qtpass.desktop $out/share/applications/qtpass.desktop install -D artwork/icon.svg $out/share/icons/hicolor/scalable/apps/qtpass-icon.svg - wrapProgram $out/bin/qtpass \ - --suffix PATH : ${git}/bin \ - --suffix PATH : ${gnupg}/bin \ - --suffix PATH : ${pass}/bin ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/sequeler/default.nix b/pkgs/applications/misc/sequeler/default.nix index 4947bcf60bd..764e6c0048e 100644 --- a/pkgs/applications/misc/sequeler/default.nix +++ b/pkgs/applications/misc/sequeler/default.nix @@ -11,13 +11,13 @@ let in stdenv.mkDerivation rec { pname = "sequeler"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "Alecaddd"; repo = pname; rev = "v${version}"; - sha256 = "1x2ikagjsgnhhhwkj09ihln17mq4wjq3wwbnf02j2p3jpp4i8w1i"; + sha256 = "1803bhw20vb6w4s9phab95mgi2n0g30n57mc07h3xg3p114qxwir"; }; nativeBuildInputs = [ meson ninja pkgconfig pantheon.vala gettext wrapGAppsHook python3 desktop-file-utils ]; diff --git a/pkgs/applications/misc/tilix/default.nix b/pkgs/applications/misc/tilix/default.nix index 342eca0a6fd..65d01a5649d 100644 --- a/pkgs/applications/misc/tilix/default.nix +++ b/pkgs/applications/misc/tilix/default.nix @@ -1,51 +1,83 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, dmd, gnome3, dbus -, gsettings-desktop-schemas, desktop-file-utils, gettext, gtkd, libsecret -, glib, perlPackages, wrapGAppsHook, xdg_utils }: +{ stdenv +, fetchFromGitHub +, fetchpatch +, meson +, ninja +, python3 +, pkgconfig +, dmd +, gnome3 +, dbus +, gsettings-desktop-schemas +, desktop-file-utils +, gettext +, gtkd +, libsecret +, glib +, wrapGAppsHook +, libunwind +}: stdenv.mkDerivation rec { pname = "tilix"; - version = "1.9.3"; + version = "unstable-2019-08-03"; src = fetchFromGitHub { owner = "gnunn1"; repo = "tilix"; - rev = version; - sha256 = "0mg9y4xd2pnv0smibg7dyy733jarvx6qpdqap3sj7fpyni0jvpph"; + rev = "09ec4e8e113703ca795946d8d2a83091e7b741e4"; + sha256 = "1vvp6l25xygzhbhscg8scik8y59nl8a92ri024ijk0c0lclga05m"; }; + # Default upstream else LDC fails to link + mesonBuildType = [ + "debugoptimized" + ]; + nativeBuildInputs = [ - autoreconfHook dmd desktop-file-utils perlPackages.Po4a pkgconfig xdg_utils + desktop-file-utils + dmd + meson + ninja + pkgconfig + python3 wrapGAppsHook ]; - buildInputs = [ gnome3.dconf gettext gsettings-desktop-schemas gtkd dbus libsecret ]; + buildInputs = [ + dbus + gettext + gnome3.dconf + gsettings-desktop-schemas + gtkd + libsecret + libunwind + ]; - preBuild = '' - makeFlagsArray=( - DCFLAGS='-O -inline -release -version=StdLoggerDisableTrace' - ) - ''; + patches = [ + # Depends on libsecret optionally + # https://github.com/gnunn1/tilix/pull/1745 + (fetchpatch { + url = "https://github.com/gnunn1/tilix/commit/e38dd182bfb92419d70434926ef9c0530189aab8.patch"; + sha256 = "1ws4iyzi67crzlp9p7cw8jr752b3phcg5ymx5aj0bh6321g38kfk"; + }) + ]; - postInstall = '' - ${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas + postPatch = '' + chmod +x meson_post_install.py + patchShebangs meson_post_install.py ''; preFixup = '' - gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH ":" "${libsecret}/lib") - substituteInPlace $out/share/applications/com.gexperts.Tilix.desktop \ --replace "Exec=tilix" "Exec=$out/bin/tilix" - - # TODO: Won't be needed after the switch to Meson - substituteInPlace $out/share/dbus-1/services/com.gexperts.Tilix.service \ - --replace "/usr/bin/tilix" "$out/bin/tilix" ''; meta = with stdenv.lib; { description = "Tiling terminal emulator following the Gnome Human Interface Guidelines"; homepage = https://gnunn1.github.io/tilix-web; license = licenses.mpl20; - maintainers = with maintainers; [ midchildan ]; + maintainers = with maintainers; [ midchildan worldofpeace ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/toot/default.nix b/pkgs/applications/misc/toot/default.nix index 6079c8807dc..df9ed897370 100644 --- a/pkgs/applications/misc/toot/default.nix +++ b/pkgs/applications/misc/toot/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { - version = "0.21.0"; + version = "0.22.0"; name = "toot-${version}"; src = fetchFromGitHub { owner = "ihabunek"; repo = "toot"; rev = "${version}"; - sha256 = "03s81i9rz7dn33r13p7j2c7yw874hkm64x7myddiqw9lc21fyzql"; + sha256 = "11dgz082shxpbsxr4i41as040cfqinm5lbcg3bmsxqvc4hsz2nr5"; }; checkInputs = with python3Packages; [ pytest ]; diff --git a/pkgs/applications/misc/tzupdate/default.nix b/pkgs/applications/misc/tzupdate/default.nix index c887876634f..ae418544132 100644 --- a/pkgs/applications/misc/tzupdate/default.nix +++ b/pkgs/applications/misc/tzupdate/default.nix @@ -5,11 +5,11 @@ let in buildPythonApplication rec { pname = "tzupdate"; - version = "1.4.0"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "1sc3z2bx2nhnxg82x0jy19pr8lw56chbr90c2lr11w495csqwhz7"; + sha256 = "13np40h64bgkcj10qw6f4nb51p47bb20fd6pzxq8xbr645a4d34m"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/applications/misc/ulauncher/default.nix index 12cf96580f7..3db6f6ae565 100644 --- a/pkgs/applications/misc/ulauncher/default.nix +++ b/pkgs/applications/misc/ulauncher/default.nix @@ -57,7 +57,7 @@ python27Packages.buildPythonApplication rec { checkInputs = with python27Packages; [ mock - pytest_3 + pytest pytest-mock pytestpep8 xvfb_run diff --git a/pkgs/applications/misc/verbiste/default.nix b/pkgs/applications/misc/verbiste/default.nix index f23862c63cd..05862444556 100644 --- a/pkgs/applications/misc/verbiste/default.nix +++ b/pkgs/applications/misc/verbiste/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "verbiste-${version}"; - version = "0.1.45"; + version = "0.1.46"; src = fetchurl { url = "https://perso.b2b2c.ca/~sarrazip/dev/${name}.tar.gz"; - sha256 = "180zyhdjspp7lk2291wsqs6bm7y27r7bd00447iimmjpx372s22c"; + sha256 = "13l8b8mbkdds955sn42hzrjzj48lg1drpd7vhpcjxadckbvlh1p0"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/misc/vifm/default.nix b/pkgs/applications/misc/vifm/default.nix index 9696ebac98b..81563254abd 100644 --- a/pkgs/applications/misc/vifm/default.nix +++ b/pkgs/applications/misc/vifm/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - name = "vifm-${version}"; - version = "0.10"; + pname = "vifm"; + version = "0.10.1"; src = fetchurl { url = "https://github.com/vifm/vifm/releases/download/v${version}/vifm-${version}.tar.bz2"; - sha256 = "1f380xcyjnm4xmcdazs6dj064bwddhywvn3mgm36k7r7b2gnjnp0"; + sha256 = "0fyhxh7ndjn8fyjhj14ymkr3pjcs3k1xbs43g7xvvq85vdb6y04r"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/misc/wtf/default.nix b/pkgs/applications/misc/wtf/default.nix index 02fc2f3a575..07538f749e8 100644 --- a/pkgs/applications/misc/wtf/default.nix +++ b/pkgs/applications/misc/wtf/default.nix @@ -1,20 +1,29 @@ -{ buildGoPackage +{ buildGoModule , fetchFromGitHub , lib }: -buildGoPackage rec { +buildGoModule rec { pname = "wtf"; - version = "0.17.1"; + version = "0.19.1"; src = fetchFromGitHub { owner = "wtfutil"; repo = pname; rev = "v${version}"; - sha256 = "1qiwl6z5rraspjqry8dwnx8fgl9vv70sn5kgvh8074vl651yjq8c"; + sha256 = "19qzg5blqm5p7rrnaqh4f9aj53i743mawjnd1h9lfahbgmil1d24"; }; - goPackagePath = "github.com/wtfutil/wtf"; + modSha256 = "1q21pc4yyiq4dihsb9n7261ssj52nnik8dq6fg4gvlnnpgcjp570"; + + # As per https://github.com/wtfutil/wtf/issues/501, one of the + # dependencies can't be fetched, so vendored dependencies should + # be used instead + modBuildPhase = '' + runHook preBuild + make build -mod=vendor + runHook postBuild + ''; meta = with lib; { description = "The personal information dashboard for your terminal"; diff --git a/pkgs/applications/misc/xmr-stak/default.nix b/pkgs/applications/misc/xmr-stak/default.nix index fcd4ebfbeed..be42127e254 100644 --- a/pkgs/applications/misc/xmr-stak/default.nix +++ b/pkgs/applications/misc/xmr-stak/default.nix @@ -12,13 +12,13 @@ in stdenv'.mkDerivation rec { name = "xmr-stak-${version}"; - version = "2.10.5"; + version = "2.10.7"; src = fetchFromGitHub { owner = "fireice-uk"; repo = "xmr-stak"; rev = "${version}"; - sha256 = "16b6bj0rsr3cq9x3gxm54j197827d8lnfk7ghfjmaf7qa3q08adx"; + sha256 = "1p8hx8gwnv7a49pffq1xmzmrfi3gs6dyra9dn2xi7cl75yn9kfhm"; }; NIX_CFLAGS_COMPILE = "-O3"; @@ -40,6 +40,7 @@ stdenv'.mkDerivation rec { description = "Unified All-in-one Monero miner"; homepage = "https://github.com/fireice-uk/xmr-stak"; license = licenses.gpl3Plus; + platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ fpletz bfortz ]; }; } diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix index 9afe3cae07b..6e421be9302 100644 --- a/pkgs/applications/misc/xmrig/default.nix +++ b/pkgs/applications/misc/xmrig/default.nix @@ -1,20 +1,20 @@ -{ stdenv, lib, fetchFromGitHub, cmake, libuv, libmicrohttpd, openssl +{ stdenv, lib, fetchFromGitHub, cmake, libuv, libmicrohttpd, openssl, hwloc , donateLevel ? 0 }: stdenv.mkDerivation rec { name = "xmrig-${version}"; - version = "2.14.4"; + version = "3.0.0"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig"; rev = "v${version}"; - sha256 = "0hmla9ys9gmmcrmkidw05ygiz734rs7skb9w86jnwxi5nlpxqrhj"; + sha256 = "1m0rsjb7y1j77mzg5cqb3fdvzgvjkrwgmkjn9nv1xl2757z8hcl4"; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ libuv libmicrohttpd openssl ]; + buildInputs = [ libuv libmicrohttpd openssl hwloc ]; postPatch = '' substituteInPlace src/donate.h \ @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/xmrig/xmrig"; license = licenses.gpl3Plus; platforms = [ "x86_64-linux" "x86_64-darwin" ]; - maintainers = with maintainers; [ fpletz ]; + maintainers = with maintainers; [ fpletz kim0 ]; }; } diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix index 61aab18bc76..60231350edb 100644 --- a/pkgs/applications/misc/xterm/default.nix +++ b/pkgs/applications/misc/xterm/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - name = "xterm-347"; + name = "xterm-348"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/xterm/${name}.tgz" "https://invisible-mirror.net/archives/xterm/${name}.tgz" ]; - sha256 = "025r22vi5s0328ybhcj0g9js64vabr98hlw8ngy6vyby4zhp63s0"; + sha256 = "1gkmj9v44xg4jahivhnpbmq22w1mwclr6fssv3lhssgkvchm27wb"; }; buildInputs = diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 3603e1605f9..dcf3224e207 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -82,11 +82,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "0.65.118"; + version = "0.67.123"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "13bihzf4yfgn01nrw780swhmcdh8gq71jqilhbi04jn1h1pbm3wg"; + sha256 = "00kpysk84xwmlwziq7pjizmi2ljgiq45l1x743qkfflxlh0pj21m"; }; dontConfigure = true; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 3e63389be02..45c12598512 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -13,7 +13,7 @@ , bison, gperf , glib, gtk3, dbus-glib , glibc -, libXScrnSaver, libXcursor, libXtst, libGLU_combined +, libXScrnSaver, libXcursor, libXtst, libGLU_combined, libGL , protobuf, speechd, libXdamage, cups , ffmpeg, libxslt, libxml2, at-spi2-core , jdk @@ -309,6 +309,13 @@ let targets = extraAttrs.buildTargets or []; commands = map buildCommand targets; in concatStringsSep "\n" commands; + + postFixup = '' + # Make sure that libGLESv2 is found by dlopen (if using EGL). + chromiumBinary="$libExecPath/$packageName" + origRpath="$(patchelf --print-rpath "$chromiumBinary")" + patchelf --set-rpath "${libGL}/lib:$origRpath" "$chromiumBinary" + ''; }; # Remove some extraAttrs we supplied to the base attributes already. diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index d8d2aff0d09..f8e56937021 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -11,8 +11,8 @@ version = "77.0.3860.5"; }; stable = { - sha256 = "1521vh38mfgy7aj1lw1vpbdm8m6wyh52d5p7bz4x6kvvxsnacp11"; - sha256bin64 = "0hnfn2zxdrp96a4p98r08w4krzwkpb1kp4rjk03754akjyg1b3xx"; - version = "76.0.3809.87"; + sha256 = "0vfjfxsqf8jrmd7y08ln1lpbilwi150875zn2bawwdq87vd3mncc"; + sha256bin64 = "1c5rlqgshv5295wg5cji12z2b38l6a81l94spmzr46h5z9nn1gqx"; + version = "76.0.3809.100"; }; } diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix index b60454c4a42..4f4741ce0bd 100644 --- a/pkgs/applications/networking/browsers/elinks/default.nix +++ b/pkgs/applications/networking/browsers/elinks/default.nix @@ -4,7 +4,7 @@ enableGuile ? false, guile ? null , enablePython ? false, python ? null , enablePerl ? (stdenv.hostPlatform == stdenv.buildPlatform), perl ? null -, enableSpidermonkey ? (stdenv.hostPlatform == stdenv.buildPlatform), spidermonkey_1_8_5 ? null +, enableSpidermonkey ? (stdenv.hostPlatform == stdenv.buildPlatform), spidermonkey ? null }: assert enableGuile -> guile != null; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { patches = [ ./gc-init.patch ]; - buildInputs = [ ncurses xlibsWrapper bzip2 zlib openssl spidermonkey_1_8_5 gpm ] + buildInputs = [ ncurses xlibsWrapper bzip2 zlib openssl spidermonkey gpm ] ++ stdenv.lib.optional enableGuile guile ++ stdenv.lib.optional enablePython python ++ stdenv.lib.optional enablePerl perl @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional enableGuile "--with-guile" ++ stdenv.lib.optional enablePython "--with-python" ++ stdenv.lib.optional enablePerl "--with-perl" - ++ stdenv.lib.optional enableSpidermonkey "--with-spidermonkey=${spidermonkey_1_8_5}" + ++ stdenv.lib.optional enableSpidermonkey "--with-spidermonkey=${spidermonkey}" ; meta = { diff --git a/pkgs/applications/networking/browsers/ephemeral/default.nix b/pkgs/applications/networking/browsers/ephemeral/default.nix index ce6a89f2997..6226cb338d9 100644 --- a/pkgs/applications/networking/browsers/ephemeral/default.nix +++ b/pkgs/applications/networking/browsers/ephemeral/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "ephemeral"; - version = "5.1.1"; + version = "5.2.1"; src = fetchFromGitHub { owner = "cassidyjames"; repo = "ephemeral"; rev = version; - sha256 = "1mfg3iksk4z65qkc652vbc6pl34vxw5s560flhcj9g87n6444hqw"; + sha256 = "01mj5gksz2qcwhp28zyk8qswmrw93db1g7mw3mg4klz99vzcry74"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 133c37d0606..02087ae01ac 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,935 +1,935 @@ { - version = "69.0b10"; + version = "69.0b14"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/ach/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ach/firefox-69.0b14.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "1a7b57f59dc6503e2c457955d48609fd06e6b86b23a508ae15304e19fdf1b347f209a58075c24041ddfb4c80a5aaf9e66d5e721cf57815d16f43741b5184dca1"; + sha512 = "69f7a54d9e458d67fc554e282bd3d25a97e78e9e1aef70db3ca1ab63eec572da1746ffd405cd722243e12bede511b98fe5dd6d8fe70d39660c9e08cdde5d5704"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/af/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/af/firefox-69.0b14.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "5f037bb80ebeb5da5eecc94bdeab4e1809e09d6aa93bded34dd87d929e72237e69cee896ef02b51d5dc2a272a4fe40739fcf683ccc9806dd8039f5ee403534cf"; + sha512 = "367200eb6731ecc4934f98abccdce40ddf4a73324162e8c76ac3903593f7eb8a73c9abc34d36ce7502be4f55e865a1cc39d629b9f026e25ce56af8d76edab915"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/an/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/an/firefox-69.0b14.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "f48b2f24cbac76fee0a6b6eb1f77f13234acc283f3213c7c5d776410c4c23a17207ff7b857d609d25eb80a3f1c3c6dd4742d5c7a3216ae0a6193831ff428dd3c"; + sha512 = "4d146e92193945daada5e3db6e3de0beb5b453bd237b07c036a8bf3dfa92894b74e0cf956e5eb5217cc1872794f7f40dc58f9b1fd21b2ff89c6122a580ef5422"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/ar/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ar/firefox-69.0b14.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "be8961705ad1f8c90c5a5550b7fe6d3427d53cdad5e3c4f629f5f6267cdf6085a35d03ed49851e54413a7b00230ab66d7348b751fdab2d1ca52e9e9a156c4b1f"; + sha512 = "ead64f65522c0775fe58dba27df1cdbc589dee666e2ffcd1ffa84b2285205afbe86f6d6b1b59b74eb6add2dd8332e2488165d6af21819269f2bdf394d0a32c89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/ast/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ast/firefox-69.0b14.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "d323bda4f61c784179484cc85171ec802c4fb3a559cc177937f0862ace8359d91d0b205ab289b724a0545f82dd36a8e7e1312053747b8ff64ac920effdf2eedb"; + sha512 = "c5e1faa329fe3c37eb4b2856280011d8750f0c5e1cd638b409277826d612421b35b14682e553bab41a856d8dbb9104edc32a08ee612830b2292c991860c0404d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/az/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/az/firefox-69.0b14.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "afe1a5359ef53315d8c27db657ac578613d392d3d946e02456e03fcbbea756f014ec500639d6560b4bd8d096e23699650118657d0b08d8858b89cab9a102ace8"; + sha512 = "dd48ea7a7334798dcd26a9d15ee101936d603fc0f3374f6e36653ffadd8bb623081e232d1aef682caa31ce2409cc508a51bdeb6388f43d47b946e74bd2022238"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/be/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/be/firefox-69.0b14.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "4ad1e8dc3f5f28ec0ab9f652a1d49dc0d0103b1e3c2462a9cb8754c444fa31bda76ea24b3608efcdddcab8ad2a1248214462c60c5348cf918c133152e7c33177"; + sha512 = "de23e64ae742d96ffefcbe3abe1a39f62dd1df291c023d71b361ceaa596e9972ffe07b24a10203497024b575b2223ea4bf695b6561717e879dcc03d7b6b8915a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/bg/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/bg/firefox-69.0b14.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "d510f03564876531f7406b210b60a4076c9c48d403f6a80901bae6495beff9d2bdcce953ad02245b20389c38d9b0843e76356cb52cf081ddd46738e703335b2e"; + sha512 = "4e4dcc3e755b6b721ea005043310220f67e525e4c2339f7fcf12b078c2e611dac8b4fad6b734cf7207641b3823fa2d0d1f271e71103f8cff184d6669b1b1c883"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/bn/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/bn/firefox-69.0b14.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha512 = "23c1674ba24c7d6abd7159ec422fbe718bc706424ff243623dc9852ad3867281e54aa1b6129cf9a5d5de56d267558cd6abaf6821ffd51265bbb7202914ab950f"; + sha512 = "766f354fe5a168b902fa7c418e0f328f0e95ef0754db29740c6093bad202caad443cfe02e5c3841fe818b1f6b9b53e1b2ae84e29d72346260b5a07cf5ca24ea4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/br/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/br/firefox-69.0b14.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "bc3589a09d40bf7e2e538a408a1fbe0c3fcb373b0b0002e5ca039b60d655492283830530b251d5acbf1152dd64f95097aa99f37965819fb19386014fcdef9cf1"; + sha512 = "c5457927947a378e3778cc01e706deaf02a01e6ca4406270d6e4f5973e0f00ea3bbd27aca09b65c0dcfa5b430c600ec1e0d71cce48a796575d9c469e44679d9e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/bs/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/bs/firefox-69.0b14.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "a9c60dd3ec3d00a171eb66506d514560b3c09b5a2650b17207bc841dd5b365d0f545dba75b37c0e84e18321cc92932ac25ff9859a76a4be2f8174fcc594b8211"; + sha512 = "50605bd4bb4583fe7835f31e3f21186e6ce8738bdb55fc4a2832442cb4b21d5bdfcf3bae7905636e37c132db6c4561dcd93ce208a12b1a9c52d8d8248df2c4af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/ca/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ca/firefox-69.0b14.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "98cc03135c40f3c827b7bf583925cdc11d4595fc4fe8868f52616efb2ae72b26145964a97c01e199a65cb643642c558802dea6f4c1c45a1daf2f201a82467eda"; + sha512 = "baf2c5fc6e752a5d3f8b2e5a39a89f709e3203c53caef5bf3d649027bed2dfc5191b31998074f5ba7a437c8d8f2c911b5c6bb653ac1e6cf1d2594772431b0c68"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/cak/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/cak/firefox-69.0b14.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "74ea91936aa49ac7edc9d91917de7ca9ff15226d95375d02c6d687ee3effab8dc3c47c38378953cd55486e2c0d4fb2a00431178ea45309d1a20301310c42c89d"; + sha512 = "8117c621252a9a6ce9eabdaf7dae8ab9499a20c407b9d48bdc49b17fb72659889b038296f6af11e66a3dd5a9f6fcca9581396812753b7ea80a9299c1f558693a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/cs/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/cs/firefox-69.0b14.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "be3c5fb9f0fa30a8fa9fff4df91f622dc222546aa8aaaa8e64f13dabc86a9475c1e2ccca1426457d287cac2c3159f048b5246cf7a9372bbb46c67d529e126bbe"; + sha512 = "7c9103c4938e57bfc7b47a9cd0c07e38775edc50a001fb24f91def01a8c3c7a3de1330173fd3842e8b0ec42d001d2cd5c9b4a4caf60613edaf331059d6cde524"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/cy/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/cy/firefox-69.0b14.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "b60163ce4fdc726507b2899bee66dbe03a3b700c4a59c42d7cc3c131648588ec1b29664cf716b176fac73b9749f630505ecf65248110779b2cb55a2ef05bd9dc"; + sha512 = "10ad0c39925c53381a5e8ccc6fdacb3939e2f32c17a6382f6279fea32bebb8a2a43f326e2467fcb48f4df1ea96c445cfcf0f413b436814da1074f6f5b353cf89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/da/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/da/firefox-69.0b14.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "8cd36e2c99f8e15e27cc5263d9f7c329b3421184ac017d34e286492190e0d74cd521849376d72bfe5d718c81ad4ebc0bfdf7d892a810639e212530184c9f457a"; + sha512 = "8bc4c854a68db46280e0e9d561cf507ee5c334f3ba70d2834906face0540a47b77fc45d526024bd106c233f8e5245f3258279810a9fc2949e5e24d21fc17ef0d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/de/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/de/firefox-69.0b14.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "b7b8fdf8caf159bd2a10c2a827b2d89cafd97cd29554f7b837dec9f3b10b393010b3fde927c2a54be02b232b2d105d71753c94b15be7de29cc226ab03c860a05"; + sha512 = "d793e9da3997aaa0318d1b1c22586d31b65bb1eaa21049a86878fe32acbc75161f1a48f9307c3c73bed9d15808252e644622648c150f5cb52a1480a418921b90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/dsb/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/dsb/firefox-69.0b14.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "9932ee55b2d0ca583b9120260592569fffbecdf10745b3d320ff1c68f3866dd1f89643cf6c8df3ec585fd34530bf2a0d49f4a5f835d7a65b10ecb7da7af7067d"; + sha512 = "e9ab9d16d1eff15d049beb6b9293322b425e6da4fc1f1286c2bc785d7235b1d672df1f476a6949371af687ffa3af3b7cc214bb886a1147f96fca4b6821aabbdd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/el/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/el/firefox-69.0b14.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "6a0afb7e5ab4323957acaa6b53062d0a85cdebca058270a2486310e50157b8028b2c77a4d366a503f44034a5879aa135bfbe1f95a4a3c6ddc9498ca1fbc558ca"; + sha512 = "31cc046a58bbbbc2bba80131bfb456019c1b38f6a5efec72d140743e5e1f61b0cf10094d61fbd9f76806ea03461365a27aaf3b15531004baee5b431a59e32539"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/en-CA/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/en-CA/firefox-69.0b14.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "431c6f3d28a2331628ef0a762736bbc4d1bc4e68a73de39e4e3798618201c579f0bcf9fd61ac26fada5c7ca0b112e9f9d3cae96ad981ab677e88805f8b5d2bcf"; + sha512 = "eb9b3b8278c589f1b693bae1f48d86a4611b377c3949d51d75f534f133d85436b277f5acee1bd419a3f24faca245abb5d4d9f9fbd95b2adf05c03af72f37cdc7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/en-GB/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/en-GB/firefox-69.0b14.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "f3c852da6abad331eb3f0e168736aeaef9172a258f949d150f729bb295e76674bd74715671950e338542fb9ab08331d5d53883db449438814a1378e2c0c7cb5d"; + sha512 = "03ba44f4957abf9e2c36ad394af34354c0674b8e20a7e75d40b516434b3428fc3ad1d42ded42bd0587f282637ab663175a217eedf41f444d7e2e77d9d08c0dec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/en-US/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/en-US/firefox-69.0b14.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "64d49769e3e908510b4539f39765ff3eb7b108b24e7f431be837116a6b83ef13a02bc3f5f40232a87c9ba25305d75f30f2ad830a9a37cdb30e5cb58bac567fc5"; + sha512 = "e61379736128667d1b4e5271037b3dff8f2c6425678791ce2883345a672023665573177019001364324bb4b166989bcc475844ef30ea5a8703a949d3c08882e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/eo/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/eo/firefox-69.0b14.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "2e078e519874deca4790e1f97c56d8d7f51988e321a676ee347fc30fa51b6ea25d14dc7f5f79d8a0dfd4c76fb4540599fbc0fd7ba16460907e8a1ec661b6eecd"; + sha512 = "081d2573b5674e28e7cd04f0e856909ce7b1d2d16ec61bdf99cc5e0fd8aa5abb3624e220d609bf7dbb0b9d2db6367d7c67a64ffc470700896ed7520a250d06af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/es-AR/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/es-AR/firefox-69.0b14.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "7d3b797c0dd0c13867786dfe2779a264a9fa5b4626f9db97beba08c69f0d63de425b6dc6447554ca9a5fa36bbd942510c2565405469d1e4aa64737de7f024231"; + sha512 = "12fb861ad3e36473e4384f8574d479b2beb4d036dde78478b391381afccc1fb1e7888e08d0de366acc8c537f141187a0075438cf53601fd0bb4356ad7a76484c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/es-CL/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/es-CL/firefox-69.0b14.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "e8382333581d1a30db66941950b2ecb02d0b93a48d2da79a63c36b66f093da20e03943a51aae9ff6cbd65252a7cd0b4b6760b8b27ed536f1f5f058411b8ac4fe"; + sha512 = "6adf0c82bf246e256db530a4abff51e6389ec5ef899abf406fdf78c2c81831bccdf88cf133e2b8fb5a4ce4d843b947703dcf7a5aa721a6bb4913b6d07d04dbca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/es-ES/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/es-ES/firefox-69.0b14.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "312295d067a1aede3ee947c1423b8dac575610e24bb8f0b5c5bc981d009e669d8185978ae3f3b17fa9fe655f4b3a01bcd3aec2afb3adf8b916ac2abefde302cb"; + sha512 = "6b31621b8d8f0aa090839fb4db7c10618374551b04b66b1696fff7ece4de9cdc7da06243f2f6a0be931a201cd984b9c8a4ff4332d0ae8ad2a42e08fe0de0f709"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/es-MX/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/es-MX/firefox-69.0b14.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "147deb688909ffc381ad43b2311d30815601d48030ba6e381ddfecd9a2ea9b299ccf1337adb12907664a30157a0dacd19311f311f3765d23ce5dfe85cd469d2a"; + sha512 = "e1efaa7059a8e7c4b9dabc5481ef9ad14235e310ee42a8f28cf3eedc1907484be9fec8fea7dfc76e11fd531fdaa4933b581425d826ac41e040a855a3d2bdbc6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/et/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/et/firefox-69.0b14.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "82847b67b0c1b758682aee0a404f27f04e935eeb77e62ad7636e8ae6671e4bbdbb369b38115c0d66567029929f00841eaa254cb180653f730f34446fd45df57d"; + sha512 = "f8683048d0b87c0dcb0d929298e7b6429540edcc9308a1fd8dd6c40e47a39011c9abd4fc495bfe9fa8702f68717cbb06611e6f023d43f84cda623e23b67d2331"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/eu/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/eu/firefox-69.0b14.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "79e6551219630ad521e67a7f5669ccdbe7346a5dd0ac6b1aab2654d13430d971b4e455b52900e82e0a9fcc7ab6f27f4433d90ddedb57f199cbf6bbc6217770b1"; + sha512 = "6ec1a27c6d786d3af512f03836f1b795df14dba63c935274fb601228af012eb6063c035d3cd5c9e7b24976be57f0d62e03f7f136bc322e667adf8612cca08b25"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/fa/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/fa/firefox-69.0b14.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "67e80ad128ba1251fbafc483be98365e80b8ef888448e6e56fc06e901f93e2f10de9683bdb1e24b77717bfec0428be30769ff8676c7f52b8004159a77181b05c"; + sha512 = "0ef5ceebf4c144ba6b6fe8c999f97b78f6bfc18667229a85ed2093fe3838d5b1f7213ecfd004af95cb18b2a6dedd8675d1365d6b9a09b2976a771d96b61954be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/ff/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ff/firefox-69.0b14.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "3b888ba947259b334ae018d3cfd03168686abecf00b75fa1630491f3f190fd59a62af7e06bfec135410b1ee78cf82acc387bf9b13d5c7971b25d82a92733053d"; + sha512 = "c17d2f95b4e1441e7f5efcf597c7c4ca362aeb837debd788933c52d6803bfc987bc8eb218391dd71a0581bfd386e625eaa2f4e3ac678f74a9ad3ec4f6ae34ca0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/fi/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/fi/firefox-69.0b14.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "70c13e5d110c1508b66cd48baf81652860196d9d350e36e51631fb6f4e979f8fb4df9f712f15b13c54b2c2651661eb2465599cfbc294a94e137dbe93ec15dbda"; + sha512 = "ab77f83eb23cc32fc5bdc4bec4f5c5710d53d7e46df6004e6a4751f9ba111366ee96742862fa5b76b438fe693b06245874ea9ddb2fa3575b4966bb1ebb66bf12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/fr/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/fr/firefox-69.0b14.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "3c0da7e5784b34cfee62e4b66e347132f02c22ba7fcef9b384643ddbe1121a2865169079e064e157193ba006c720ddec3d59e85df6c806226a5185142eca9c73"; + sha512 = "1c78f9c50efbaa3336503c6810260fd9b8d7478fcafde0a54155fd177d22a8988e35edfb26ea9e3e0d6b37984ecf72a98b2928f14d39a7927b53c76df1d60bcd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/fy-NL/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/fy-NL/firefox-69.0b14.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "387aa2fa548820dd9e4a1b4ec374b500946dac4f93aa743b2166f08b78cdf8d34c86bdda25e7c4b17df0d94773b94c88a76472a27ca6d522adcdcfb4ef579874"; + sha512 = "396d65f9647de3d46d6936143dd1173e91a2d023e82bd51d6b22fcd0a06d87e376f83c33ae983f3d192cdd34dda8f97b38a6a9b0a3c49dcc75db7ff913131172"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/ga-IE/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ga-IE/firefox-69.0b14.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "968455b9e61db7b669ff4a34fd085508930576d4e1009431c5207b1c76a66de776eed3cb6f0370d26d9b44d9c3e4e710537e57c86ce5b28d90c5f80a828a3594"; + sha512 = "c66a6cda941dfefaafaaa6e674110e4825032d468dcd0f299ff9795a7ade24e89524badeb27d6ee9decae81ed63ae1c4df1ca0f9f8c7f1d35d50ac4cc36450b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/gd/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/gd/firefox-69.0b14.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "557937a63061312bf3371e2f257c9463667182a28e4f4488caa39ed57185344cffac6a937817cf058538e39ce4087f6734c2e00a2a1cedff253736480818dd5e"; + sha512 = "077423578f0acb3ab6dcafac6394a5a75110252532e7552e1c81976298fa50187cc9f93f43ff8745f2cf2e148f0a4ba3d206607396dec83021fb7c825295d02e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/gl/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/gl/firefox-69.0b14.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "ad568ee3c89d7e869bdbdf2a50e611ccbeb6c6446b2e314e474c43c6f0d470290bca3534e2cba917b1ed77b7c8480a756cc0c2a3d4907ef91809f21f6dbbfbfe"; + sha512 = "52dbe9d4f88cf6d2d5710fecc95f0ea78519034ffc9d4f111cf96e99296ae77617a11735dcae3ebff552ba1fe741c11f4f767cb9710e4fea4d4ff961d42fbf99"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/gn/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/gn/firefox-69.0b14.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "52440609480bb73b62d4ce0d35e68f459153ecd815233c70cb5a2f2f5555d56cee0bc548eb68f6e2d4f3979fc14c8a101ca9a9506a3ed592341a1f818962d325"; + sha512 = "cb38005b6db3b58559baed9c427d19b36550bae82d6b6049c7c705df67ce736a772f868d4d770fcadf37e7a19cf2d02f221b2472ea9fafe26d00f3ddb0798079"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/gu-IN/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/gu-IN/firefox-69.0b14.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "d6d445097510f45d9c320b19cd0db97e69f8e5de8f31a532e1b929d0bcb04c86dfe38b20bcc5ff320581d7febba06f1ef5e3ddc61641dca382b66f0f2d7fa942"; + sha512 = "776f81e4aa1c01d8bbbc7ff83f6c0eae549ca7b6b86aeb6b346280a7188704502c1f62790eaafda06defb73744930ab61aef97b9ddbe16581de2129da88c6eb5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/he/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/he/firefox-69.0b14.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "ee81c7847efcb09ad9603194641798e200558b4dca7f19b93ccd918e4f63fe0400e9a91583444f1c017112dcf56d73506c29a94eb0694bdb58f226ef2973088a"; + sha512 = "fa0a8beb4edc5363d339502aa132f257a6a78c2c96a5c9cf43ebc5522e43ccb96940acfcef0c06b2e9e5325860f2b93a5cbc3d77553e8c7f7a39ed010b1b69cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/hi-IN/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/hi-IN/firefox-69.0b14.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "8c7044bfc7dde901dbd2ba7e719da6d5385d260a6473a1e0f3f9af99f1ea3add4382bb2683264a1cfe60379e9fae4b68a41f30fa183d54c83502a173b55a1db5"; + sha512 = "114d157b3e2b4891544fd1c4496c8c2b2e697250c71210f0ad034c6eacf2b35157c18146ce843d2bd2927fb9e7f71f2854e8bda221d4af91b2d50df21747d0e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/hr/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/hr/firefox-69.0b14.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "b680b30f2fc0f4f82f8cdc3eb7849d4a29b667a8cda453395b28499581edb785cb1bfb3ec39efe032f150e5b502955579803459a2dbd2f32264d677ef190de34"; + sha512 = "701470a4164010d28590f53008568b01017c4d0047d815f51b0fd1781c037f110c4fdec0820ef6ebda01efec1c0acddb7938ed40e946ee77ded662e760b2b61f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/hsb/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/hsb/firefox-69.0b14.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "8c4ac8f04d933bb104b533b2a8a512e2f30bbb6219f4d5622ca873a42a4d365131083cf9ff7a0be879c098b2b434cacfaa76106f432e3b609e1bc92b3ad674a6"; + sha512 = "625488b1e226d36b4995d81215128d647cb780062ab450a7df05c13edfa71ca5ded4d8d778876721228bb16c3545fcc069af692eb962d7a1028c0defe74a189e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/hu/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/hu/firefox-69.0b14.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "7ad2b72826cf5d98afd1dd65fc30cf9e5525656271f3d1be3b40b2c0a1321694cc6ca36eafc0c51f77e1ca8a6408fdd6d3be528923789564d2ca8bdbab5a5cd5"; + sha512 = "5113917f0b5ac615fb68324acc6dc966a457262e40f49678c215184500cef1fdd300ddc18fd3bf62222f1fe2d00c916ac8dada8adf6060a2e2098cd96fc4607b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/hy-AM/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/hy-AM/firefox-69.0b14.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "fb850f1bad3f626f3272e9ae6e3a60d51b63ba221f341752334b490169874a44f2be3c9b3783fd523b3f4c0484bfc26999a84cc59c893100f21ece93f01b4b8b"; + sha512 = "70f989efad4fd4282a06e78a1a6cfc28159168428b24efd9d393f2ef7d02afc06eb3e52349797e9e5a8b6cacd13a2cf7e9bd0758dc203bcc7d0ba4a77a599b83"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/ia/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ia/firefox-69.0b14.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "796915bb31c4c18f22348dd7fb1e7c33f44938b5658fb32cb5a86e1470c8f2492642a81b0d2f59721f604cd785e5b56dd45c001d070b2e144b191ee0d0d6b21b"; + sha512 = "a8f01c33f945eb0377f2907811db68d912ea2e7a200e362c311a9ecb5b8c5621e05364a05fdc07a35a438d0ffd8e56f83341561823fffd0aae7d7e9794ea9079"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/id/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/id/firefox-69.0b14.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "5613ac6fe486517bede9fbeedbe64300e7be8bc1dd2a65bac94defd7c800e97c1a4ee5a2375fd0358de3a466a8ca75288b1b6b6c676e3ae02634aa35731bd8e2"; + sha512 = "359744507ac8c7acaa18ef5b81b7979777e1e860ae443b93b8b510389e198a4482f02d10e86996ccf9879748613a5a26aaea9fb5affc7ed8477891dbfdd6006d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/is/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/is/firefox-69.0b14.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "339bb54fde82ce43032d00b2245b114392a47a8eebc0be18a7a0d4cd1ec625412817303c48aad908d1bde88fd80e4a1a2245dbdf5ce9556c0a8b998025b1f58a"; + sha512 = "fa008324cb424c675bd5ed33eb886db661329254cd5809e3c1d51f4e530d034eabbdc607cc6fdcb3a332f5cf45078b0d49425c83e6985f9cc87b939c94391bf9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/it/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/it/firefox-69.0b14.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "4fda975595c299241a10ca325a828af6d5be420bc76c021dab815bda759010982213a55591cafc69139dc6a796df96c0eb35d7d7503c68e78ba71926576c40d1"; + sha512 = "406e361c1ef650cafec63b213f67ca016e251c50455866ac112039abb85bfe62ef6c56e7ac103afd87c05535f42767e937f99a045d456249f87187b00948cd71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/ja/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ja/firefox-69.0b14.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "d620ac66a39e20439f1a83ba7aab904d78ef85355418d65e8a61b441f7f5e02f349201141fbc4a36e5810a4e2ccbedb624aba0e8071456acb0745ccbca05989d"; + sha512 = "d1c5d95ec4f8ca8e46dbe90e6c16d4e2da7b2c29664ee878be09c8aa46aa421f91c419cee4e8db0aff47c768df49ed316d789fb20c50a04390bc63bdc5e5cdb1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/ka/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ka/firefox-69.0b14.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "9c2025a3e57112adc9417bf27f16d596e1639531dc1ec2ac685c91ca79f27f3361f1d9c5b5f6e864391c62068561985e257c1bd8e63a80443521c9344fced2a0"; + sha512 = "623aee24ae26658971a1bc83b80fc45e296c9c17a82abf6956ea6f019db37b110d9642144c7c3fd05ee681a9953f9d4889dedb82c6b421d975d13f4d7e0c61b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/kab/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/kab/firefox-69.0b14.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "5ee9889fa241c9a4f9cce25d8ad557ff8d4112dbc620767ea8b874683b1026fbf65d6fa335a01e11c317d59523f43e7a7dd8ef7af60173104a0eeaede4c5f8cc"; + sha512 = "0405b91ea64f7840632b2c7f633af1ff478cee3910ffa32b6e49a87e4d7eda3f96f27eafca2c249f8ecf40ebbb89a615227ea011cd6269a7699bdf68b213f877"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/kk/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/kk/firefox-69.0b14.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "410790bd0e13444a0780a1dc3042daafef1d8594164d4062483d1c03cc6ba4f682602a5fa28310b1d64c26ff511766943bdb0f2787b9eac0a64668ea38914971"; + sha512 = "b8d170de3d7224c17e72d6c598f7d53184c0ac7437b93b3770df504789e862e68bbf0ba73727fb0cf8c3cbd177fd100c8c0039454a7c32bc33b6a4e05e1257df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/km/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/km/firefox-69.0b14.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "98936520579408e241575b802fb77247072cf832b0e6bb2bd0be75af246d211ddef7266cad5136e51e30395317985d4a4aa66647a20e3980cd2aee3e6a4a4de7"; + sha512 = "2d6d79109681322c73a9ca4b544e5764a0c6312d98dc46403a1d9f62285ea4fc2d88900a2a2c67f32ac61826d59f684ae4e0d9d3c09a5eca0938292e8acdf545"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/kn/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/kn/firefox-69.0b14.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "1060fdb60461684c0bd8625ed4f5e53f967619682ef920cffca663c70c395a211bdc940931f08de07814b5796f4fb6ef0b340543e4a1bdc526f6f4cb5a250e9e"; + sha512 = "9f143e23caa679ef6d7d5cd4abe3e078882bfab15cc18f1209b7a5b654208f5904a225eeb0be744de341954d076806679657546f2ad2560b5a7f8df1cca2d6ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/ko/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ko/firefox-69.0b14.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "4a88b46b972a90a8ae6c00ec23d4d4c00b18a6f5560f0514d939a135bf2c3f9207fc2bf84a19fb496182acfb95da70037ecfef0ceeb2f7a2220b5803957763e7"; + sha512 = "c1dc9b159da316ffc61a64684dde56aba305a7a17fe8a6ae32520ba950096e62c8e265bcf98124c45ab39ebbd6f9edf7ef63e8760b0b434810e7ef67eb9b7586"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/lij/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/lij/firefox-69.0b14.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "a219c8f97158fdfd1bf0dfcbf40540c5adbdb861c3e8df131e826fa5feb73f33900024a8812a3ee648c63a8c8d69641f927ebb437745730a962db85bfde229d7"; + sha512 = "7a9077eb4d267646bdd0890d785d6378e91ee4af4b41af1f90384af3ee1274441a78fe80e33de7eca3dd10f7ac4d1fa43d9720a931ff5036264f8c0371c4a401"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/lt/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/lt/firefox-69.0b14.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "4faa38c7fe80b3176ba1cff0153577adfd13480917659f8b45c70a1ff5650e29935ed10cec88059be602fbff64583153642acc9dbb419a8d269115659db55a37"; + sha512 = "a9fb3b19c7413da23783dbb79fb890293b9f9efaf0e50ed1f7b13aa0382dc971da247824450338564303473f735175131b3bcafbde8696b227671ffc6e2d1de2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/lv/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/lv/firefox-69.0b14.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "6334ac39f823a5a289dc60288eda76f2fe770d8eeb1c3e6b1265eb5c7b2f1affca0143b0311c8ff077f39e093b3ccfe743e4aded6384bd1e0d212067207df40c"; + sha512 = "805556c78f01629f44dcd960d29292b1da81082fd110101e36ad8d41b4972207ee201938413c24b623d891d2632575862f42ad96271c18f13f4f50d12d8d06bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/mk/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/mk/firefox-69.0b14.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "9b63449642f2e047b49e3a29528b4aa29565f72488c82f0086ee1d427d980fb64f913b3ddff1f1f799071b1fc542ee17e6822728bd0187b38fff28127229d63f"; + sha512 = "ad3373da3f42c2d4960433da7bfc2717ca39c39a4f9e3c539ca72feddcbd24bb4138d0cbc790ad0c8d5fa64a652e5750b4c95e363e125d852548164062f590cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/mr/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/mr/firefox-69.0b14.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "be966949b09bf18819d34c774178b8eadade9b259082f9b6d6782fedadea6ef604382e8667ef49c479422f7c46df424d5e8d47beaae6b5139d2a4d372c2b59b7"; + sha512 = "9e9b07ddf0647977cf93d8be02eff0fcfcda2914e8c9fcea418dc03ed3bd0adb1bb71dfa9147d222866d9b86c2b2fdc8827304fb4099da6024c205ff9a564f8a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/ms/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ms/firefox-69.0b14.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "71664b9bbbdc21da73698ed616bd6cd34fdccbad0212288d3eb6a332ebbe1578bced0ff4f4d587e4cadc076762235eacf568e0b5139a0b851b5d6bddb6a41807"; + sha512 = "a56f7c3b8c713b08e1f5e19b290fc1f0dd108d285b83fa3489bacad6757d02970368f4cbcad6ad78ef53c587989a8f96b23146024e705158a9c3b309bf530041"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/my/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/my/firefox-69.0b14.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "9fb7a365fbdba50f664a1cada9fc26995f7b5809ec65334ba87127108c1e5027ce46f8c793d5da7cb32daf1788e2a98fe7aff0fac1b2d2f3f47ecac041538b2d"; + sha512 = "5be85980189d689fb1f16136c7ef0d427efdcacdd966a00c67527014588e62c20397483116e1728682be5eb6aea445c1cd3d8290452f05a32023ba593ce0b536"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/nb-NO/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/nb-NO/firefox-69.0b14.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "17f96fa38949bd3be40b3a6bf6e5ebe323819940946350ec535182f0197edb89af45500f54c76e51ac2fae1a95412b9f2a41b92e38803cc4af1097123e6233ab"; + sha512 = "008908a88d4c4edf535b3cfc009140da760e40de0b14377ab79320431229b0e9b27ad745aff2265fe7d689e1391b3af3467a70f4279b82033380e3b7d234a5d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/ne-NP/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ne-NP/firefox-69.0b14.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "e9cfc087a4c5ffcc223d873d26ec3203992e4ac8f418f5eea156f66bb92f14606da3cbc00cf7ec0524f549261153df9e40e402e73aded124b57c95feb6812740"; + sha512 = "7d7bdde40155ec5409b43cc150c44b6687f7ae8bbec411a5b1c257a0dc630d58c6dab289772804f632fece1a3dde5d613f939ff153486a8a38052d3f1abf312a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/nl/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/nl/firefox-69.0b14.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "19735c48e5da611d5f982bc7d295cf995d878b26ff35f55a7798ebd28689996c75fb8e5971c6db627e5cdd15423150dc146f8c03f4886fa50913cd8818a1bbd5"; + sha512 = "467e487abb563fb8354c0f3a3661951acd40c851b4f570bb9483580a9004758304eb35842b7d75b3a21f0108914487c56416584f02abfe0ec7180ccf0e9af166"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/nn-NO/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/nn-NO/firefox-69.0b14.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "74a7eee4b310f9d893208f28ca0a03863f28daf95e1cb3197ff6805dc17ced77cd4e2b3d27bdbcf20982e71a6e60f36d9f0147c650623b7f79467f9a060f08e2"; + sha512 = "bd3ef206e3cc0f8674391940878f5b9bb9cffaa82013bd59d1bf924bfd20171df753ca51fc74f139c8bf4a977397ba8611cd90664de80b83a5eaf6ff3aec05e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/oc/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/oc/firefox-69.0b14.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "ec7f830c37cf2e67d978038898df581bbb7fbedc3b98117bf4497104713c382261cac7921eb45898e23343deec775587a6f1f69aaddd788ac15cea293593a84c"; + sha512 = "5c955c03cb776dc6eb584d29197945ef22bc1be0074279947483750758b368a2a88f23b8412ac8e76ed209f37d35dd37f33726828bf33c8cb576cd5f7f51e7ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/pa-IN/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/pa-IN/firefox-69.0b14.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "e5d72332e01f54c9576bd1aad7f54733c43061bd8e1813b8094cfab87d18f2144817270c572780f66b0fb0ae6a4bb7071221735317ede3b6eefe1f6204865766"; + sha512 = "48442fc58995e0f97ab255307dd6adf55b296316f19487f35635df4252547b3d3da3d76fce995918e9885a5fe79a68c0e711ec20dd22546f5dd5a4a531654009"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/pl/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/pl/firefox-69.0b14.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "93cbf86c41086b81851e58a7b6a66f181a6baae871954664c088e3fcac956e4854b5590d1c5226b2cc286f12db85c21428ebc7a1c20c769dadb992936746f1aa"; + sha512 = "ab5f1d3e874d4cdacde0ef1978202fefb71ca602775ffc5d228729a6ea23c47b0efbaa3c554290b90030fd5145ad4d9a2a11b8e22973ec5923fc41edd86b666e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/pt-BR/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/pt-BR/firefox-69.0b14.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "ea2f727cdbe67174939f736c6b23a9d88c902655f13445c74866a71f7a8f22e9037436e1589a52d258bc6d5f1338853de846542a6bab3dcf81d5e092e206e2d7"; + sha512 = "55f0f8539a4439c9e78ba794f9837f89cf9470cca827b036c69098c83a9cef91a1abe5dcc0b350358e707b274944a81600b90022e52884d3f2c7f7288b4a7d19"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/pt-PT/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/pt-PT/firefox-69.0b14.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "6d6b8fdf32ea8ade420fd64f4c882d554433dd9743bcecd11986a70ca5d12f9150ae4feae6897a412bcad192098ccb44412fbca1329ded3b77e15ba06076434b"; + sha512 = "23b9a79b6fdfae7a61a9efee4e0624a925bd234cad98c3309fe8ae389e4d01cdfd3c4f77cd2283f9649d87daba59c383d476d3f6d4768e580cf3905f5ef9a943"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/rm/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/rm/firefox-69.0b14.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "dfe161375554d9886b50220b4d33625c3779d542fa20e713d7dad8c1221c1bb9c4300a4d139ab57335fc021f237e3316404637d2a837095e247aaaf6650d20f7"; + sha512 = "b33e9e6a9d1fb694be1fb3990a790bf9fee990b1d45c8b3a318561c2417ba5fc0993349779b58aa2174f2fda9e610b0728a36c0d926a07f73275a5add8413f2b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/ro/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ro/firefox-69.0b14.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "c3f6766f3f22acdae48cd340112b0248a21a580c68a473a311f6923340417487e16fb82c99648909e627be4cda63a779905f5a17b43379eeafb795b6c1dbf5f6"; + sha512 = "0dc002bd4872ed8907c0794430b44476e21d732624626bdb8f9cfd3c81b4b63ccd21b11456f660f58a05ffc91881903c510222b093c316f1182376eb051f5989"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/ru/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ru/firefox-69.0b14.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "49590d809c2883ce0eb7c5db156defb950c5bb6cc1106e4240c18cd4f17ea550952ac36d2ff8875cad4fb24cdded1e6d51881d5b9d6e360e44f780d884125e92"; + sha512 = "b29a6e02fb86387d1209b8aee76be34e5ab9e1848084d8f722a55bbc4f61801dd0e694ea6d284574ccb89c65ec0c12f395a97f4232b39c28ab7b75e730a436c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/si/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/si/firefox-69.0b14.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "66541feefd335e4b9f79e9165ace04f36decc46ec97b211a8f9af86517a197b09209e8f43bf9db449bfa3f1bfed37a8d3fc438514efbcce17dddb6577928b41b"; + sha512 = "a31294e1cb39c3949cdcf0b926edfd5f196e6e9a91e99c213d86129896c56b47e4f3a33b11c4b6b8d9d44a2b0fc767a87a67d9252cf1e3b4d2ae7f9716ccee4b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/sk/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/sk/firefox-69.0b14.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "9967449c710e8a08e7936dc3a297fff5e254d1fcc960f04a6b349aa97526cf6924522975e750770ace0aa455265c6422ed97fda48afe25d254cbd9b30517171d"; + sha512 = "f736359f8f3086d560b84070f35a2184b316c5f6ebccf9665232b031a220d3d638e85c67ede20c3ec5836ef12251f77f4df429842c824ebd6961d58a99ba3c22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/sl/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/sl/firefox-69.0b14.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "7b3881eca1b35475c26806f29f9a7155e63e159cc139558366f8e1dcd92483be475de2b9075184a31fe1c7d3c8c0a7053b90e7f763f33c38adf8cc57722d7b9c"; + sha512 = "f5f0f3cfd91ca5a5201e3178a39d8ce0db3f01a36a4854dde16088c6b8423b5ff6e45793bc5221a02fe444a15d83078ab13ac48ae4b529144ac183aecfeb4811"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/son/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/son/firefox-69.0b14.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "5fc0d6cf18760f577dcd2e606247a16c20b39a234d60e28880107e1324045db4a384d65c4e83da26d0296f2c89864d24c8bc24127dc5aff8fe080e7c727536ce"; + sha512 = "2ba05fbe3f440a9010f999bde29849976042f2874b6ccae408fea5e5057d812fd91879d5a288ccef6a4795101f854f74de794576706b90078e1f3c3887818592"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/sq/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/sq/firefox-69.0b14.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "7ca9d972c906796828deae1e79dfb1ea9455835ba1b870d3acbd484103db6d87e76011b55668da3a6e361239a8ad87d5acb7d25ba3ab474e28018bd8c768cc57"; + sha512 = "cac976f53f72a5eb974ef97727a5d6ed38a5a4b8e61094f8e5d76968d6afadf0daa68c7d6b29a45df6dddef8cf26973e0ab1a65c29f906f7e404cf0b152c5e08"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/sr/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/sr/firefox-69.0b14.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "ae58799b2b20a91df60eaf452a0c81b1d608eeacddbf0a98d941abb8a9c7feba8857d9fed9e4c59fea2b24a7b6ba7e1193be826008450794fb710edb36ee2d9d"; + sha512 = "cb87cabbe1a9d5910354887b0a6eda4ee055b823a0ac35bc414d41f9fae636834344451e3a882c65cf581d21e875b400f5e3e054ab053ad1577fe48eed8dbfd6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/sv-SE/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/sv-SE/firefox-69.0b14.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "273973c93b118f70d0a83af1daa3ef64de77444172e668ae34df2b547e053047ce4fbb565b4ab5b0f2094ef7cd11d0f8f37b4ef205312e80e99b16f67eeb30e9"; + sha512 = "c4412a7488797482b3315a2872fed79ef033ef4fc32ea119e4a943999f5a892c430486a6e13236127c97af3c01f25724bd5ce6e84d4a9bce69d10b5ef84ffe7e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/ta/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ta/firefox-69.0b14.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "813cae155b3e8ab0f78542124648e8218705f5122f4a340dfb5ca15cdf3ed3f7505845a6ea23263e139b7f3713a0db304c360289d4989f91be8bfec45436af09"; + sha512 = "55729c9d755d83286dd88642cb130d75a827ecf98959cfc8e20f205e6c4c3ec31a03fe0a6f304662beae68677aacfaf8b993a4f79dac79c2b8157a3845bb022b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/te/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/te/firefox-69.0b14.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "4069f40d9ff366c3f126d77855344424c498b9e9c6e9fc78c78097b8d3b3087478f8c3964d46671474e98023c32fd44202d43967ac8c3d81b3debe5467a14788"; + sha512 = "2cd9b38b607b89b909216afc403e7394574e66abdafa327eed33edbac45eba850be22ff651b9581c53a7ab4735c29f1a4f2ee3fb3c220ef2f527f48d919b15fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/th/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/th/firefox-69.0b14.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "9e0a5a920856b492425a493aa85cacb465f4f59eb45a6c0ba2cfa631558650e40a9d23c12032b543487e78092730206862af1bc7345388803f992bc4fd5bc0a7"; + sha512 = "721711be47093f846b42d5bdae36ce083e05ad7edfbd75a32827189c4cab9da3af0b34551d55ebd67cecf8e04912c17f2a44b032f2a9a76e926a589381f3ebe3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/tr/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/tr/firefox-69.0b14.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "1f97700f9c6b9996523c100b7393f3ac465c45adb1cefdb163b77b12d7679df2163296880e9004e4b6f8dcd8840cdee24eb752bc6a985f15e2d8f57db01d9e0b"; + sha512 = "36c4b39480b95152795ebe744c6d1390f38540c3cdd19cfaccca40f3da446a5afb6c5b8dcd3bbc87b15bcfb5214870104724d645cc630c87373b78d89c7acf94"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/uk/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/uk/firefox-69.0b14.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "c8ad5621ce8c61e83aac7cd7b272ea7bd668d159872442aa80d88ed1b46ccf77de913e8cd7e339388b117d9d6797c36b9535dcb0efccd805410f804ebdd1f105"; + sha512 = "4b388a81e67390ff461681587914ab944230361790f5b48676df5d402aad2a3ff28c808a2c8ecb655f2540c3d6cbab8188c2b154c0e173625b7be121968e853d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/ur/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ur/firefox-69.0b14.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "e1c056d287dc38be98db702869d16958379b8b56ddeb46770b175668f447d87b043773c3c9907e0d106abed7cdfe1f99dd871ac4510836664964b3a71d7a5289"; + sha512 = "43cb375b00bc335f5a5907796ffd84279799c8c907cf372968abb8a1e9c4ce4a4b9b199eb0384b548406a158216cb5e42efcc61836b5ece94fabe83d724bb26b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/uz/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/uz/firefox-69.0b14.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "da694f4cc7f3250e88a8c54e94629749c30288776a1838c8f2183dad59107cceb3984aff23ef4e7d05bb7acd001e1b69adccce297695b206409214e9995b41da"; + sha512 = "33c0922104c4f0d6e9a5860738bb5e5001ef24c047d617b86d16f9a8668092ca0c3bf88676c448947e4c07c3d80fead8714291cf9e947698765fbce65247a488"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/vi/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/vi/firefox-69.0b14.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "b120a6a272abc7c633de952415b35c13ca88f4263eb939f9040e9168154d7309c3e096827348407c36cb09d1ceb67fcefb4b3f3dd4e35da404a1ec44e103e126"; + sha512 = "d4fc27a2f69dcda6832bd0372c97381e3c47883b2f9abdb21b67b2c06f392cf2e2e8aaca8f0c5f67da87f8884b7be8d407b49a3caa04dd166165a8623f621cf7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/xh/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/xh/firefox-69.0b14.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "68405955b821eca91f75943630104710a0ced12933b3c9fe84d836d10fce32cba1a0799be8de9f3cb58758ae627b5692c9e7e624b8fc62b0d70a16734b7a5e4e"; + sha512 = "c7d3c3975ccd4b2635f30aea2c2ef8e2c8197c52730fb60fc0a9adc5321a1f960565a442d73b68ab15367ff06f87ad09e463c8b9a0f871aca526716828795d1a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/zh-CN/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/zh-CN/firefox-69.0b14.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "ce80275c117902d0a2edc1e7a1b6f23f5b54e684f813e38696224151621f2ebfb2184bc018905051a07b0428e245380c630cac60d5bc927b4329e701cb0c174a"; + sha512 = "f6df2df60e020f07aa210e373d177a49204ac35912172a0885e9767eebf64f660d2288e3d9d3cdf574c22c4c0257c955faabc02721c34c59a113de94674d80fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/zh-TW/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/zh-TW/firefox-69.0b14.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "89ef19db13cd8da8e19612381c218a601429cf666f95c762510b300eb9140812c0adae9e5b7b4957eccdb8be7fc306deb9a089c19434b2410162265782e5226a"; + sha512 = "70d1cc8904f27509fc476b59a634eb7ac26cbf53c88069b104d00ddc3c596384d75bb5522bd38fa25f2aaebe2ade7453505622110a36f7f77f19062a846f01ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/ach/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ach/firefox-69.0b14.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "bdee0f41ef6b4d2efbe13e256616820df048610af411befb91256bab040225530cec74b35c591ef740161d12a8fad6cf96e35e25bce7453be30ad8111c2ef3f6"; + sha512 = "74550f32169f07e5d551ed20ddc3f24f731a18966f75f80d40187496af4bffd1b0742c6ca001fa263b236826f2dfc6edd21e724bb1e4c8c8260e5526e20d031d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/af/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/af/firefox-69.0b14.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "9268d6071ff9142579be3495edca6325dd283128f2a1ca60d6e249d0a963aba7dc3a897aea523804f5485843950db5901d4db9ce10c3ffb1273dfab5adbbfc72"; + sha512 = "2d305bfc2ad71d6c37a3de2e4427417c5ca67cd97eeecda91c8d5a84d72eb7f02c6d11a857af6af673caa5921abe8420b673c4ced79025eb5a639f466e0cc8d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/an/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/an/firefox-69.0b14.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "8b42c162402df67971c01ffd9087768b4e49dd60f069b88b154b3e1a237c0c4f9c7a7e4f752a83e8fff3eccaa87e7599a9c3ebdcc3fb70604032fbe7db524d62"; + sha512 = "0a6319ac1017a9c022da4d8a3a619e9243668090e8266b4778e767a9313aaba5c1d2d5174f640c3103220b5e0dc40ec4040690767062d8e6819ac0b3573ac464"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/ar/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ar/firefox-69.0b14.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "d4a0c3987c1bc8e304ff065bf1ca1dae66691e28a51beee4726bfa7a685b5efe17c19ec8f7520b982a1b88c631b126c8511abaddeaae2818515ac59b2781e830"; + sha512 = "dee2b757f449dab23baa5ff16cdc123564650c48cc4492bddd36e7ef4f99608c2a4077fe7478d035275aa3ab2368b54e2e171ab689537081b09de0388cdd0922"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/ast/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ast/firefox-69.0b14.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "089557a50dd106d25e35eb72ff741c80e8aac36974c2d4a5c49842ce56078ffd8b9f67d829be48411b46d4f823bc1d9ebb2dae22e8293cc197e57eaf23099b72"; + sha512 = "1e92c8fb6965dfbc9dcfda7bdd44a8612487541930a0e758c0e8b8fd27e2a5984761a430420924adbffbc11f6523beb80a8995f1e6d0ab37cec9d130306f81f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/az/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/az/firefox-69.0b14.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "237af11c85728ea6d05dcbfe456a5dabc369b0fa690d23a05457b7541d787b149bff45e5b71be4c39ebd808f65badec902e657cb6cd3dbf7081fb4c962a27b00"; + sha512 = "e35e1e9a217a7a8da13297e7cc1d553b7a4698ddce0eef31bea85709c836f4ca5993cd4892bdcf0e61d6a37cf125a4b9b6a4df36cf19fd4f09ca63c802069bf1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/be/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/be/firefox-69.0b14.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "c9952ededa6dcf507969ed16ce47ea4f6e2694c1e9df207df5457ff92929ef195885a91ff1d160c1dbb8e72e6a7796ccf4ac36a9bc28efc3dfd4e34f5cc17907"; + sha512 = "cf65d94565d2b25ef90353dc686cc4780eeefb29cde142a735d10e8511e4d9d1db74ce57d80da35d1ad9b9cb3b8cb060fad01ea95b46a86231063f4559cb50b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/bg/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/bg/firefox-69.0b14.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "bebf78848ee8b81af5440ebdbe49dbf14de20d853f1e6bc6a8b7ace7d6c329ac28e3df2a754b7e5e2c1210f6cde54b539a11d676708ab36907ded0ac4025d6d3"; + sha512 = "09540c63919525169cfb3c2ef8d19115cabaa63b41b21de43e15335797761d1d452c80ebfce1768a88f3a0e135a222e30486708a8b2ef5c1327738f2d5bc8325"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/bn/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/bn/firefox-69.0b14.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha512 = "8f4cc489cdcc348fa19c8129c8a9e83507e7f30dba3f2788b21e6573ca0228909612b8e158c8d9cd87dc8b69554bead47d9522fd754bf045964a1880a5deee06"; + sha512 = "47d497da9c178e675989b046acf7d35caa7a66090d8751090e86c5b9d9ddf6924767a586d43d33a7a093f1885f5477a8bc008e58eede27bd219e0acd6b00468e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/br/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/br/firefox-69.0b14.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "564878573b16470ab89f3ec82d2efcefa69708a2abcb9fcd7527fe6d3a0b1302a400eb121dd1041599942d436583cf931b6c13a9eeafd13d00ea15f3cfd1c524"; + sha512 = "bb313f01a39abb6687b71314755be566ec6944fbe0aeb5571321032ee814e4aecf57fbdae9847f4e72a8844813d086d7cdb2521a09578ad04a0f31891571d508"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/bs/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/bs/firefox-69.0b14.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "4ad5cca7ce623219abfd09f94a33753f909e344ddc8f2687d6a50386275728e13853106206e1261c6625328f5448578890e496752cc11796a30757e29fdeeb2a"; + sha512 = "3b6a6e000d6887604696014e82c8668f4dd5e798287bc2e60cab98a0a51a4446854fc78a606615fd760f731c70cd10bade6e6f07fca17c5abc4e50d2c1cdb893"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/ca/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ca/firefox-69.0b14.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "83617e53c6b10b7668e7675ca0bd17d4a121eee25bf2381b2e97aae3f8bc2552422a18517f0112c938fc032f4dfc62c85844ac05f823b02346423339dc8f679d"; + sha512 = "ddde0c94dae1ef133d3312043271d7fc9d626900f5bbb473b7aa6c2ebb455d358736da2736271611f3e6b336f7c88a4e60d060101788bfc7ccccb9e2ff863259"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/cak/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/cak/firefox-69.0b14.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "11b6a20036725b6e794a2d76e73cb6d2850d498d8bcae442fa31f663901931665a9e4bd21c6694317eb3a493bf6d33e00bc8e8ad98f151a2bd38daec404a9e5e"; + sha512 = "875439f58c7ccba85c6a59031d92344262de3fb27852fcc727b15ee0964d37eaedf6715dc5569cccd0f7d684e96052b84926c4b81c509fe456015eb67ff883d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/cs/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/cs/firefox-69.0b14.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "387f5bf3c18887cd89c977504a2fb956944d3bdefbbe17410edc541ab8ceb16a4118b0e98e7193a85c66826c684e636dab7e7ab5033d4fcc6304ac49d0d96997"; + sha512 = "c93a27a66889e2e2ced6dcea0495d9295c179b2aa2afc706196b84a4c4537e0499875bd2b2ec152a38d2c5afb5d1d45224086c2cc2bfa56907c9f9aa883deea2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/cy/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/cy/firefox-69.0b14.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "a0c139b58e15851ca69fc9e138df813912be6ecace6003a3dd474ace17f4f18125b74f247bd795b619e6964d238c162e16ee83c953fb3511369842ec6374b4e6"; + sha512 = "66059d9f6e059bbebf42ab3d29fc9103de639e5b1fd7f4b8b0648b98d86a030d668bf35852bbe83ff27dc3d1ababe47a74f1e37a227a61da6b4c90b12543207a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/da/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/da/firefox-69.0b14.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "4a9459cef3d4c737652014d2b5a29801c3517e28d614cc1f8fd4707c7571e952a53c9bc0827308fa05272416f84e6db95b45bd27cfd7411f0bd15a75b17d5eab"; + sha512 = "a3943bc573c65a0c90a88ea76882a4b43ded06aa33c1bf1d861d3d6ababfef3c75104c7614b740860cd682c4d0cf3fdeaf54a41ef206f117ae8197a73431d362"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/de/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/de/firefox-69.0b14.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "1aae6f492c3f7dc2194fdc923568bd8b77ee9f591e7ca9d8f8e6e6dd14f6873bb999340ff0c347a60982ae7a35a1e98ed5cdb07cd079493e06f5f248859b99aa"; + sha512 = "2635e6ab49e4545f562043cc56e56750a882943ee160b3f2bcc328ae53bbeda364746a3d97cec3d84086e90b554a98184d268b27efb9e51255a3778ce1f5abf0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/dsb/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/dsb/firefox-69.0b14.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "283b212624768d1ffd58573f67e253a4f8d8b0ecc824fd666290b5424f1b1642d3d88fd0e1cc29f6259860718ab147bb371583fc5a8eebd408d5e73c7f8e1ed9"; + sha512 = "aa44a98135e4e5b3f28ac37eed0103876a817c07b231830271c2dd44351ac43da9139a3adbbc8a6ebf0cd28c87e802db27632d87e7f5afb0209f4816f35273db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/el/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/el/firefox-69.0b14.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "1ec29d5a50105d7f4d4b6d6cb2fec25a9fabb150a9de547fe13fd1c37a964ffb2bdc5a66599ba315fabca4bc833b8b12e48b218ff70711e06dca8b5d36332032"; + sha512 = "6c86717c1ec09829567ade584c4f114d6bc92c9ba85a4583670a038b5616521a4578ad97b023673125fe85b9a99fc7c3999fb7e4b50fd75540386b6024d26c69"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/en-CA/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/en-CA/firefox-69.0b14.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "86658e29977df1dc66487d4f4550db41474ed8625c920763336e2a1ecf98da2f0ae0d765c7a0b7ecb5864b505d841789ab93868bc1bb0542c687e359662027d2"; + sha512 = "90af2b18f403b7fd25bf5d920c3eaca638a6fd5c75dd57afdb0c9e1a20a8404cd652d2c69b63bcbf4365af88d1483f02b929d3b825899eb465c142775e4eeea6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/en-GB/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/en-GB/firefox-69.0b14.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "c8b4401a307d72b27843fccf12d71f72aadaa12eaf373af78f80ba00fb27fd3f7b06a430ab17bf74955d4de673373dec25faac738cb2bb292a48134043d95a6d"; + sha512 = "4ff1dfe725977d16c23333b3f3c8ca035d4973fea2d7d1f49daaf75cf6597fa56690512636a19455e5fcda984a4ac887d4b987b45b811683cb65d40daee7b8a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/en-US/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/en-US/firefox-69.0b14.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "291e666a59b9e26ba612a8cf75b04e82610d6818fe3aa034b09cd62052d52c3990eee25a808838348cdbb7606e2a9218c6a9478ef868207f0c920cab76bb393f"; + sha512 = "851e15abeda5a7d9faf74950e97b2decd6ef989c04acf8d57833f9172f0793f9741d9f1212c2aec41f017c8ccd491a1dc973beddee39ac7660e63f2a24463911"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/eo/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/eo/firefox-69.0b14.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "e056e31a8c364ebf56915967d54d0d24903adf32a751123171470bcd968779b3e58cec4731f9b126865b06bafc3aada52e6c0c4abadb981161c390b1ff75d916"; + sha512 = "623247002b82238eb05f4bc7fa6182aa5f68121a87af6cb78315b4f144a17a50899905d915dba41b5dc2d372ff97ff8dfbf0ed2a0a216c85cd45f65206ad23d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/es-AR/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/es-AR/firefox-69.0b14.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "b165b4626e4326b9a7b72d32497b935b14e470a8ec9731491762a4f2f5b020766a453a5d277a4b693ddba243c39a5145f6b1962cf65282f983ece1a58d9231f7"; + sha512 = "fe485782e38e7f0b74e96e2e06283b6ad30223ab1cdc3636fc15810b327ba564706d134ef00ab0a38d4f6d5639aa84a52cd46af4726e1fbfc9eb2ec19ce1862d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/es-CL/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/es-CL/firefox-69.0b14.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "e50aa715b2197242e03890bd7d981b34bbe438e7b594d38637495d6c5c7bbbe14dfc345893e08eddd095a758528ffb9f8fd73dc197bcd68c6b3a9aaa8dd403cb"; + sha512 = "8520600de63e160c21f4edddefdf8f971c12456a5ffe967dd02ca00c7227b34f6b8acc569fa0c0d40c6f91bdfe97683444eb38cbda8d1cb1ba2b913c943038d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/es-ES/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/es-ES/firefox-69.0b14.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "cf0900c6571046403fc0dc2369208ba65f580d6894b2e2888d50631480e2945129311e1a3f5971837c6afb3b558dfec83c0886802c7881c8840ea883a7049a38"; + sha512 = "0e36857acf8231b9be9983aac35b2090ccd85dd2f8cd7b37021f2d62b37b17eca4e29afa8afdc000ff608bc535b3583720c4111c6bc87a67b5928e25d1912f9d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/es-MX/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/es-MX/firefox-69.0b14.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "321f06c0105c8d969f1ea04ca8065bbca76d4c42c8eb18b95fb3d859b0d0d0a5e7c1bf5d7c9894821987b2a4d46c08198faca5c03cb0a51b001039977d523ecf"; + sha512 = "4611aa1bf2f9717093027cd38e60afecd855f9bd6f5b90e57ec64ba61c2d3cfa38e94688e5b7e02e6ca40a9ccd03ea9c25543b03be297ab76a89db3395fd7dca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/et/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/et/firefox-69.0b14.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "db603e5489fd329fa7f9c7b8e5589d2b7d62ca8e295dcab1e7a3e838c125f1acdca7dc541f67366acc4550682a121e132e5aff8243fd5e0871ad94249f037941"; + sha512 = "94d4cbfcab4dc697462001946eb91733e7c9cad2d70d1d7070ed6d6e4cd83f364338a70f313c400ebd9f17bebc05d8297e27b5d662f0f940a66e63a97e549ee7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/eu/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/eu/firefox-69.0b14.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "c74c42da5f7b1b08d3f031b6f67bc4b8fb3d77c7364bfc5d8ad442e0883efc7488e1699c560ae0c7efb88e4c4f5a661d972489b431bd710211398334047d8c98"; + sha512 = "e140a1bb452d2a970d540b764ba41bd70f4042f7f6f2d8bdc3407cd3d428e009815c3fffe4dafe3964dce45d860c7960d0818acc6fc8878e323b4fa1dbc340cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/fa/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/fa/firefox-69.0b14.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "fb791c52894ee901a54df353a7f4b3a16259689e05c4a18931c878665645d123cf493d25bfdaaa4641a6f925f2a23a77e585ec73f9f2bfb33b87ad3ffecc94cc"; + sha512 = "2ce77cb106e64e49b2605edd7f6ba19e7c0782356de0a38ee572e8b5f18020ff4e8235bd83749b578d67a40ac81b246a531e21ed24a944e562444344bb594121"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/ff/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ff/firefox-69.0b14.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "f5c657a4d1ff42e772943ade151288fc8fad73e532ee11f00ad6098288483a3326eb00a80f13b38abf4165a1ec057f5fcff705ebf9c6d1a29a3fab491b08b63a"; + sha512 = "a3b44ae73ff9bb7ace9ddc7d7886b4362eb2265fe0f8d5b2e34fb929dc367a6be29a46d750cd33b7d03cd321827dc261f1d88cca91fbb180ee1dc72398c1281e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/fi/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/fi/firefox-69.0b14.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "1d758e4d9c472286d694c70075a0e9a6c955f42e21ef38057e9647a91722ffa15909a39e4c29ecf8d221c5ee3d464a0bdab80b9ce2e9b048a471295f0b6b4dfe"; + sha512 = "934f497203bde168237ba43d49400dc48c9082a24de8f74ce887cbbc1f35057a2419dc346b88f18ed7d78596ed220d4f65371fd2bc34a1ef005803109c7e77d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/fr/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/fr/firefox-69.0b14.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "12bc2af05bd45e5296340560fb9b1b5c3b970bf4f57a3425fc4e7a810a8a092637ecac20ac1fdc643a4d891754b93109bdb8214ba5fe93bc62137c296d667ae6"; + sha512 = "778509904c83b8c00c0b71331c770cad677ee487079710d9244d1bcc5a2e2f6e397b30c1c8ffd7f787f8fbbe87f509105bd2978d26f60406b8904245f170d79c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/fy-NL/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/fy-NL/firefox-69.0b14.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "274c67f1acca9b79423da8366ed52036229917547dff79f740918818c379d21402eb0516ca8919cff136b6407950e6b4fb6fee3ce6c1bbc1d68092678f4f255c"; + sha512 = "8cd82fc3c7a2558f5408d2e18d8fffc01dc1a0c69f52e61e7da185a9b7d24c79e29d68c7e61386b6910aeb8f91276fc1fe5c142ca526112b1e0ab206ec3757dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/ga-IE/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ga-IE/firefox-69.0b14.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "537e1760621cdd5e0690db7ca1aa0fc935b0e1fcf1a037d988c38c7a5294e34cc904d44642234286b24e070b27ca67e41b7bef0e0983ef6909a977ce3b0ec52b"; + sha512 = "4e0184a5d0f6a8213d250b2210076e4857d27224b2d6ca27375a8951417ffc74e8fb02b9b571a12f34f59911f0663ff21d1abb09836bc0f4a1fac3c6894bf82d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/gd/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/gd/firefox-69.0b14.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "1198fffefa0cfc1e4d9dc7058c840ee3aa6957022a988c3f39fb9da29b74650923153c563f1c5504f70bf8effeb35ed4d9b697e637613b145ae88d556002c064"; + sha512 = "f67a284aba28000a070f06c1b075dbf3edb60b4704c62fe80df4714df51395644507ebb89506ab2cb65ccd8d1c16e896da0c4dbac7fd3251026f0e00bcabe014"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/gl/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/gl/firefox-69.0b14.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "5484eb61aa9d6103b9b44ca9dd0fd2ef1440b20a5c07392aa1a71127a0bba0867e55797429edf328a5c7fd207325df0deb04429e2224ed9faa1336c8d189f5db"; + sha512 = "c07c74904f845e2b740f6eabd334fa1aa0d74012e86fbc17624d671c7e2cb3d78143a499aabadeecdf276c3c6d4f2934a54240ec7078619491eeb28c8c50be9f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/gn/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/gn/firefox-69.0b14.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "65d1b767146511e6c337cb18dffe1e1e8bbcc702aefb6dccdc31b6722a3f0146826e154b0255ede79f282a3fa3bb4b63d7350acbf49d752d2e8b58de484c2b34"; + sha512 = "426ceb6386da90c30726ff5318613bb88875c1b109bbd73f46f6c436b61a18b76a8272807323abf925e1ebbc6531c7d82ce1af5dbaa9a2941a8007cf8dffd3f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/gu-IN/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/gu-IN/firefox-69.0b14.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "e8c3cd52bc402b56d04ae1be33a99197df8570d160fc415893f9d91ba7a4b64e20f345282eba8e1b71f9c486db4b37e84e6b56f63b8f6f15532a1ce9bdcee7e4"; + sha512 = "71217c32a6cf4fe5bdc922d09bc290537e58f26a75290bf23a5fc60be3e42b8b17d5b05dfc8ea4c547a149e795fc9449459d5f74efb4c7d9ab7068f5533c0bb2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/he/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/he/firefox-69.0b14.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "b2b8b13ee803ffdb039bd656a8f7eebaf10cca29a49ddb2555bb2e561b39a7f76f3e65243e3b37ec31b182897a260ae801ce11223f888949677539b103561398"; + sha512 = "580b58ccefbc9f1d79027976dcb8b880c6608208322449146c99e1e6ceb18b0d9069891dccee5c37df48b8251984ad915228fdebd48d3770b54e47ee2433440b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/hi-IN/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/hi-IN/firefox-69.0b14.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "e564b962cdef896bb6b7708c315b3ab07bb51c4d3813a9855d5ecfd774577808165c15db6f875894b6ca4d9ce01ade8b2eda64d12d2b03a507291ed235978691"; + sha512 = "52d0bf548b7cdf6db5bda320f8262d226adde14cab042458e591fa922e5c4cb66c7a10699ffd3a4e90b9be522c5dba77bb8bc787b4db73b6805a04b72d92f752"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/hr/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/hr/firefox-69.0b14.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "56ed53ccf263879995b79e9455a73fd7fa9cc082fa984f603d5b9347231232598f85f7c3abcd4e1ae243098ad338eb59efb544a1aef16f6c55e036ff4ea02324"; + sha512 = "8a24d6c60af65b624a3f577a984d237ac93582bc5630ec2fd7d3c39902ca73ea47ae34d41fe90dbdabf15872bfd679e029ec361ecb7d38c17be4441f3df298ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/hsb/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/hsb/firefox-69.0b14.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "9bd729f6d27874d73d4d174f8520dd5639d6e8e4c2284b67438b73b44eb715478a66d2be348b431007fc19ba7c347f914da59265369e80ff7ddb545e6fde25a7"; + sha512 = "085f6fe6b298047cd08c153c8fa9c3266c8fe69c0165647c863053e2b9836db9b5dd083c7fcedbb2100b22947a296da5b0894897eb801734430e153eddd168b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/hu/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/hu/firefox-69.0b14.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "872993e7f725c8ad3c360cfdaeed4ad0839857f52d88d5db040ec4dbfd829241a7aa0f4c786f2e5f174b4a3161000dd2bc962e9f290e8f67a0757db52ab3ec7c"; + sha512 = "06c2e59c69eabee03b5bf118d27fcc5b9ee3ca21e1596926c5e75200f47ee4b27c4bba5da0e3a67cf6acd7986dd066f2ca79089156559c2cb725023067dddbbd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/hy-AM/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/hy-AM/firefox-69.0b14.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "a503a134cbde97990b0f733eb79a93454f668c490040b83a109200a3c54560730a1a1b9fce137af6ca5e1a37268b994f500030be8215222d442b651f319e3f75"; + sha512 = "94f95dc01d54875be32db75a8ba17202678aeb8f0dc471a356b73ff6cf2725d302dbb5bb41318b69e904d9a685e8b833bf0ad489818fdc4aec72617cf19e3221"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/ia/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ia/firefox-69.0b14.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "9ff8052382c08e4181c55706cf6612abf24ac8db22a64f7adacda83efbe3e17b8866a7536a9bfeec555ca0a8f3628e88effcc39998a13f382223551d111ac3ca"; + sha512 = "ad541cabe5f20fc90cccb932e4062d8088fd58b9bffdacf6da8c53cf9667d82363a8da70bb441881fd132bf0239adca681abad4ffc44808f4565eca9830ef387"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/id/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/id/firefox-69.0b14.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "e03931527fb8a834973092e7cdc75fb1a03923a7ee26abb4e415a6eabef47a32a52accb1365030b4ee84687289a2b71c94faf633f39fa868ee0ffe235e1518f8"; + sha512 = "ccbba3cd4a34a2db26c81bd670b53e50279ee22b1e43203802112010024ab496077f2efab9f100f50dadfda7d35edad09cfee7e54997ee2034d84e8efa24dc3e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/is/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/is/firefox-69.0b14.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "403339f6fffb70f1541b11840e38ef8ea52d2fbae4ccfe802dc1dbcfc1b2ab8ce50ef7eb3e20c485d86f3ec1c97cba9077a131b7db8d3ba42cec71778b09888f"; + sha512 = "11ef7c6e96d4fe5813bfa63a322b9a57f283e444a22be440ea14acc0d186314e57119642dae7d285122a17ede96eb8d37f8f879c22101f8a64ea5f0b97dd1a17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/it/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/it/firefox-69.0b14.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "518a661eb87dae3af75834198c6fb1d3f6836511dd532b3166f4b395ac0fb1ab602b56a0a8be06f3474e2c89da8ba04b09fc116b2391b11b229d2aef8ff31275"; + sha512 = "c568510a83c61f9472852f8c8fff0293bc7dff741f4ad8bdcb16caa5abdb2fc9cc0186ed13c95485775c8041e9ad0a4f6433fff933626f80eafea9ffa3fd3f61"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/ja/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ja/firefox-69.0b14.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "e1ad475114f41e22ef4eb38cff1870822920fe164a79791b21a9b7e9dfb4c7ede59f16578db71214d72270e18ed7eac759a2a978b9fa1c52b04b8b07468c9531"; + sha512 = "f04b5d728d9e319c2f88db4c283daba74cc36b03221a61c92dbd3301f1a2a8d725dd72fc9fc95e984082eb128a519e002bb62c59f82e6a529afbb36289be5e23"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/ka/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ka/firefox-69.0b14.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "4aa683433623ac70de7ba0377f8fecd9685a40f1ade072c70cfc2bba375158e04d54fcb25a170077e321d300de849a9e19eba464c619b9f911c25340aa636133"; + sha512 = "9c47c3e57913fa009e92858363a7384f9e71a9b6826c64edaa2772984be43c32e45c73b7599d45ff51dcb11a42fb70963ab95615f730a2f11d792e0ee1c0417a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/kab/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/kab/firefox-69.0b14.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "45f1b8a04b5a80c4e8207eb9c52b44228b176037aa47319325c0783dd6b5b09c07f76f12535d1f1eda265e0e6f160c24cfd087c699c24d628fbc4d007c156dec"; + sha512 = "aa7e4e641d79568af30845813ae6aed59d59964b37be672b9a18a0006f152dce7fdace65a6d4ae2626f80becfa56b32f0b18cc826cde2d555816a27c76b175da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/kk/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/kk/firefox-69.0b14.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "6b327637688b45f61cabfa626fb8b23919142e8eba03db5727bd18b714d4671f6beca487c43fe95f48d9d6771e1775cda098197e41addd06979b480558bea85b"; + sha512 = "30817ac01333af478e9dc6be7db8e898705bc9020627b171de664e892ec13987f17e8e2a346cd94bf77bd9caae62cf8b37a1ee3714cdc034c648cdb424c72cac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/km/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/km/firefox-69.0b14.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "de72e1d2164a102c063f6906678a739d70cd7e0b44dfac622ef94e79d7bf076e32fd166b12f9fc077b65592d97d5d6b2f13ba2e403c24c9f9a988f58c9ac3554"; + sha512 = "f0c6fac7c89b677eb2407b199d61690a3ad59128b9d1a06575dfe289718e0d5677573cb0ff3da8e313d24798a9776c4387e57a60bae3ba916383cc02a57612e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/kn/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/kn/firefox-69.0b14.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "b505d91f5586a2aaa53824faeb65c31fdb85cd975e8ec659e63c1c95a71f96fa13350f93658455cb9000bc533551a4ca1cde49a0ea74a0d0a8927215b251c34d"; + sha512 = "5ac4a09bf82678f3d8bd53c8bd44c1f6c0811a942a99321cfca1d553d68ead2abe8ed2f4af3c50e9ee88ac1ede35e201fa4fa2ec399016b122389a51f16cd5be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/ko/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ko/firefox-69.0b14.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "84fc13c778f38dec4399293bf8b4129d5d21596cb9442e2f6a6d9cf671917b762fee13509a817d272bb4883ae012692919eb62f8c83ae9620684a9f458ac85e9"; + sha512 = "dd1bdf3e30b3a43d196ec50870bc8f2abcacf703860dab5b21e9b50fad5dbf9ed7cf0bdedf0844a2d56e60f9fc461e397b48f12956e2d95ab6e941b760e6f5c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/lij/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/lij/firefox-69.0b14.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "afcc6d36a9186a24c7672bf0c3cc181e021ec2c08651a84b58e9f06e400394d8ccc7b4484d17909c3388714104ce3485005eef3911596dc23abf8ea9515a4908"; + sha512 = "5c9feb27b7ccec9a6594cf027b7ce55df4e0becb5871444bc24328401e3a764d7dadfa3a56b654b18b2e10ab8a8e03c96021a33de5cdc66b0d7e3d6992a2fb5f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/lt/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/lt/firefox-69.0b14.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "ad072bd72f7160d7bd9caa7e69d8b1cfd8744e6ead5e1ba0bce5c89a5e4c5193cc55b56018f9feda5d03041082eb5e054dac18ae78d280d7bba72fa5b12ef84a"; + sha512 = "ebbda17ab983261c9a593a4368696026f4743a79c6cf70e89184390b4c1966d474b75bd751a52dabe06e303b8f223c524494a6cb753dcd547cc8c93ba911088e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/lv/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/lv/firefox-69.0b14.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "3b8bb275384540b32b29d32a72ebb54997aec84b2dabe26ce6f9a92ca60a461dac4368fc8ab816001664c1e8702c130aabf5ae3c39c107da034670aa52b9b616"; + sha512 = "059c241db15b20d4a5713b35fc7dec60d51253a0d3c9e9e1337defa2ec33e0a3e22b2be6346b6b7fa51e35fd48870a86c2315bedbc32669260195bdff3e5d9b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/mk/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/mk/firefox-69.0b14.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "519c24ac7757d8af7959dab1e88315f4e4c163003d9467c5d1c5606fe74e9972d35d54731eb46cb7de98be456094d047782c62bbd6e3880f6743c2b3441ce865"; + sha512 = "170ace7a442581946c8ab52b63c935ad58cd3e6415c109c564faeec9333025fb9647f0f049a192386a2d980b7c3f9ceea62e1d56cc90e8c8a4aec568f58e4dbf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/mr/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/mr/firefox-69.0b14.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "7dfa0d85c946dec0190730c49b79a447311e632a58e467c5451c467fa870e6262077f89b2bbb57e29d9d35ae78fb182c4553d4f192aed45633776b6301a53a26"; + sha512 = "91e4aa884b26041047ab3bc0c3eb5bb14a62776982f7e1edfc53f1732c5fba9bdb97b77e5f9603cfdd4bb2f67ca5f5959ea61eb4827c6075d30b502c9282cb3b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/ms/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ms/firefox-69.0b14.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "2e7201c05ebdf99e7dd87c1fd974a33fd8c5d56e34aab55da6af22237ea8a4caeb6367ffdbfdfb15e5726096b918ccb7512c77ab20e02f879f4cfd5be27caa3d"; + sha512 = "2c236d61824b559def24a9f96ff15075d17220893ce5500bf1f997d582b89b8948eeb88683997ffb64dd57c2fdc01961d877de28be6110da7ff4bddb129540be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/my/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/my/firefox-69.0b14.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "f5cb255dddc705083cd5c91daced163d4337b4162d9686d6c76ab935aabb6d3a651e3932189948115c1612ad5e864cc83ee17f107422d21eb9f8dd54e28d271b"; + sha512 = "909aee75dd8597d4c7d08cd28972c27fbe07aa774c93a6639d38ca152ea2d0a5330329a857b04100b67b35142689b3ab9f4376200b9d6efe8612a8dbaa19618b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/nb-NO/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/nb-NO/firefox-69.0b14.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "d0eeecb4147ef017c4301621ef7c04a14e1aa7af7e7de2882733ff77e8fde916f55d68573cad5d104eb631c60172b7fd886b4c896c1fe9805841ce5e40de6a38"; + sha512 = "a7b65f920dccfefb64e1d0a2425a8514e555089262f2d0d5300009c9d8b8ff343f387d0f3797819808a2d2b67c10ec026fd12f0306e23d8b31573a9ebbad726a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/ne-NP/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ne-NP/firefox-69.0b14.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "db7f205b6c42575bbf1e69c256c2113d49a86388f58eb806e761024e73f70ced1a974e18b226c83936a601f428c54ac8deb663ca950960154c60e41fec37efcf"; + sha512 = "10e0715ca360b3299312c6f8c86b4d89ccc0788611c44e20d90b0cadb20e00f2071377fb934383d6d76cff49d0fcaeb155b68328fb5bc96fb09479a192df1464"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/nl/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/nl/firefox-69.0b14.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "b5c4569a404b9b7cbf6b3c4e1b125c1b45fe228018b8513766726f00bf7e52fe2ed1d07f724f5cd2a37afce2c84201d30425d156eead9e02a47011c95fb045d8"; + sha512 = "1e688394daf56bc6900d765ae4d01941d9cc02457b95965cc9624be7ad5a50a8b8cdc6212d7270c8253d539ecbe60a21648cf13f61bfade3dafcd8e6273509b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/nn-NO/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/nn-NO/firefox-69.0b14.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "0d8661643f719055c88b057838fec06b19cc5c91d7975149dce7c61ada82dc7f40516622828c05cfc1a5bd44442f2677907b460770378b92bffdebba9dee3015"; + sha512 = "8fcaadfa9e895a97403c60a09e27282b0907346d20c8dbcc8bc9343c0bbba03d3bdf6fc22e52271d5edb9e1df214844f17dc81d3aa74adbc2623fc34f034dcb5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/oc/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/oc/firefox-69.0b14.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "5064c9198ec7f2c2e83683405d0ec619f7f8243e326051e33fcd869499fe281836ad2d5e1b633a3f264f7968398ff5c8933c5f7fe95729db462395042673058c"; + sha512 = "d2edc1fc3fb685ec8f46b58559edac3e6fa3eda0df5ef7bc95c4b4ed444bfdbff43257e5cebb50ef438c7638ac3cde6411e9d5b0a93bd22876c0a13965403a30"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/pa-IN/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/pa-IN/firefox-69.0b14.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "3c52168910d6612a5cd6540b74d922624ed399bc6cdede95ca1ba83cd534acbf6673170687393d3f0ea9a04fbc5940e97062bdf25484a779bb93f914cf793865"; + sha512 = "535726a70b1d2e4562f4459df2873aff9b41ffc8e88bfe606465871e13ea4205431ce8846670b178e043e35b81ee8e71bcc896971dac2d8d538681ca8dd0db9a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/pl/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/pl/firefox-69.0b14.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "b8e627cae2a2a2acb6b0dfab43ea501171165898196634ec435944d625ef8d1048ed02ac94aab9bdaf63ec5b2f3159d534db78801b1038fb493797ba27c2d7dc"; + sha512 = "1704e78bb2d0e9e8b50c078a52a01777f6df1fd4b2ed05a7226fe7f6eaaa38ae72a9ffd8780b0e6b9a51da40990de386e8acd518426ee89e61d16d6505e7befd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/pt-BR/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/pt-BR/firefox-69.0b14.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "263678f014c16c22edcf4139bcc443a02fd67dd41a8820f670c2a1a44f83bc3bc4532bbad92707525264baf687a17b6d5d3e46bd9d7228a3798c7387d218e17f"; + sha512 = "0cee5dc74c31ccd80b2cd81a83b909a77dc77c06f38af6290b7d6897d97e7aedf3036d03b1d42ef33dc3942566809388ca5b3e6d9b78a84793987db77fbb1fd3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/pt-PT/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/pt-PT/firefox-69.0b14.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "2113203fef6c17485784d4ecb03ac8ed249102a8bd231ef3c0a9c95c06e0d46ab3bd5af475ffbd9ce11036df0937e34a42ea560a3c056ea153607e93540fb91b"; + sha512 = "b43c1fe0fcdfac892b73a3ef7c3ecfbdb5b646f9badb0dc5d64f9614ad35686e1eaa1e6ccc2cccf9c9a9bf25cd629e5bb893d13942a5dfba67368cf3ccf59c82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/rm/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/rm/firefox-69.0b14.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "57e47591931d942c59259d10b41a3eacb4e5d8d61540fc294546a0a15dd347b2419b64b66e4a33e651e2f616e158b7bda60bccfaea1a42182197dca694e43e3e"; + sha512 = "370593dfc73e15ec56950c6fe788d579582451151e26896587258bbda65e623bcf28943413d80ba7bb629dc2230e4f42da0c26cd137f8fcbee79d85a8fb4c57a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/ro/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ro/firefox-69.0b14.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "0c206c38a7833d1c7596f26a0d6b995cbbaedb2b014464dc15c82fb3a8315bb524dec0d2df2ddfe9a28b8737c32c87a85c8b815f284535dc572669089266fee9"; + sha512 = "6a415e17b0a3511da4bc97be2cbff5cb4307c4c63bdd2bf316b3469d6ea1abf365ac84608b169efe3e5ad8629a0430bac0898750b964672f83da0999c1c9b12e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/ru/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ru/firefox-69.0b14.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "fa544b95295299c3a9eb8c97be37cab4faf77df818f624562dbfcb553f6b9650b458185e52c2a77ce07e3884ce76bcf925e15aabaa4af4490abb9a6b9ff1ac81"; + sha512 = "b6a7c931874e0b41dbdfa7658b3ce1f7560d20acdc2ad1cb7fd3a51c05e6c7f392eb39c55faae6d723b23cf83ba5134bf9ae12463161fc9df0b04a311bb8f7cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/si/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/si/firefox-69.0b14.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "2f2a407162f4c1fbda3ae3c2f18a97683ff12fcbf863734659d45aae50ea6cc3a8bb447449c1e1922b3b64f84bcc295596287cd24855e10ff8fe25401293f888"; + sha512 = "c2ccb292b6652320593dfb05af30be4a5fca09318981e255f15003bfb8911a6fc3c8bff420bdc13bbd1aea69b44e5809370ec100c4b6eb6ff54c71c85b3f52c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/sk/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/sk/firefox-69.0b14.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "871daa6bdeb59b9ac1c3d73316846d2955bd278a46f17820c7b1f9724a91968f7e1dc19934701afe4d880a22befd3999784e1cda962620400b01bc56662245d8"; + sha512 = "8cecce76d5d8f6ed8d778fe2d2c733f1d81255696e78f7422c464df96275149246704175ae1c28566d223ca38da908d7974f0b055ab953cd3acc08c4e1c246a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/sl/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/sl/firefox-69.0b14.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "02e477a1c5ffb5cb8df98c8da67dc1556e0bc832b99ab03b4e231ee801baa8bc2964ed81e94ef431ea70b958c3c18fe01dcfec583823d4aebd3c6efb24333772"; + sha512 = "0cfc0a94d8273926407ebc8addb69b76fc734215e6f0199c8b7e9e932ff89315f49f2695826446591a7e223d07b61da8ac2146f5589d58093096f70425ae15c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/son/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/son/firefox-69.0b14.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "b423b037a5395bd230030ce18056703867d74fd595b54c070fb9165f8c8b25108acc9b35fe0422bedc6e5ff57a0657b4bf1ebf5b9840c3b5f0fd3db2b577d416"; + sha512 = "321034ab272f1bfd07bc4938912be05b0a14e81ba537cd232ce38e408d3c9dee6d93010c62c029be27d0322db7883cba6d418b35b0afba534eb32f4bf18e0273"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/sq/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/sq/firefox-69.0b14.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "7805e5a4b7b84e3ca89bb40d086726b42afb07e6aa78ac2c5231a1e8a3deadf02493b83077841e979b08eee913062c03a6da6b7a835acb54dc2ce34692808a67"; + sha512 = "3eb99ec8007060e049b1be8a70360d8839b90a48599866687b7ccefb46f736ecbcfb166936946feb4e959a941fc0534b6f843d8c62ef4f77b2cead7df32b892d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/sr/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/sr/firefox-69.0b14.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "e3506dcd3a14fefffd3a450e2573498db3fc82ecf9e20b203c5bcb3ba8d9f62e7dc69dfa3ceece91090adafad675451bf70d5badda3e0adcabf340410c9fbce0"; + sha512 = "1645d31f9ae714a85bbc3433bfb97d910147d2b4c8e0b971a75d4bea5b8aeb2c500093e85beef9b28720a6c372db5edf68bd83be874cdf121add61fed3f098d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/sv-SE/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/sv-SE/firefox-69.0b14.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "cacecb4743defedf9f67348adfb201f0092d835049b8a93afe1f1bba6c919441b540c101024f8e55b4d3ad2f4fdc71f8cd91bfc7d35ba5ee2af4ec13efacf10a"; + sha512 = "5a6c3329faf019a10d55a36cf893ce0d961c339c1a80ddec644266c164b774a6fb2bfdd371ceb50de758f12da5172c9bfc37aa6dda254c95b6fe01039c708191"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/ta/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ta/firefox-69.0b14.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "9184c8ec21fecb20291cefaca07b78fa1d18baa5ae0af2a13639f0b3de176b80615a133a26b575a8c10d722308f50aa0dfb34d9b495a92a137cd1ff738467be7"; + sha512 = "98810df80bd496c8fab57530c56c7aaba0425bcff3debe07dfa4a647f63d6b7cb652fea19c5ec00c61536ea0e94fed6ea583aa411cd72919852f832dd02d6b61"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/te/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/te/firefox-69.0b14.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "e903b44ee00bf108bfdb57a31bd954a7a924c039e606bbbe8d804979ea2c9d9268e23df1da36f1188b3e2684bf77a8ccc12590bfd02f73b759cd8f660f038a31"; + sha512 = "ad71ef457a0eb6324a23f7a2e4c6a0dfb6b07063e1ee5f2425a6dd6ab9feeac9f9240b9193d4bc8a70b715cb4f88322f39da577b645cc9359915ccaf91d1d19f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/th/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/th/firefox-69.0b14.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "1c5c1a75ebe2cc3a80eb88d3cf80787360e88401ee749ab5b8944caba5caf55d267939376a0c76c72bd733b31d438e141d3f937bf604e8f48e333cc3024851a0"; + sha512 = "2e522f9c164049b6f8510065e2bd69394067b45f361ff127880dcaf1bb4bf893a8d4559222c39dae46b85e6b72abd0204e36296c119ac8c3442bebc8426a5276"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/tr/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/tr/firefox-69.0b14.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "a7fc78e4abbaf40ec8982ee14054e2cce5f21e4c5f6fd2dc04d38bb6b3b062c12a97cc7dc113b8893a1f5a842aa892ea1440bad081530918e1108b7034e349e4"; + sha512 = "b6f684716068ad18aa626c05fb2ea331f33e0648c1d710f1037e3c5ad79d9f95748314d1f205fd1c3f3bda57c8512adc0bad55b56f355d9ba5f20469b00e2fb8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/uk/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/uk/firefox-69.0b14.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "fbfc588e3a366190509948fa846ee0c075e91e4489ca31c496ad73cf3150d93cd1ae657886f370ff36acb211852b0644dd3bc446da973a2dc18f019752a0810e"; + sha512 = "edeeea9cddcbb5505bef77b91a7f85ee909aa1fa803fe0e5a142a2207a0e8717a983bbf5636c3adf0798fd77e509bb90c759615810f19a59a2839e5336264d1f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/ur/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ur/firefox-69.0b14.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "ec1cd0bea6a8a78ec6c8bf459d84af87958bf11835ded4c33a46cb721d37a0c56854bc754b5f4c13890b3a436d8c7b9746a6a421683f7845b72052eec9f59bae"; + sha512 = "36193d23c39331bbdae452acd06fa9db963366cb302ecbfc19724ab41fbba4d1ff3daa0f58cfafda95146792dbc1988878080ed104b8f77f1f81a53157728a93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/uz/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/uz/firefox-69.0b14.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "0d8f70aa963afb07cd2a3eed5eead80afa7a8e4664411a781e2ed808fee47381d341b4a0a118b73cf19a3639d61dd36f47a10a5a4e88243ccf0a4930585aa02b"; + sha512 = "06ebb9c3c88d2332fcca2eb51f4a2995c9e181da9e84db1d8f57ce1c2ad4dd35a6b0ed3e7a61395bda7302bd6e7eacfb2114b51fb71e2e3dcefc9d3ef975036d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/vi/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/vi/firefox-69.0b14.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "530c31e84972d53a6983291bdf1a01a4528503f122f94bee9e3fd4fbe284bf7b92f3f53e9b119c9da678a9b453b6f64a054385b96af2bf7855a90babf7cfcf14"; + sha512 = "944b716ccd4ba2ca23f1fe1ab8f5a6e16edee1d8f1ed3d2d785f061ec3317431f941b6aa811ed02f35d9862e44dd7b31a860e292509632258b45b6160a6bbd5e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/xh/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/xh/firefox-69.0b14.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "e2c3ac847fce76ee7754e02fe1bd34882e2364ec8773906f9884ce2806b47f5cd966fd5fa39229bf6ce67df43e803542cd6a4925255138d007b571288c8212a3"; + sha512 = "f391a9ef0b66224e91bdc99a0a509211a56af3958f0b2d491d11ab024771bc91986b79b87733c86f8d045564d2546f68a8f2891bb13baacffa55d8f481a87421"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/zh-CN/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/zh-CN/firefox-69.0b14.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "04c3306367ed2284b08fcb5c8a8f0c5d3b447117a1195b50457d0e9907d262163129811e95222f307668f4c1178a4575c6d80f3d7ad68587630fb83ca6c1f9f4"; + sha512 = "ec812067a347aa55d3555f156ce9dcce040ac7fa363dd3ff06dae9120e8186f521b08e4b02ce23e41adc5ee443dcf112264043efdadc328b43ba192d977f7d15"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/zh-TW/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/zh-TW/firefox-69.0b14.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "cea2e28cec094e9672d849a94b65f925ffb44de9e8182961ba5fe5e1571d665a069c525ff11b9f61632b64017674266b109d5cbd032f552d0d99ec9fc347bba2"; + sha512 = "a42ceb0523b083feda01262678344ae138bc5ff64c4713791a005191b5fe8378813501de11b25bf9c50019f0a07b9180fb34547ae4bebe98eb9964ab9312560b"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 18d14d4120a..cd9d3bd88a0 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,935 +1,935 @@ { - version = "68.0.1"; + version = "68.0.2"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/ach/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ach/firefox-68.0.2.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "afebe9f5723ce941fe5f00a4135ae8efaf9659c6d7645f024d0e971c37ec2ca84193848ebfdd4eb3125784986a4093e86884d88a1b68d5180f6deeef18daa9f3"; + sha512 = "f4ef9741a880475331f3cfd6aa9315d64c6cabc68fcea85e9f04f6a4f6cf9df952c05ef810b1eeaa5afbbc4001735840849c2dc180694bc76b5a3812f83ee50b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/af/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/af/firefox-68.0.2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "c06bdcb1e67f29005cedfd8255ebe120ac774766ee21acea659752cbc886c014f88caf21e48c2595f69e518fd54c50cca379f46c8b1ba2271bc3ec42b57c2952"; + sha512 = "891d435d29154ebff8caa7942196c593ae350f490a411d05de1af247ca371f8f531d9a90e52c666f530ae5a4145ff99f686629921f908712c7931bf43d21b9c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/an/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/an/firefox-68.0.2.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "990fc0b0982c5793b7b2f8f95730335091c31c322001302fcbf9a0802425a8e218278c5b65cbc66d1a5078e51a32bde10baeb633c564fa5f639bbd985fb6e441"; + sha512 = "d7f587357777b7bf70add4162cd62364d8c2be0bf7219e4c1b25335b66645ae4c1e5581a7d0a03e30d4eab5c5664cf05b1b85ce0dd13827a29c0ce227549c9e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/ar/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ar/firefox-68.0.2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "436134d474b5f76eca8edcd16661ffe6af7e169ea617fef6605a513be628fc662eb5f64c491813a8bd31fdb20b574f5937ad1287a32465b8024e21699845069e"; + sha512 = "2b04ba04cdfb1ad488fd5a183a862c2f6d0166d73ee637a25d64a7e9ff962d0fe7ab8970afa83cf28c5976f16257c42f6a26499b49b2d01f4e655499ec85cb0d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/ast/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ast/firefox-68.0.2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "ebb609e71fa97a43b55f14af6ab96f757d3d4f8feb27ca36a29f1dbae2a8cad7ff2ec186d715000399b300ef4ac222b339c0935acfb36efa39cff7878150fa71"; + sha512 = "2267f7a3a8a27816e550e567d5b9a9639df31b86e24c17216e9843bf5211e520d3303200f5c15b9a342e90754db9a9646ad87615b6b490d6058f26fd21db6ffe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/az/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/az/firefox-68.0.2.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "545f0fdc8e872d22dca7dfff9162634d58250f2575c09ee534aa537db02d641cbed2c70b93b06e35677ae061a25518813e69a771fd10f02149df658bdf20835a"; + sha512 = "69f2e026ddc3c26f7f8a6ee2d239289c1e154a9147a20dcfb07be571bd57ed3492c2b770c768dd0b6ace979410649af5193140757b1d5131391706ce156746d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/be/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/be/firefox-68.0.2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "1a6e1130c20af4c72f21ab5fb9cfbf206a20dbbbb3f2a96ffeb2f5c4e755a545eece645f5d022cda6989890715cdd633be14391344ebbcf20d8ae7e6077f8f28"; + sha512 = "11efb3f3a123d29814be1e4f72e2a0424f05d5c2d5da67fd0ae4f23909d8da910e2b9efde472c85fc3c0b2d51492eae2b41575e6a84954073842d210cbc4de5c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/bg/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/bg/firefox-68.0.2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "bd2001033e785eccb2fd1007231aa290042a4c8be1a39cf9770545dc8c779f3caaae8f4709f62753c0d7442082592864f2c8077ab9decad1bce9b817631a3e21"; + sha512 = "75b57ec04a5a56691e31d4d10acca2e28d1d8975f4cd277c4e1e523e9ab0860789c83f63ce2a7c41f8b3308c7f75539d3c833c2cd62bcecf8677114b053322ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/bn/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/bn/firefox-68.0.2.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha512 = "0426330b97dc387ba6e418c1d8410f7acfe6461da9cf8527286d97e8716886e743ff874ae6d4ecf50b2cf40ebafecd0ea0a4282aa4eb1e6e89ad85d84567558d"; + sha512 = "6942ef38de37525233bc24aa993fb9ef3e723fb21a4627f0edd53412b2129c1326b85f3c828383080d7fbff3fecaca63d69e765b61b1d45a2edebc0c037f710f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/br/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/br/firefox-68.0.2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "9373aa27dc0b00588d90f9d08b0c65fde1153a79edd69b886fa01052f84cbd5c041d6b06cdc8c441f8bb33b9abd29dff98b6d0cf6a79de0111cdad0383317338"; + sha512 = "d34947348a7e6ebdfc6d4f91f2b567e6623175dc61a774bc79d137e4bc9679dff381d3e454029d35028ee1019fc806b26e7c85ce4fe36868f01978e4540480e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/bs/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/bs/firefox-68.0.2.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "5268133d1f1a22d8c4577ec39c772d30430cdfc8a1038ec817a045bce5de08dd09b1cc980ca124e3bf6675cca30d7a2f728397484e6218f859e6c2c7b3f67f9a"; + sha512 = "ee1c6343ea3aef7852ca240608f80dc9279469422e6730f0eb2cc8c532ffb5c6eba01bc3f1f2f759724661c53d329be619593d741771187057fdb903100f1153"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/ca/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ca/firefox-68.0.2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "96137fff14c26d3ed2fa6d27ca9a3a16773dbb37cd6f00aeef68cb88797ea9159684594d9b6252b384d878e9439e630b5b1e208bfa32251627ee187bc059742f"; + sha512 = "f22b424240fb8858a9960f96384e81f8609deca0adda0deb29e18328b4f4dd71048c4b450121f53c29d6a4b3d63a4cba8a72a7194da3e93645bbcc00d7d7951a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/cak/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/cak/firefox-68.0.2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "f3aeb0953e86f6bbb8a7f6bf3be70ed80b653c4473fea54ab49025976d3752ff58c32f24700056ff9d176055ef6708c930ef98f29bec2ee82bfdab6f2fa721e9"; + sha512 = "5b4332b617917f5aaeb315f51262cd444e09bf8c0ba6c147c11ffd23a3eadf4a27bc67067baf17424138b3d26760780a0e8a482701dc9ee8b12a1de229fb8026"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/cs/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/cs/firefox-68.0.2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "a233241811e4616cb1bfa2d772c29895b3f4be669fd4e5d7a247b572d840ec4987246b556df23958a6a7953b8e4f04e891071ad5cad21be9017bc70d6e21e0e7"; + sha512 = "a9037bd4feceaa7db14d342ba6bcb07526f847650bafbf40615b1f209a8992739ce82729c3b02230a295638292d219c327fc752fa206945261c3897a888ec4f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/cy/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/cy/firefox-68.0.2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "2c13078a947961c7d91a3646f760ab85121e01d2b3f7b521a14aef4fe8fe0c341a0d605df0966a03ce58a6214cfd9f463504be4bfbedf22253d73c18781c0076"; + sha512 = "0eef12e6d28dd7b0adeea318eb17fed6325c4417d3b05e72fc106118d43d6d152e2b858888164344dfbced5708adb88615490c8e7f784707b6f9e30f52d877c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/da/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/da/firefox-68.0.2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "9e146040a61915fba2531d798b3e4874154cf9750ed55af2018542df6ff294f690929747fb110286fb1176be016034c637d18f97599e54a28e05f639c5ced4aa"; + sha512 = "d3f1ee58db717a3b04d1cdda1790243d776bc8c0670501ad74b1871c61fa788f143ac3c43a9b5c6635f4e5d7f2daf15e293994ba0fd6d5d4dc70b3a39c9f872f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/de/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/de/firefox-68.0.2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "af243d5764a47c3df49661e1011a9cb776ced13483ebdd054ee4be507e56136dcbc734988849e61c87ea9795b364ca002431eeef16c343a4cd8508583e7cc5bb"; + sha512 = "86c38b2a5c8507de6949c153ffc98a2451cc3fb4d35aa534c36ff1b723a0153ccc5c5a92ccdd470826edbd844b02476c58800c2a7c6472a4cfec860e13a7e270"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/dsb/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/dsb/firefox-68.0.2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "5f4335d5bbed003c3692cd3fc6fbc196559d629d9b09ef1e6d94f758658bcd637c300e9c72ee7a53fa5ecfc998b276ddd94f87e961df914e193b762bb2889c94"; + sha512 = "2c8bcafe89dbbf2361af22789a3743ecd2c12fea2b457d75bb24b3ba2b7fbd9638c418158ee70961a25b4a273ab07894ca166dbc783199ab406699c42828fbbf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/el/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/el/firefox-68.0.2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "ff2d55b5658b4c2718b9b0d62d1926bf6735a2342b3c91c49a94cc25af19fe28194588c7c75d24298815d7fa8dd32e30511716db57ff521f14def69b22c7441b"; + sha512 = "4dd8368090c6af5995d63f84bc2a3fb612fa57acb0c38bea48a7371b4c8fbec22017b665b3801f5419ebfceabca5a7b5eb2fc6d21cbf287d6c2427c89457e7ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/en-CA/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/en-CA/firefox-68.0.2.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "788c6f0aeb2c5a4565b2d187115c948978c02c4143d20cfeb47421c8afd81c0bb5f0285d15fc0ce2129455347a0dd61bd75b01c8774c9fddf1915c653c874739"; + sha512 = "22badc05493fc477984190c5e839b44e8991f4b43592e84eab093fae3b4720de41965d389ab3dd6425a7ea8a44038222c474be57cddfbd5b30e34b49e3aabdd8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/en-GB/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/en-GB/firefox-68.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "97ee51e6fdb76d690adc2fdccf5decf18a1a3fb34ec3542c795aef8cf45e3e97bfc7def170535057f3362685f5fa75a3dcc8b7b1383f3b08e5b16c08c5edd9e0"; + sha512 = "7fd1739f7da9aebb19c698b45cae649fd63ae0d573956ce1289c1dc51bd5964d1419f90f4d7c29abf344cf523b8f1ac4063678e70568468db35752ccfd5dfe13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/en-US/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/en-US/firefox-68.0.2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "4c489c1cdb76ade26918307af3d8d69ea1e407013382a84d4511ee4fa9e40d0627814ee57ca87faea38e1b879486d57481d74dd0f3344cea90b4101e403fb25a"; + sha512 = "8742f7831dbb888554532583c0dae319c1e30424901bbfeab62011088755067df63f360e5aed8fe3675706c4a64dbfaafbf832e66f559dd3c1f58afe8468bff0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/eo/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/eo/firefox-68.0.2.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "16392ea6d0aa5c63af1f2b81444ffa091f462a686e911a425b7938a5f34c300f39487fdd4322bb13b5f7631be55dc8bf2c53dcd6a57c347c3862c47cca0c6559"; + sha512 = "93a7d92b10d3927edf5870cc46091933b88372c8ebb55d6a60831671f3501b62557037e38d25e18ee61f4e65c14c057d24a3453083adb9383eb3f21b16550f3f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/es-AR/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/es-AR/firefox-68.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "e4c612f300a210470d166bb1386fd9a8308c3de1d107da53b31356a091d8a1a1aff00f60e8feb0fc1d4a6526acf0510f95bf9d266b72f52f887af52337048172"; + sha512 = "4b775586020624d238d7ab0c09a420a9328fc46f6238f397b569fd60bf56cf424c70e016c2f5814c0e9fe42fecb703f68a366ec7de1c68b11e4b43565b3a3929"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/es-CL/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/es-CL/firefox-68.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "608decca1ff70bac17bbe0160b00c1fef3b0f0e65f53caa2cc549ac1250c2e5973439123c8e34fd0b5e130269ca5816a7cca78632a15724cf8ebbde3e08fa9a3"; + sha512 = "172daa90a8062c4d7884aa0d2df32d8a9219ef04bedcbb270f785dbf6a9d3d5369f69f9dee589d95593ef464e4dee84384c39462a81eb87ec7c0679cf415bbd7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/es-ES/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/es-ES/firefox-68.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "b8b56148d7d08d560b9b34be4034a6d2abd1b59f1b1da993a92d80bdb83c44bb261860573aab5726af56835bb03c13c65a32b1f8b0b5f5d02df855b576d0a398"; + sha512 = "96ef9f02a019947e9502abc583389b0f06fff8e8bb00149108c0dc15799bb556326c4d79905348d02860efd3a090af93998206c17dda6e88819f531837c97f27"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/es-MX/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/es-MX/firefox-68.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "c4040e736647fff866f69a054b1b917d66799c29f54dcbf968942b6447adeed8ce8cd24bb4195be44bd134710053daeba996bafe6e029f5e6c7fba767904d084"; + sha512 = "8f120aef18b76259f84e43c1a2c82fca04c56bed10891381e875758c53334cc2987e7ad78a3f9d9aa34edc79352dcd1bf4a7d2b1bc03099dce59b5423de9687e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/et/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/et/firefox-68.0.2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "ee0d9b469bb717ac317daeecd1fccf10290e72e2359d17ebf58f62fe7d4c266b740ff235438d937f30550cfd4f66387b9d1535156d37e3b689c323cb732b37f0"; + sha512 = "227f0bf21042f11ebf33988803274fe6dddc73f9fb357335e24c1c82cb396bd74fcb913fd9c9c848f34de57f518c924a0c1b8952ad9bb3be18f20ad4328cf629"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/eu/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/eu/firefox-68.0.2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "5f94492be3a70be304c3e6c0068c8d50f5e3b94cc8ea0559a5cc521564cfcbb4facaa90a4e237425e63dce093a0c51987b40c6cdda8d1e72792327d6f5562cf8"; + sha512 = "733f75308c4991f73e6c2dd673d380af1d1c6ad25643aa4994424763df1d25df3df3a9a77dcca5e00176d1dae248373aeac914528d5aaff79f73eddb740dacae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/fa/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/fa/firefox-68.0.2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "7a89b49ca9eadedc2a84a990ba2601740dd3494a27694f6d728f2dfa9b7e7bf41e171b2ff9bb004797da1d30f18f65d70d9a94a398483b1b604633bd3388b7be"; + sha512 = "5b863546dddb8c5fa4c59d53cf2f5b622dc4296378290c85926d49685e06231f0cbcc6030257f356af71ccbc6ff32359f387ef70eed9ae3c72a9acd34eb58350"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/ff/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ff/firefox-68.0.2.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "a889efda3c2acf0d0d96d857689c8264f1ac79d4103f7188458e1232ebe1646357194aef9e6c448e2636cfabef2c5948d0158c933c04405c6587b1cc745ec741"; + sha512 = "5995cca653238629bc6a1930d40550f957b1e3176ccdfad5e65b16584214858fabbe92ad2a4b1aaa3a3fe920b66aab4e0f74646d42174af82d59c0bcdccf8867"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/fi/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/fi/firefox-68.0.2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "363ea795d1dbf428124885f475dc93d962a8c4ddcd253dbfffe1471777616d3c3c348223d5f3a1249a89a636ee99a9d4b48ac644e5009f9ce1a4236200b3f23e"; + sha512 = "32188abe02e4fe36312835a19ab3f76c8e67cfaf0857f98aed4435840acc432a411b8b06727175a8d3d3a1ece6a5baa9ce5249de7019d02d43ef6dd2aaa69e9d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/fr/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/fr/firefox-68.0.2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "0b869afa50f2212bdb1312551ba3c552fb9f7008f0bcf4f0c5f9c5f4deee920cf96064120b7442050233bf6367b232a79874321b7b4d98c3326ee12d9151a7a6"; + sha512 = "2035d9a5a078e8fac32604aad679a9f01db60cf872ed3b546fdaeeb7031a8d38db19bd8556fca7377eb10768a53dbc1f70c7e812561cbf0cf926d352a6ccbf8d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/fy-NL/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/fy-NL/firefox-68.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "40fa18e5e8aa1c987c81832b7ce7ae7ac7314a0bc058b3eb226101457b2f7af65e7a5d33cdcd85d10f87d54336ff348bf2a743505f16b904c5d6d09a3d64221d"; + sha512 = "5539c97e6b8a4f51113434df7a75937dcdeaf3ac8acef1ef8b4bf7b500d387051969d13356dd6663c8c0e7a429748160721fb4f864db29fe77087c4f15a652f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/ga-IE/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ga-IE/firefox-68.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "3b2c8b42c6290c41ce08e4857b53ee8838e06f0822c7eabd820071058dc70479bcc1886f6436295cba2ed94ba8d7daf1eff8b6a22e1be3014ec838b3a3d77804"; + sha512 = "4c60bc16af21fc552f62cf6e9057871e220f9ad718844e28f8ea60a5122dbd941dbe1b9e4e0a2bc6b7c62798b178134cba15095e31dee6e25341de5e832a791a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/gd/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/gd/firefox-68.0.2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "8724028836689cf83f4529eb04c747f2990d7b10f17e5f19295bbb2d53b301ae427d4aa836dbe994c3ba5b7a986a3ceeb2e32eec02a09539ec972ee9f180649e"; + sha512 = "1851d0bc3a21828c4d89a8c2338205a7e7a9aad14f60a33061dd229d96d8681008ead1651f7d5a501868b29fb3b50bce0587c142e9bfc4423e398fbf5dc7fb6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/gl/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/gl/firefox-68.0.2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "587dabdfce3ba644f10cfc4998ea6492611e8480166f44d97a6733496e55a7a4662b8a296de6361d8f515bdf4122f2bc73f3337763323e3ed0884a6d4300106f"; + sha512 = "a728a158992d2fbcd292c13df36c2b4599d0972dfcdd84d3885d0146e8435808cb92afec7823388906d46d80431b14aebd7e831eb1d80a6995b4c81a933896c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/gn/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/gn/firefox-68.0.2.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "8945bf41a214bc79ef0dfaa774afa4bc2a16a1f92da02e6ea1e9813cd96c1a874da93b17086de587d232cd0e78c13873beb647b87afd74d98be7fa1aa6658dc6"; + sha512 = "5ccfa691379cfba11e4f11854ebc3eeea7eb6ccd58b4f73b48a631279a99d0848972cbf924335db7b65ecba47605220df53b847eb361d721e1fddde30b1dac49"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/gu-IN/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/gu-IN/firefox-68.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "05dcc39f297723e287476103f149ba80408a015d92442f0aaa791e29a73195605aabcf13a1c11e1030eb74dbab52570600c1848fec0a474b986d580effe8ca60"; + sha512 = "a5d5fc55935a4e9f66d6a549ac4f64649bb3efb335129f04c0e72e2849fb69153e312987233dd81bd58e23aa610b46af35fcd091a566e604c799d83dbdabd703"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/he/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/he/firefox-68.0.2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "ec76920d51958ba23d1a63f4c2432cd8054f88ac024cc55be040dd92c5828ab05dfcd654d35552be30ddf3dd49ab3a5870ea90b5f0757a0fffbb269f97ad5b61"; + sha512 = "483850929a93239d40871aae236f698afa4a195d1c42b4f07db1b72c2bf9e7e5ac9a24745c56cdfd2d52e725585be7feed1a3ee9aa4b1516fed85ca33d3874f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/hi-IN/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/hi-IN/firefox-68.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "a7e368618ace4281eee7b52b2d053c37f43d6077022400d81da5bd3f896d135476a06579d4e60042277f9410ae2b993bfdcea973184a45bd58d5d5b55c7ed306"; + sha512 = "6d4c3269fd2216c7e9f258fdf0c3ccf01a4fcf1af6113bc91e68f65f0e0a060bb13bcc5f5db24a47870906ae5ae7a3cfc0a5c2e2068308eca6dd1926a7a4936e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/hr/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/hr/firefox-68.0.2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "88cfa3193770dbb074ef0e23860e2d6f30214e0f886c1f38c966b3eff3f395b8229f4a2051369c7f7a13dc2af50e442a1b1f08e6c9e582c6634a3037ec37e990"; + sha512 = "cb4dbda71d92af15873e849b7c6291132cc1bca6f108f89d07132b1b34d00cc9d3f887c9af593eff4163accb4e645626fa4ca0725d3b81a19f5a52ab944fcca9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/hsb/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/hsb/firefox-68.0.2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "277d1bfc26fe19776d5696ca34f63893ead25a203a7a447365a253bed7ed575da6c5569549d3b4f55d7c9e7e36bc36b732bed1d50a214371724589e02cd7666e"; + sha512 = "156b1c20d452edef51a816dc18c57d0baa84add78ea7e507e037d2a78f433351001d85e4da9ec9e70bb93ee439458d23be93438db98f786fe0efa4f6b031dd78"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/hu/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/hu/firefox-68.0.2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "207f279661c57534519a8134f64153b219e5d604d3a1bf0265765658ee9390abcfe051d8f1c11c8dfea975da38c1d9f8bcc50f2090813f091251dfd326216eb6"; + sha512 = "0a5bf1362575ca38a69e790ad34029ae587c8e59b122c86adb3e10762e0633246bd73617a9a7475eca86b30b433c6e958c53206a6c2c9dae37c635ffd8364f00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/hy-AM/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/hy-AM/firefox-68.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "567d75ed252779c89c23dbacfb23138cde921c24c798190d93f4fe20b3b2366caea44ede5b0e66678d5befa0d22e91ccf350aa91733938dda9a6ccc21fda58dd"; + sha512 = "86b8411a12d6d20f85eca026fff9dac6de8c2680708906f551d28bff4adb93a48d6a82db864a609904e9aa73fd3449a38cf1ac74a8c074393f89d9f64aa1e771"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/ia/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ia/firefox-68.0.2.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "6e0b22dd63a5e04cd4f61d5ffce9a5ec1569f8e1d4df4abb29e22c8f3c63143233c7b91410d020c00afa6f6aeb3375c2a9a795e20a8efa9ba284f60ed782762f"; + sha512 = "a323485c9780d46087a9e698d958ac9e8348b00b14b4761dcb86d5f2fb1f9b23ab812a9ef9bfd0a7e7612ee40b505e50569afc3c16b2813065495f0b3e12dae7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/id/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/id/firefox-68.0.2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "3294e5b22144d3d79dd72b00cd71817e55127ac42e2409953f4052751e07cbd40dc195d00133d7bedbaf5cd760a7f72d85a1acf5e7041be5cf91c40ce9f40e4e"; + sha512 = "76767d2e032973adffa08e0b0e49e233373ce95c94aaf61d0911cf0be45cdd0daa092f5b722cf396956f0f3f2abbf7ff063c76524f8b1e3761afeff6ee02ba80"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/is/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/is/firefox-68.0.2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "76e409bc8a84fea6a2b257e91171309afcd5a0a95803a741d50012fdb602f98d58e6f2b90d1d81c73b8a4cb961aa619ef7702a467e247657c12f721ab6495351"; + sha512 = "ce9a41ffb2482e0c3049cd3d9984b5094310ed2ee15c60e0bd102f98d9511b3e139ebdd4607c37fcce1c23407fb5c1f969d6ae53816838c32d2ed2b399b710a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/it/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/it/firefox-68.0.2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "e40c3231959d8f2e96387a4726852f45c05c5a3b2e191b44dee4d718fa10e15e98c701eaa0d4f61bfcb027a832b21b3080c84a55073f6bbb6e199edbeb8d9ca6"; + sha512 = "babc698b40f4d84a6c8f4cb159b676893724a5b1cea2f1b004d74699f8dfc1a7cd3137bbf9ebcc90f89c59c4e9980be95eae25ed152977fa652d5e8a35418742"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/ja/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ja/firefox-68.0.2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "fe74f30aed27e57be51f3840a5035219062149a1fa63dace282ebb257757a8baf0c82c31a506b416b505a640348799a22e7299cb1e6f1b2355a0a649fdba5625"; + sha512 = "1073dea454de8796d7094d99805f05db293a41d871111fb4495745dc6bc9d2199587abd53c7d3bbd09768104d51408dde8e1fc56e85197f5f035e9cbd314e222"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/ka/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ka/firefox-68.0.2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "a8508d13328f23a967e1083fc0a9faeb9e4cdfc0c412ffb36e8fd962de9e34f5d264e4462cecc716bf40ce45de83e976b114ab1bf541c8fb8be005c574b2fa11"; + sha512 = "77ea45eb051b34f136f8b295ad05cb14d43e526120c30ad028eb94c28531272563a1db80b164a19de28b3304d364558297be9a1305a1407e1aa644a003722202"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/kab/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/kab/firefox-68.0.2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "f825b1786530690f0ecba3c4e486ca42dee067496c58e2e3930fa433dd7f7991df1bd7d6180103d695a565d9a3cd908d84276395a29f854c306f8149ecf94da1"; + sha512 = "8e44bb0dd05028c8a3e689ce273360f24bfbba157a9e5d7562b08d8e4f448b7324a5bcc3c0fc878f8783754ba104206ce82efa84d767fd9cabb0f4c25d75513d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/kk/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/kk/firefox-68.0.2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "7c5939ff37c83f31c1a18932c50bc6dbbdf059b2ce191e892bdabaef64b60530f8e54340d2231fdd3223d087c94f55e0b922df2ad21687384dc05d780631b0bf"; + sha512 = "aa3ce16fb30d08ff1e2d0b27518aa281d559735edf07dbd1471e148bb1fc2d85d9f812870d891e67f96cead4e49be25f66e07e4f52fd1bf08a877da602fa1b27"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/km/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/km/firefox-68.0.2.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "3e304bfaebd97cebec3f5bc517e763ad55af6fd44ba1e9a58fd5835a1bb1f7e688ce04de9f5f4a0c01f670faa2f60a0bdd137dacd7eff735fa5f43bfb162a5e9"; + sha512 = "6e1ad54977f61330d80f310317f1d97d9563e92637c91bdf7a0292e2abceb8f3f1cf3831627ebfa5967061b79ad565d37d2891aa83685ca599d782a4554e586a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/kn/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/kn/firefox-68.0.2.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "665b75da1af2a98d69999ea578fcb86fc6c770bd638eee98b5096731b63db5803c0c298a922cd6bc77a686fff78d38ed193fe64c17e73e7a8bd9b7faf381e6b2"; + sha512 = "798a1d1b5d3a4f7057d5ad05e5d93f08255ebb302170dc80a8b86238823c8a19a15cfa1368b81187ce389ee3992634ab9be58713e1097bdafdde96bc48dc4036"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/ko/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ko/firefox-68.0.2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "52fac04c41e6a5396688f7cd80f9df1c4515cab7b0821a67170ab301d056e00fe37555a1c3d8aba1afb309102b97c518bae215dd777622e55339d0f4a63b8827"; + sha512 = "8ce6490378cc3499155d26db216da44eb51f7b5d0220168882fdd16be63073927eb14fdc4c586c603b049a1be06837290417626f17c17b4620484ebf3e0a0d1a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/lij/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/lij/firefox-68.0.2.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "9dff958a02e26e378ca64337875ad9890b7f574dcec338f96e9253a1bd9ef6e640959faf0f8a46621822a5d1947589ed9705ac7b7be374b9c6114133b732c72e"; + sha512 = "ead703e84f5b7d2dcebe84c86c49f9aa751fcdfcd30d2c9646288a7ec50d8807160e84333743cb4f97ee6f6e45909ee4678cfccc6ff9729461826d228dd1de0c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/lt/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/lt/firefox-68.0.2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "e089fc095ce21ded59dc553a1cb500453541e564296348fa7e0d64c2c649a3da8b838601e03dbd431724e693ad96e91919bb64b598e19a5f64d716c8d41c10de"; + sha512 = "0fac4c345e3d543d0cf1b986c5a81d9fbbeb4617f88c679a2230a6f0605e24eda60a4133f38f496d2df0d027fe029cd9f53f17efb60512263d6fbdd55369d239"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/lv/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/lv/firefox-68.0.2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "038161a7d0cfd81f47146d6cce5ac8b3acbef126c05c28e832b554820ef107cc7d33b01c892c1a4bf59dbe7ba2d6b97c2f5820c02fdafb0e2e32e12a27a3f9e2"; + sha512 = "fd172b285d01771aca741f584e101d66190c29df5dda5e6ef120d41a9488a2e5679339c93478d1e86b869d67d54c226f4e1b7756e5040ab71ba415e5319965bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/mk/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/mk/firefox-68.0.2.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "100f67b45de3ec311eead8fbea6ecd1e9d767c19cb9cce00dc87568c6e123c9bd558b43dea27f6163cd5dfee3e4db84da80f646effef27637f9ce603bb6eb110"; + sha512 = "370dc43f9bc1b33f3e1babadd16d8fb63850b8e68be13a22843bb09db530dfbdb22218507b04c406f3b386ef683572ba262a3a16b62c4273ff3fa2c014b4ef54"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/mr/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/mr/firefox-68.0.2.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "02c4a73dfade16aef4688cbc38aeea0092da846ebe85589dcad472acd2fb06e2ec2a3264b0241e64d7346237238602e5c46f21335f9d0eb965d8c804a73ca561"; + sha512 = "533b32b98deedfa31a62c80663b4aa0805c3b2eeb0da8267918f377183b40058a229f6dd357f9226f0149526c0c37e90c4f13b1041496054d662ab805f8d1d88"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/ms/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ms/firefox-68.0.2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "2e417277438a82212b82c11da36b826ba64a1c9994b11b6b2e4d5c00e6d62d928e8870fdf97ead915d69ebf5125a9a13d8ee37515b55f2c0da9cbfbc3592608d"; + sha512 = "9092ed4ac8ec60b55c4b5324ebbd9f7b5940ca66dcaa66eaf9bfd808e3755db931568e4f788b3e2bcdd574de0655af16260a86065394536f916254b366188a42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/my/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/my/firefox-68.0.2.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "c7050e05d39e3050987062337569f1cb30bf5505e92c01de313fa5d0c882ece4c1e62e9caa64f5ea7b87d9bb6c63ab2fb7f88c8b52eefeb7e88233427cf381a0"; + sha512 = "64759c70abd171c374cc73485a4ce8e4cec21222a4fbd707d03fdac79b983af9d928b516c926a1558cbee1af374171272c04597d0523839befc8bd7659f24c42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/nb-NO/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/nb-NO/firefox-68.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "4e90965dd0f2fd44c8a87cea7dda3c3cf5ebd49a2321be18f133f78f93a4b3728ce1a4ba83d52e274b4367652a280143814a88515a07635f27b98ffb28acf59d"; + sha512 = "940c9dcd597dd135fc351c09a6c1c1aaf20ef1305c4c9dafd90915a8ef040bdd02321dae130469985faaf871f24e7ab0b164e2cc1a0e661da886b16687cc4951"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/ne-NP/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ne-NP/firefox-68.0.2.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "8a367b81d5dd1dd30abc02fcf60b406de2e9735cd4eaf39f9d50ec62817abae18d1255781648981120362beed305f3c126c721536faee7712b1f95209fdad463"; + sha512 = "094b0a3b2a38cf9a21698ece463517efdecd9784711220701815b472ca27b6fcd3358e982aba6fd579cd5b256d52cfdfb6cddbae17d08d1ca2818bcd8eba7f07"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/nl/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/nl/firefox-68.0.2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "e17960bc934d3e17a04f3ca27133a9c98e6e9b992683eb541bfa47e8b71c077456f03f281d1534560b96bb4ee6bbd5a0613f6f1cc5e99968856eb3b3e9b7611f"; + sha512 = "eff62b73a52a649a4072da79dc0cb5bae23f81360c2727bdad2925514c6f9de861b00f2c7310246da8037f1305da1ad6326023e06fb032ae636169ecfc9a33e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/nn-NO/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/nn-NO/firefox-68.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "675d15cadeb505b4afe801f593dc6d012854b80e9aaa195aededca6b0ea4ae580a0c366cfc99ef5858bc5fa11bc4855cd17cfb66baabe4d0f8ca2c65615234cd"; + sha512 = "b1351dac5e08a6bbf2ba50baedfe5a6ca6b98de40cf89ebbe0672c98b8c900021b9bae2e8391b3cf55b433bd9c655d2a3be2422a7a0ad2067d4a465a9695fbdf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/oc/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/oc/firefox-68.0.2.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "b46b563b05bf5a1c048f3c2ba0cfe73ab3ff5bccb24c5aff899ce2ef601b55416507d3b35cc0688f9a7602710626479a0824e579ad0a55b22436b1d8b658c6bd"; + sha512 = "8dcb8884541f272cdc97ebb9fbc0ac7cc98c3f3d252ad53cd94aee3c5d9768fd123d87a4b8c111ed92239e90f6d54daf67c5efa3823f8b1b6682eb8ad2c3876a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/pa-IN/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/pa-IN/firefox-68.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "77c533421b6eee5033d239e67ccd517c2bd484f803969396e2a02c39246e43db710461b61b819fbe2fb8b2f97bbeb0201e31b89c499eb992b565628977467a9a"; + sha512 = "6f8ac6668fc556f051cd735325cfa3b3c16c43298828171b89c17ce22a66a788ec219b7bdad9f9b1d3d0a425778b373962033468f196e999a2ddf8b6ca86233c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/pl/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/pl/firefox-68.0.2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "e9349a3416a1e82723cb90db970514a608742ea8589801bb1fcb8c922a302cac83779fbf83c151d13760773d9ca69fc7d57dd91c547d3ba581d731d4d122a195"; + sha512 = "8518a8eff1920aec34cd0ffdb66b4242d55b805e3b489fb0d5c29986b3d7efc62ee6a014ab3fbbe9b40a54aec9c6c76e052d0982f72a4ea4bed82814ae6ba2f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/pt-BR/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/pt-BR/firefox-68.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "1f2a1417604a73d94712a81638dceb222ffd9594aa319e09d6bd4de3e37dd07a1059af63c27fe26469070d678cb23dcf977e7b8aa86451df1db5d60e698f25f7"; + sha512 = "693d6b6227deb670bd3608cd873eccc3848c76a930c3e8922cf80c18350bdb5429b52e7d7551350a8b565d859adf067ebbd553531e00c6da95c480cf932de03e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/pt-PT/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/pt-PT/firefox-68.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "480770430c8a3a84cd367cdb90c157d0f67e22b4b2d84e3eb3760c6e4463655d74ff6228df31386b8a40221262dbb12549a9c88372e7b2483c099d5a983a4a5f"; + sha512 = "c77e539aa7d2175d793c8ae4dca548332d98efb6cad62ba2ca9f3b94982b7a4d180179ad65b89a460e04462210ee201bc2226105ecff27b5a4b78cf1fb0a5b97"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/rm/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/rm/firefox-68.0.2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "291a8627380c933c6df5bb73599ab3c25406710a19b979a893369d30e5117e563fd77b50ac2c1a1b7a37779df7a57a55cfbb42d8f56765cd719fe6ab6c0404eb"; + sha512 = "22ec2647ede04fe74dd7e6c99801c15d4ea131f010a75c0a9e5c8b568179f9230208616147e78179b81a7441f720d9f41dc4d784b9dc6c40e00e886612bd68ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/ro/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ro/firefox-68.0.2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "1e2f0c4950a2e67e2cd11e27c6979315f78d4c682962387ddf1e47eda5a1d39136662cc3730a45474ad2978e01f1fb7888e82ad764791ad0d06b5dbbb3088c1b"; + sha512 = "b9e3811280859103e202f0dbaa1c278c8a9cdb451a3cb63a35967bb43625d5f6f6ad2e15871dd727546532edff3f6373013e8bb0eccd83e7f80a31dcbf8e3643"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/ru/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ru/firefox-68.0.2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "af5d5167e1f1e39b5b727f269dd57060840ac46c21e593ea9938e6b1d1a97ce75d4ae0430f6a96ec7e403046616fb771aa62e15093c5852e256f49683a704cc1"; + sha512 = "a7383beae7ab2514b0e2f5d86d0317ed0c33b5695eed1526457f14b545a63d036dfcab907fb7090055e6ca29144f5f11c7fc2c00bb389d83074a20eda6173df2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/si/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/si/firefox-68.0.2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "36083df5d4d1b5737453f433fcad2a610445c66888067d6b7351b1ea3b32d3494ec349d825025df77658d8726219faf94e2018e5f8ba47fb03b456657f16fbd8"; + sha512 = "5d9bee0a705d1250dd07636a0e8bb3dc3e0150607d58f7eee28c5050270e8786fee2f843e4b801e7de6de56f284025bb13f5dbaa131676796f69973ca45a209e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/sk/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/sk/firefox-68.0.2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "393576a17577b9642afbceff032328a571189938a89d34eb1f9d0dd9d0fb2ab0bf37c83548eecea75894464887d3e7875e6c25b4382db8bd57ad54f534836439"; + sha512 = "de0eb221142cce4cf6272be9323b2a851385d539a739b0b2ccbd7b98926673cea695fd7debf11aded37a57b551309a7c93cba244b64128e074c93e23b68942c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/sl/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/sl/firefox-68.0.2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "2c2cd423e0b8e01ecb12574b3d461e79864989d179c785de745b458e03844201b9a5baf9ccdf40cc06d591e96fcc9152d231382bd3862082662ef015f61c4ca5"; + sha512 = "09d4936cd5e3f0592751699bda3b4164004e7e2651cd0b28f5eb191677352a61901725357bcdf5f2744b6090d47b6754b910a7c34e611f813b12fc7566bbaa92"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/son/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/son/firefox-68.0.2.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "5b714236fd01e0f7cdf57c441c44b772433cf890a1aa32f2ea6ea6207140845125c8770e2fb92c228838e7af012eb535418ceb2fcb9f2eff2ec3bb6d769b01e2"; + sha512 = "564306bc98a0a0a9e54d2f315cbb1414107f49deb4bf25cb729e10ede60620df0a1abdadcc675e531e364d1338c746cd9cb6d4afdf6e46a420b12920db1e304d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/sq/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/sq/firefox-68.0.2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "f8e1a366bc6a423dcd45c2c89195dabc46d62d5333d8df075e86a07b122c32d00893fac6dddbe9a8c2a5f14d961dfed7b1faa1eb8324caa91d8bfc335ccc4386"; + sha512 = "28c300db3616e510733133f0868cd42e7b05a15fb066575dd7386ac4e53b4526e86ae7d24907e3f7e98b3a9c189ccf2004c958d122b47e476eb3e411f17c29ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/sr/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/sr/firefox-68.0.2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "df817b50e802fde8653e24c590fca64099a29b1eb8391527ea2aef19c995c10a51a6674914f933b1d90838ae8a0ea66b5ab309b7cf5f2ad601d0367696499ce5"; + sha512 = "0ca1a926600075e7e8348ee2ad55c435b3775c8aa6d1f27717ce1c35fd1e108c7600547302f072213e7c54903e6c0faa6ad299a9af991c8234ecff454d336427"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/sv-SE/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/sv-SE/firefox-68.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "f50094058ee1ae5abf089cd11aa7cabd3435dee79147fec091c18f61c8e6248a79d195fe374e8b5e2a4dd13594bb936c6a7393463fe4c245e2933b26790c94a0"; + sha512 = "ef4fe5ba87db3dfba62490022f1b91ddca96fff6035328b07608e56a3247b4021f6fdc007d65e5adbd52cd0adaea9f0b59dbb5f01d71535655d0bc5e0800202f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/ta/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ta/firefox-68.0.2.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "31fc4b39d78615d83a2082edc82bce70242b2106d14afc2ee631499a3b3b7c8828ed89252f86c37fb2ef4d8e1fb9a778314b759e3570059771c9a4c1506b27ec"; + sha512 = "6fb48f0c09d74228317eed041b4f8d2670dca7ed043c133e8bd6a01a0d7bb310144434960be9b9916bfdfc3139de2cdcd3b8282d1568e67d29cec425420b1e06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/te/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/te/firefox-68.0.2.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "81ac4e7fa49dc61a476d993709093d05c6853ac74502310c01ba97061cd04590f11c205a4df9ce2ec5c5537feda7b52e42506eda820e4e0fec173d0fa1629da6"; + sha512 = "bea99c4f34bfb5860bb5885d4697f18bd45de423943c5d15952bb99c7e4cccf125f041f1378b693b805ef4d623fed52ba8b13a76b87bb383da95d06a4032f8db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/th/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/th/firefox-68.0.2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "477001631c285096f6630541c511a15501ca4c5cfe1a25bf273e4fb505d7376ce0662d392683f33ff0a976f3362c0aa850dad999835679419b98b61cb0d94465"; + sha512 = "4a03397a288a7414ee5ad9f42a7333d30b7a6448321e4507cdff71a2e3b0933292e6ae937ca96c1f6a5ba906e54013b6d6d8501c4a9be4741fd3505dd24b0424"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/tr/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/tr/firefox-68.0.2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "7d90a8a3aa1f3d06610997ade0ecf9da1b4ea5ecb93252ef254ee9e23280ef9462333a2b041fbc7aa450ca567d8a053c3b415f9f135a2b278b4ac6f466ab6525"; + sha512 = "85378409bb2ae8953c1f90736cfc3e00551d77e3aaa6a7fb76a157291e99be18d55f5d07b1171a7137d982442f55ed70ccb3f6f6dfd73869e9cb37019e976590"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/uk/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/uk/firefox-68.0.2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "22ef62d00b6ebb7f0f01e442bcd6ef767ccdc5630b7c732d09d42df3089842a8c9db4a6094b20209de722f7cf903993f19e2e1173682fa71d883a0ecdbba2706"; + sha512 = "5ba9df05480e7852d894925248c7550a36db59c8a4c37792de325aca02b8e5feac0c20719077d718292eb262794668bcfe810dde7229faad6f2370a97c05e973"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/ur/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ur/firefox-68.0.2.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "e21fe585a204a00e1b6b038141f4e8c188076e57c601822005d64b56ad3b4b6285d3de6e6a2dda46833a0e8ffb2c3e34af67bbf0f54c2f11000a9edd4fbe30d2"; + sha512 = "bef12893d73b1c9583302562781907d0fb121003dd1714ccc4c3b2a27160384795ac8d85cec4858849004b020e0ff5e73f512925b9d5561948ef16bb26e0ceb7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/uz/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/uz/firefox-68.0.2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "c8238c9cb18a9ffb861eec6eec4bcc1335d19e24e1684c592985e380c231f5eb0eb1c311ffb0750efcea9f784f6d9dfa5d4231e1765f53a8d0467479328c0bc1"; + sha512 = "5961e478d0cfee99edb3a7ec20a0368f8b6604b4449dad835decff54c8a9f3add6bed22a131024682779922686dac0ea6d489ff111dfcdd476f7641e293b40fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/vi/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/vi/firefox-68.0.2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "f51f299082f0accb6cf2cb055d361067907a020e60e5e1acebf45313e0065a1ae52e8b60ead16d3a45626492e50d809af36d24fa588395a60a7bd3774671ebcf"; + sha512 = "31efeb8ee3ec4614f0e116e615db97f9836026c0c94f5452cd3c5ce338fb9b35f19c0a15fb6bf17ed945a37832a628e7fc16381d5e6393475d8b9053596a5c4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/xh/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/xh/firefox-68.0.2.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "5ce836611f3fc95034cd950e727ae7c1080f79ed584a3e4ddb87494e8be790061c0761e34dcfdd381e074e6db5f846a52d9f5821bbe079681e17d91205eecf02"; + sha512 = "bf23c18c5a8c13c115e8ceea382eee8e5c7af24552c3feb92a5ffac0d2aa34effb7dffb0b41890d1af23f75b9581ee05451785c5ab2538af9082b13ceba04ed6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/zh-CN/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/zh-CN/firefox-68.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "e48fa39d1c183ed9dfdab93da265d10fa5782e8a9744661ae1b6283344c689c4a63f20f386dbccc7f822fd434865692c1c7f0cdbb44f7f1eeda860ea105aac12"; + sha512 = "ff490ea8b3b847343b3b7262154ec8815fe3c38d91c2fa0e92625db793f7d24bfcf3985ba07a5f5724b2463d00934925641bbade9f65f5c55627c15f1eefdb5c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/zh-TW/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/zh-TW/firefox-68.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "116c39b237985ab27f007fff740e1a7c5adf638f8a05b7e8bd9124671f83c523e4e80294521542986add8399a4754f7551d823b2d689051aa533fee551092416"; + sha512 = "f3de7f3d53a47532dfded82ce25db7d7d0f89b2026bf3052c42f9b51087ff5905ff487f9dbc7e19b76a5816b9c2d8c1d350d5e9742244adf1c9d0818c6b048e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/ach/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ach/firefox-68.0.2.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "992f2ce9b0fe7fcb73bc999da0f76269efa6b7deb232a7c20c62706400822ceb6aec932c1b86ff475ae9a2cd173fdb37f481399a8b03b9893e697c217b333845"; + sha512 = "515921cf97afec94b5853a7b6a7ed426cb1ba6b875ed1ceb8f6611cf052dddce40e519c4927ea50a02d23c7ed40d6ee882fbddff4293971b1c832e5a38b6573c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/af/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/af/firefox-68.0.2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "0f692c38ebf187b51c177d90d76181911e07ed1956bcd4ebe3dd9df8ac70a4fb38b07eea6c021c4b7efe5441113a4e7cc1df738e1ad773bc48e99ad50edc414d"; + sha512 = "1a9b041ddeab4a06257d9313761f288acfb4ca75e0a50edeaeeb7670f4b3fc7719b480a5d673d90ee9478cb1dc9e14ed07c47e2160527874c134db8a85908408"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/an/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/an/firefox-68.0.2.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "b9966ad9cd07a9ec998865b78d7d6c6a5995806d49d438354ba5ddff1c982858d1144ce960a1b3c2cf735c7c13c74217741600561f0f03db86a61a07e1dafae9"; + sha512 = "8d56691644124b6038c2a61cb74332f38c4648163745d37d37ae07bbf868b0ab6dacafb6c2f1f6d0991a6bf7cb8ffac498f36afad067756b1b8fabcc634c2624"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/ar/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ar/firefox-68.0.2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "c2fe29032df66698a11c7608979125d888d0ff79a5ffc4544fdddd3cd0401272544ece1b8136edec036f6ec388a6474645bd68873b7d8a3a1ae60e37002913e4"; + sha512 = "f443355a1778e087e14a214524cea2c66a58166c1832a5bff89a783c4ef1e3fcd614fedc00ca7b78a0595d29370da82de6f53c8b58c0fda15c79227ebe317f0a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/ast/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ast/firefox-68.0.2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "4a78956be92a98a291767cb29c8029c07aab2c88eb71f1527188010950c8c34cd94923fcc6bd4e4969e286dae32d3c8673ef61a754e027e2e45e04bf21ef71ca"; + sha512 = "50c4ab65a5c85822355fc6c1dfb57aea54f68c9e578784101d233c8d1f2ae678f32646bf36be5c21e0e32bf1ce0c7635be4482aff422100e55e6fd813d0c6343"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/az/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/az/firefox-68.0.2.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "e9b88f53294781662f4fcd96f85de5a73de6ad2d9f2c4c10ab9202530a3774cade8a421c32794406dbed0a276bb40a6598db2b8254bb814345eae1eb79fb82e9"; + sha512 = "070840441591f942491f64cf793f2e12d4a5038fef2804d0143c726f33874a06ecae36bc4f2bb3cc04aa6e46791a7f5148900f9aeb1954eb0e0717a5f8a7577f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/be/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/be/firefox-68.0.2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "cfb0f17fdde9dc400785ecb1b4951312fc16685d7bd1a3fcd4743b729b831f8b25e92d64bf7366aebc5e3325e12e00a6a7a28cb1b2775755c0ccbbbc02a25b28"; + sha512 = "4338a55b80c9e9a21570fb49dbf9595d6c0d51390d370cb8dbf541bd4c14605b1daf118193d2ba3f20d2b2f79e2f40f276e079046d8db65ea524f3bcea88d826"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/bg/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/bg/firefox-68.0.2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "a2efc640303e0244430c4c9feff0862e5f554cbc62fc63656419dce0099ade9ff6d459aa5d1f8fb243c0e4b129870feb54ee5b18d25603524992edb3c27f3b04"; + sha512 = "0a473653d6ff4b6c604e269243f781704c8fbf9f99b18e3fce83680793622b58de5aa655e5301dca2765d6526fb5aa88ee2caf7d35557047c4329994610d9502"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/bn/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/bn/firefox-68.0.2.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha512 = "91f116045b7658ad6119105c469e6a9791cb5ac37b6f47fdf8f8fb2955836b1d1c474eccf3e51852d69a98a31244b778264b2eb8133afe75db9514407ea2aa32"; + sha512 = "fbaa81947143836f54f84e4e376ce31a21cf59a46debdb61c8a9db2f92703da3ac06218c560a639b5d6076e81d74dffd291f9d773b6b7ae5d65dcd0e77b5d1de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/br/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/br/firefox-68.0.2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "207e2da1d5fb769799fb3f6e47b3aa28aa4e79a1d9c8a2d63985c22c5628738e12692cac5ce130715796880d3025975ff7a224179374401c6402eebb0385183e"; + sha512 = "a5c69e995213a6f3066e685077b911093db15859e6dafdc2a385d012d0815520fa2e64c7b89deb279e307fa702c9bb57961a3147ff450f91ee8b3b31a2efee90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/bs/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/bs/firefox-68.0.2.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "90437aaec77e3f2b63e0e0db35109fbd8b81f76c349e1f1b19a3eb1866beabf63c608cf77b2e720ffebd1f28c092de64932822684aa009cafbe7e88b213570c7"; + sha512 = "82d585cdd034016265c43f0e70f09ba8cba1429a551491f6e8ef4c8f333a40179c4817ace39cbb4a2376b03c88c54849eb45904e148dbbb4f47f8fa32048d3fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/ca/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ca/firefox-68.0.2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "9d42c1854e344a776223cab5d7ba06950ee9713398916b90a575106426e5991a5bdcba29f60c695b2f46f9d0a2dab7cc5a19149b0025d46a324e75e876e186b1"; + sha512 = "9c884ea535c3192fec754dd891ddb2743afa400453d9299f26bac710ad5bd7c7d8cd0ebdce3f1ce88995c13e381701312fd9247b029c73f12ce7940297034e8b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/cak/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/cak/firefox-68.0.2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "dedcaeaf2165229b281af26555b0f219cdf4bde907f5dab190f5ec4fb7bf3360a9b9d45dc4f9bcec27bc5216210b8b79a9b6c1ed0d0569712ceb965b9d094905"; + sha512 = "367755d495f3b583a8f09d200f5828c10d8723017d691d6380515d3a4be65e6edcbd1318909c1652dfcc1cacecbe80d6b4e399e2192b335701e17764fe5598eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/cs/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/cs/firefox-68.0.2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "b551cc15580de7e0f58dbeadad25b74ac50dd15942d3132d14983c239342829f5dee2e7feb9b0e4aa950fd18f3c8be6b80e28ff71c7175c0b905565e59555574"; + sha512 = "427ff1470de34928ec660d539fb6977145540608b36ac36fa0f7b98af0f814373105d9912681bd70fed069e94f58aa48f441818a3f4cd67dd7a65342133f2d62"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/cy/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/cy/firefox-68.0.2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "02ec0b98aa8ab3fe1173a193dd7a77519f73fbe406846cc39ebd54633e19b415bf3667e1996aef6aa84f4551d154ef24e8126221def2d4b6df98d34408df59f4"; + sha512 = "8ec2ee32b5dcbe1d9dc80ff8d518c640e9bf8b21b2a8ed2ef215193216b22e17de4d8c102c59eec4c773f0e3dd0eaad6b1502c91367f1bc1b1860e13a2b70151"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/da/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/da/firefox-68.0.2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "969e14d63859039d1bad21ed6d0d083536a9becc476ca9ea1a87ff8159aac9711b981d9d34898dadbc161344aeedf529c64b0979bb4a371c778818441c97bf70"; + sha512 = "72bb5e0719382aa518b9a427f06946a85e7f8c8c0176a66720d47cd7fed6a85aad370888899553a029db1d841bdecdf55316fc8b4f67fccfd227bb48ac655126"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/de/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/de/firefox-68.0.2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "710ca362783ae98bea8f3f3a0fdf8be05abb051c456118091d27e2854be718a0d28ae8496be8f8ac71fbffd270dee46ce161dedc2dcfc27a411c1e4dae0622e9"; + sha512 = "39add77c78c64d77e052565fe058256fe9ec44886844b664bd9055b940fa0af89a60d4cae5f32523f62eb7909b18dfe2f521dc43b4a24a5d0fb67e0d543de28d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/dsb/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/dsb/firefox-68.0.2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "c5eadd98981da8e91138267832680e0d3e0e2d38525d91ba68647ed89c15c21d4a245069ad7352669f411433b72fdf262436224df408cad1ae1e9b8d7510326c"; + sha512 = "1a0fdd365df8b034a4e05741d450209f685c22e6ef6b2d030f1981c711f46a9d561963c57a4da49c01dc2b92f6867b6296a013560501939788bf2b62ff622d71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/el/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/el/firefox-68.0.2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "ad5b36d527c5ae3c5b5b1c44ead91d0cd31d0517657b391c68f446cef1df1dbbfd7eda9661acfee8fb132f2947a929bd54223139a15e4b8b4fb44c0375858c9e"; + sha512 = "3bff3c718c77af76bc10b13b7a816eeb37e6c2756249fdf441894350834e69ffe8868ba119f473d1cf07e8569fed6c604bbb1cbf1a1a51d5dccfe3f5018df2b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/en-CA/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/en-CA/firefox-68.0.2.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "72f0aeb46b2d5fc59bea781faad79b41d5ceec9f0100d5d82f961057252c74f94903cf5eac679f5711b2984ebb376ca92f5f58a8d46542beb6ed3d482e298df3"; + sha512 = "8400867a50bb1f677b41d2b030a66857697a95d155c50e0c57711a96ac13f6d236df86ae889d442df805eb56cee80050370df2210503d61c5a3d3a5f0f3a3c84"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/en-GB/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/en-GB/firefox-68.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "51ad08d603a664f34ca4a5aa4d24959f587a140ee2ca1d351032441d2ccd28cc478b0bd14138f020e02f1e5c4d2e5e69664dfca095586d30cbedca9034b3f37f"; + sha512 = "b03559560ab0afa718a15bb0ca1e4d9b97eaedfd4b4ca42e3910425bf6bb6a0bf251208b7fc4848eba0285becb5509569bfb7ea609df3f60972e625addd20396"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/en-US/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/en-US/firefox-68.0.2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "ba1d3a34b13c543544f364934dc936d6d1e63e8c62d2d6cf0a503c4a439db5d0d4d5fe88da77932c42a52832016ef197804014930fffc0361c16ff34b7883a7c"; + sha512 = "d6acd7725858a512805676f6fa215b949e631f4493bdb060921bc51c2f2526bd0e69641b41168ce756556510e354cd98fe1d1bced42a1e0a7100ee797c2eec00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/eo/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/eo/firefox-68.0.2.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "55a65074af541dfc4f25639ba1604336f3f77f9a3243f5b11e80387e00f7c9df9cdc6401f1d297341064450678514d3c663bebdc1090b33259151215025e2f7c"; + sha512 = "25ba775be4e0329fce2a927174923c69e3dc38b61af4f29ec6e1d0dc74706b8becc6f6d139ca3007f7893f9bfb66cc71d9426cf420695f2494696902d5247d8e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/es-AR/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/es-AR/firefox-68.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "c7d82986325f467aa8ef762850fef81cd12e6a5ff2ed8ba2f7d23badd17fe0ed0777572b9a2b18d8addfcefc30b603c7350504b943e005de690da5c48d72db8b"; + sha512 = "a3616f6c7d9d7005ca8f76560bebf63b3a49f86d58d6c8c145400bb12e1574c1a3986347660c6da2700402c26441754991335bb199eee5a43292644fe935083b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/es-CL/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/es-CL/firefox-68.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "88cb20885971219fd11b44becfd72b0622e7b9bc04cb1f9bca03b634399566e3c02222cf3aa10ea039c43a6f2415059b814b6e510c1c4a0f80ce83a3cabff32c"; + sha512 = "9dd4f16594d3d53a9c6ab2c24a373dafa1c3d02cf1d2aff5725bdfaf7bdec7c0df254b133f1e1e63f235a69fae687fa261f36b08fa0d09d6bd141d01e4f10c74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/es-ES/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/es-ES/firefox-68.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "5105a3c0d613dcf9c5e6bbef8d73428efba49e470d0af5f8a63077e0ecde4e83731efaa71da503e3315eaff05a3cb98e47d7d3ed6ca1fba72678f9e4b2cc1069"; + sha512 = "a560d1c5b2142590d086bb645b76c91c664bb6b849d5a1e90a32feb87691615b7d943612048fc4c248e0c65a7532861a751f9b3a1537eaece9e6604df8388778"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/es-MX/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/es-MX/firefox-68.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "0f793eca6858c63dd38e867c844c0c5ca11928904e67aa50e6613d895ceb49803079e360302851fd37bbbfd6c6ea2566d50c9421e6a4358aae6400f8872a4f6d"; + sha512 = "481db1dfc9cdd02963235d5ae74a3fd9bfea1d4d4e2dfff8a15e621e2ed2027ebc4dc14095e1ce0013f1350ee73717393e8db4126e3ac707218eee3f4f7a247e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/et/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/et/firefox-68.0.2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "16dceecc270ccdbe998d2bf523f3c8efe7b70b466d754b93b10e782add602a003b6c00ff91d0eb06cdfbe7a5ec752714d5a65837235ba16c62651d9e3fd1b818"; + sha512 = "7286f28029838e9b0ce5070afb9001fe01dcbac24dc85c5c2f93c5b9e5f6635daec7d42f0788c1ea2c03cfa8c03b190200be21bdf44acc2ea2bf9ba9aed62231"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/eu/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/eu/firefox-68.0.2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "c8785c8af23149595e31e6ffb8305cccbc40e89a60944c3e3db126a6348d43ba3b2db13e3bf9da12d44d515ac8b6ed97c66c73b06592af7f454427afdee0dff5"; + sha512 = "472a773ebb672bbe0e523dd08cdd45d310f0ba599dbd2ef720ec9a2b199c77596c746cd1378d2853ab82c289b5b3a2001ef407aa3e250b082dd82072e858a5fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/fa/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/fa/firefox-68.0.2.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "467793f8c9129477053fb1f90b19eb905310b2e3d7e0463b404bd4e2d50f9041fdfde4358d6b86d04d02caddf48ed0f3294ec93bad5edc8a1e5b9e69ee2292b8"; + sha512 = "037df8470545afc445f30f269efa4cf981a20593ee3ab180a92dfa7f33affd03a6dcefba47d252275ceae2c9291a743f5cc1060253854d0ff94c5ebfcd81f464"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/ff/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ff/firefox-68.0.2.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "68f76f18b0796d67f8d2d901d3bc4168fab14005b9ede5d01b80a8f151ba5d18700babb6c76d0e36768b32c488fddb48ff85900161804166106ea05ec2700ddf"; + sha512 = "e1293b2b8501bd30344ad54a8fe1ad0fb27292baca43ad791917d06441837004c8591bf54858852a8ca9de52048fd126937c81b2faa822f2140f73bdd8a4838b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/fi/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/fi/firefox-68.0.2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "4a72d9c8989d66eab070a0713deb49b419b0756bb50c889af9895e56bad25da129974f860c4ca7c97a178546bcaff9f7b1c1073d3886cf93b7f55d8627fd7969"; + sha512 = "f9acc483d78fa9e3a97d0d70dedd152f433106fe718198fdaf020bd4184595e0661d8086b2c680bb345165a57ea573a00e7484aaba99ad416c0fe4c08ce7ded7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/fr/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/fr/firefox-68.0.2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "5375cdad39dd217da9a145a9d3d8c1370371f324321a793393d47c67938cb55796f4c99c1f3ce1ae7fc536263df4ffbcba0be0ab3af7b908b1632b7f3ee9a501"; + sha512 = "bb28397f39be4e61dcb8cf783bdccb2fc0126e006d4fe8a8da7e15985335d5740cb3d41384f0592f0b7b4daa898066bc634397a680555dc720aec08ae0b8c989"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/fy-NL/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/fy-NL/firefox-68.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "367657456e186a052f5351d4e7f0a94373ed400c94dfd0ca64851a16cbb16e5d8dbb62cd5153a8e7178d7fe83dc22a601838942f9cb658af4624327a6309c0e8"; + sha512 = "edbb404ebdb71a2c6b1b66a2fff776ec467b0fd42a0710d1b796388674e62e70679b9490d70b92797bcdb5e32ace3691da88c50acd7e681d89bb9d166ca771cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/ga-IE/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ga-IE/firefox-68.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "11fe334d97565e47080c969fce1b979b33c3bcba4aa87992433982483cedb49badb6c456c3e47d57cdca37f7da48100bae120ab7defb78fefd4151da5d2b348a"; + sha512 = "7f16cd4796525f77fb2faf3ebdc08c61d14c35780107049a4ac2c00c208cdd1c36543933e64ae51c1cc65bf3896ccb2fb546735762762e25dd22c5bed71251ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/gd/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/gd/firefox-68.0.2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "b11806066cdad015aa9f71e501b108af023ebefb04ee73fcdf6186c29fb0779b6e83d185fb501e5768262bd4850d9cf70ad3ca9db38a3c6c26ec7b4bc67e9552"; + sha512 = "5c875835f2c1a2cbcc97cf623f4a2d57a252d2741707847cdaf4a2fa21cf4a2ad0bbe9c0a075f29306580499a9d9420d77bc8db2da88551e36af006f946e21da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/gl/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/gl/firefox-68.0.2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "c4f057d049d58164119c9cebc8c12404afb090a87fa8c70c5c948ab3150e997672a6831fff1437f50319a65f66a40e4b4b174f40b3768184c6e6c060c38f9c6d"; + sha512 = "6a0e069836ee596e9e7c6b08a39ce15b073bff8ceb676f957285d26978d8768d7b60fec011d941b05644474add0ea00e37ced01eb43512037839c010ecd5b637"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/gn/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/gn/firefox-68.0.2.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "376205bfc04eb9d293b7ac618dc30218661c107ead680121163fdb26c7ea43c34b2eb2d5c081b3c1a015fb19c55fbae1792475c7c0c2021efe695fa1f9bbd794"; + sha512 = "6811327bd3d952ec59ec04cd21567ce347fd53fb401a5017558dee0f89ef0cc5437f9edb8a8e21626a7c379dcdb118fa8a27d5ee7d1bbb14eaf7daad5b08391b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/gu-IN/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/gu-IN/firefox-68.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "35104699fe4b8680ae04ca6371f39227e99fa10d75c78e9615e4a63abae622ec1fccdcfba48cfc6da33bb717bafd55e8a4bc08a7712758f1eef677753f75d93f"; + sha512 = "5d8e5d339d350f151c8834d16fd26979b42d3ca32e5c7f72e280923252cea294eb4857725035eb40c282848b38efaaa79b974e795211d3d59598c6a53a6babc2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/he/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/he/firefox-68.0.2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "5e2471b33a132833eb4c128e5d93f14f9ed03822362461ebfcbb0791eb7e468e5ad49e34266c6a9bc219e5285011307587f2e9098b7864b1a24fba853911fd36"; + sha512 = "e9e9bdd9698d7288dc89fa03a5461668dd67ba305a2d822a50b1325e797ad233dc727cbecece58da43e104fccf319ae2d884c39bdf4abdb3b5bfc88f989d1f52"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/hi-IN/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/hi-IN/firefox-68.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "b691bd4adc2589a09f780d2a301921d4aadad231e0c9df810085fcbe57d52acdfb801d18ac21bbe7070292d40f009f6d3bf43f7a107b0e58f4bdf98818bcab10"; + sha512 = "5b650fbefccd3768918a8203687e39fac96f3530236a40f1d73ef24ab2a25a58f901ba5cea0dddc9b9623ec84015eb6392182b1f02a14c46d382eb07a2078ced"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/hr/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/hr/firefox-68.0.2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "199977cdae135d15c6e57194f93425c9058ba0a43f1071c8124c03d154e3b6be9bb1755b77b2313da102a973f82efd427ec195759811e3ce4a780a17d4c66ca1"; + sha512 = "6cd3ab0dfe19ee2bc3725af08dbe54f12f214bf4b41047435f6fa8ff986bfcf45772626c7392858987e01e1fefcd5ba1b28872cf7774ca90413993343367705d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/hsb/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/hsb/firefox-68.0.2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "411f411c6967fb4126637dc86edcaa8dc2d30da1b4898a1b762916f3b42429fe9ced5f4511f8482dcc5d6a3e0864ae1c002d995b559fc29847c4a447e3c35c2d"; + sha512 = "ce300da3c7e1787fc205d904694ac84bf4fe4f271d95cadd9539b18c2b0fe8f35d12ba331ac098f56a56786f36e1cc2b2fbb62ae7fac25cd6368d8a66ea8efdf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/hu/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/hu/firefox-68.0.2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "b63bb10f875f313af70177212c2fa89c7e7bd0750f2f3a756690ba0e4b447a046b1ed5550527d840b9a6792f9e2e8d9d0dad2d168db2375c1bcaaee7e20b3709"; + sha512 = "64d30bf6122ff4598603bca84d4d1ac30c2e84f106e4c68f6a0dc24dceabe67e34e514dcf58acdd8b6d3c4412a5e1a912e184ec13e8ddb5867943b2965a3f1be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/hy-AM/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/hy-AM/firefox-68.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "aaf4184373fe79fee98e5029c6d869d6799665e561441cc47c25b800d502c5e25fd254945cae950b662093b407761100662928631e285940693ad209043ac2a8"; + sha512 = "799faf34055822487b442da86ceecc7dbe36574a76a8e04e4fd76852182bd75d773b69c0ed19fb33c5dc23bc4ac6c0c21a6694256398629a984a1d2ebd63a63d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/ia/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ia/firefox-68.0.2.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "df93e81ce41af39dd54a01485dde96803c1d9fd6be1a514999f6983e71805e25e1abca7469df1c322fdb5b933370a3f1be7040783ee496bb6525bb457eeea8fb"; + sha512 = "ebf9d05baf6b4963b0b5ff25b2747b3a90e4b664bca1c865638190dae85891499e3b1c5b3b656f83896117b430556efee039bd58a5728573e3be47e1da4b77bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/id/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/id/firefox-68.0.2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "b195ed2de8f83f4dbb5b5f8703407666d29e5d7430bdc92e6373f0c7617ad85d1405acfa7b2634eaedc9c114d9793a5202cdc4051a0636947c99147fcfc76444"; + sha512 = "0268c27fac89400ac179778f9e17b8b1e5d1f1e6bb9817576e03f4985f0aa7a57444eecdde69c1f7800e5128cdcb5829f62a4ebdce6124e3f4832a9fd44022cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/is/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/is/firefox-68.0.2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "4bc445b3d4666f695c48524ebfb5378a2c3914a2f884f6e4a3a83076906f8d8f5c7d87866f04bd5df96092cbcc6f5d204be40fe9a0417b2d9383f2fe6bb2c314"; + sha512 = "818f4173ff8e9bc01576c0d416b39519bcaf33d83760e91d1b4f8ba8e28389b81816c15f5d19f3fcaf6a8140b2bd8fb92e29a844e2da05f9d6344542c7b5f615"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/it/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/it/firefox-68.0.2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "b07507137aa522f57df53f005ac3c201a6e369bf6a9ec9ebe2c26a91c2d72cd9e065abbecb591e68ccbc151513da7c62aaa0fc49cf99cf2a134331e4a2fe56b5"; + sha512 = "6710ac5a6c98dd9010712acc29239f9f102bda2458d16fa3394ff0ef6128486b759c3e68d568614f793eb0959fae908f3fc519dd52fb27a7495956d1e66c6f53"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/ja/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ja/firefox-68.0.2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "f2134162dcae6be75cdc4fd9f94bfe03f89ed6ac80c6b9894cc322f7cbd96bf478d13fea6b17ff082b1c90f8699cbddeeaeaed77e41e0996a1df28cb23cde70b"; + sha512 = "481206f6a36704b06d207f6b4eda96c307f61a2700a3da6fcf659c6b12c7880ca5ed69f1c3ae9da42d774e84e2e9c621095cfe3fd4c8e175304945272d51bbdf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/ka/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ka/firefox-68.0.2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "6128c485ad9bc47c3afcb404b07f3afc344957328ab63cb90874179c913e479cc2b910975442a7af01585ce85ec6604fe4cb190e853527d19f29c80d98043c3c"; + sha512 = "ea1bbb5f759060a45a62b605d82db9b560a05ce9f0f92b907bc92da1a30229e312bdaca3e78560ed698100099f1bf261b71abccb353930a77b9908d0b0862ee7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/kab/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/kab/firefox-68.0.2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "9ee4940d57ea364c8f01510d480c0175220a8b5946921bcba87fcc0d21a2cec673ce3e823e17c1637e332bed6c4d8829a404185e583056375009ffb34e963988"; + sha512 = "4855f086d6d4028d18a6dfcb3da366c667e16a84e3b81d6e58408a2dcbeba77fc01668b90290e4ed49334d2afa5454b866dbc2ea3f4b446d5eef861bbb5b03cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/kk/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/kk/firefox-68.0.2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "92255a43141ca91fad054e597acbde26e9468019a5e1b3250ed25372e27ce1a5f3843898060a11a727c3ce38c4e233cf5b10fe0cd658d2d64b17638f207e5224"; + sha512 = "e48bb95cdb2361cd274e064e879ffef3d4cf25c15712c716c278a16b31636b3ffe3585999f7477e58b26ec5fa4ba0a3d5c5e80f7af97b305aec3e899867e66ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/km/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/km/firefox-68.0.2.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "cf9f5eeed7fbb332c18374d070eee9a143643e4e34b6a924cd0c18a6589f68781330d0066f20f495be92cd96889b2770d5b737e8c96be4f0c45fc2b8949ff025"; + sha512 = "3a987d55f2b113fe7ca2f47457d786b5d851605edc94e3a6467a2ce127075be4a2aa924892e053da6b9f854de60555941a875e0b94c8a8d736d84c791d5d7803"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/kn/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/kn/firefox-68.0.2.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "3091d42eb7820b9b258c0f735ff8d9b00d2c850651916cb209dd28830e2d664b85f56673feece131f7a3531b0f2a808b7f8ddfb1f23fa35c52b98f29cf0ba18c"; + sha512 = "36331d0774b85403d294b1240e1348a1aea9ea52df8ff8013a69f0b82cb5e8c799c87e3fbc9fdf0fc20f3537d0124d7dc291cd8fbc34063e4bd3b17c6810ea7c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/ko/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ko/firefox-68.0.2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "847e70bb62ba1d12a424fd0e33aa2605c090bea64bf3c4b653661a863f9988c2860eeda9dbea021b1cf67f0808554872d7b74bd73abef39dc104f436fdc1b57c"; + sha512 = "7534ba3a9df96088180efd8a9c1df50e674f1749edb9103c6efc6db8c72d8e82aee09081ad3a956b07e0ab6c57e8c8194317d39a933da977dc0afdd1142d1c2e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/lij/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/lij/firefox-68.0.2.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "f084db30d883189604087432ae8e8bb4958ef44f50e26bf1df5a72b7a2b6b2107bdee3a28f305b619f6fed9f0d800b259e92b8b9554c96e0e9d68426c6dbb97b"; + sha512 = "affa07c2eb1590fddf0c30c670b6c7b6f9f6969dd43858e277a750ac524063f5da5166d7d8326e1823e0258ec5f214d241a08dbe338a3cb979de8b19a9799009"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/lt/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/lt/firefox-68.0.2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "45aa058345f691fec5efdc309842dd13271e717b87fad43b74f1c7d15e64b991eec667536a333965f5eaa8a3842722dc2b27b1ac29ff59b7da5ba278be2afd3b"; + sha512 = "416a8a66b087dea18c577d839c151f958c084e8ee95fb0fd7f17a45015baed961de0ca138fcc12f58154f480df15d294d822dcf1f218f4c8082c9193ad57710d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/lv/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/lv/firefox-68.0.2.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "07ac2c7c0829d952c9327bc2f9ec354920a5a2b738df6ad639d51c454567498b4ce6daf320046a62a03da082d8880ba455d3de8222003b00142c2f4cfb0ee1f6"; + sha512 = "1c5359efb53b0d4f0d9f33a321cac45ed112ede997c06b2279546183dd005c186f107701c895ced27a76086ca71374a49a067f5599a0d2ff166432b7eb7629df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/mk/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/mk/firefox-68.0.2.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "685369c075265a35f7338f50a87c7e00059fdd5c1ab3dbfdf23753fd30c5bcd3a0eafd546876a5c06aa15731673cf6e8b03d629148ba3894595da7a2215aaac6"; + sha512 = "db44f22e19d505a590749ac98d7b84354106d421e4a45eff70986af2c9d2ac581a0bd84cfa103196ae4cdc17dd1fe5d9f0cf0c710ee0fb5a0ff7701f6de5253f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/mr/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/mr/firefox-68.0.2.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "3e169297be6530b3a1f0733a22680df25688eacea37377dd763779cfe6ecf9695e904e471821ea3cd6558bddb33a2ca9f6c769a0d7c59467144979a431316b1f"; + sha512 = "db73d7706ec4b87e76f5d174f22f9b032d75d9aebe6001ecdaa7c2c8fe5db897efd57f0f2ec482a5ef22e629a6233f5ef7c5df19566a3df0f0ce58ce008a22fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/ms/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ms/firefox-68.0.2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "5c32f67a5d9e88c4025d51e80cec6d21be37f4120bab2b2adf69fb82dd44fb0368e2b4ec8e66f8fa13570d35d133b74710f9aa37104459f2a15446261f026149"; + sha512 = "23dad70a4757bf8e9c67328bf43b9be2a9d6e7f88ecc9c2980314e68eff269f996535f43f9fb93419d81a2e7c922327e5642c191e15582cdfcd3e420433e4270"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/my/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/my/firefox-68.0.2.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "9829f5e90f7ced1b83052a2741a6776da2f6ad7613ff174b1b92e123962df6ddad76abc1ca51feb9b9324c68baa6100e8306858d515558f2f27a144cddd64647"; + sha512 = "ba595429b7c637d06f703ae6bb1cb5ec6095a7f6fed7ea64a0b39825921f49f5f827c33a5cf3cd0bccc4b6398acbf4119a147014f1d2db1d8bd4b3e72b7733d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/nb-NO/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/nb-NO/firefox-68.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "5431508873ac32627d8ba28fb5d5863f0b6eaadee0e02c07397c1effc388ea82a568f1d1f91f78230ebdcaa88cfce0a62f890e922c1b2f56889d6cbff95dc983"; + sha512 = "8af331ca56c43c43b42061de4a7686bd2f944de845f9d94d088a4c1c913e1d7376abfd175dcebbb3ee78fac7fbea407cbdb2b81382919d12fca021dfccf59feb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/ne-NP/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ne-NP/firefox-68.0.2.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "a5a65a0ee02a83833ad4b8759aa7221ae9af6e12c246a9dde975c19346b5182aa8445f304a0507b89bba6891cdafdd3dfef0b80adb859de95427846c42921d9d"; + sha512 = "497001fbf28df53edf13aec04de313a1353ce0eae894905d6a33b0c182ef589160eca2f0a8fc18d8e1644f573cd74de3e96dbf43141b05b6884be04fde28be76"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/nl/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/nl/firefox-68.0.2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "d5ba84a3d0a8423e0568060cc6c11bd1490d4701a53f25c8635ec59824208595584f7c61451e0c16ab669c324f2be9c80005cf80c05a394c85b90fa636ae90be"; + sha512 = "6c0836da50f14accbf536570bfea5fe4e587e87fe2e4203b2c94052476994949058ee2418f862312a95627730d648832f6a0ca39690513c6d96070108630e43d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/nn-NO/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/nn-NO/firefox-68.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "36a7f33a78edd79979c0033ba3c63ab3f680bad2aed051968e9f790776c02c5c2f050402e7ad292cf31fbbb2c73ac81f2c646244ce829cd3e655a6c2ca772bd4"; + sha512 = "89be8b53fdc39bb39431584ea25cd6e5d660f75756d6c45f0157c1eb387cc625e927931c1cf0d1587c0819fef9635cb3ac2319af6a6f35825a6170518070cbd4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/oc/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/oc/firefox-68.0.2.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "8f27e10e5424cceb71ed9e5388289b8bd37ea9003b2003d1d98c140335f80e156f4fceb812565092b98e47071ca4dcabd7afc21f03c7797ef59ea107e66b5e88"; + sha512 = "6b34edad11c141398d329d07e126eddf03bfd395bacd6856e947771ea65e274e78f96784f695542280f4530c395ebd0011946f1bdc95c1bf5c0f96ae8d7ea707"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/pa-IN/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/pa-IN/firefox-68.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "b01ad4efe6ba519435d11fab4696264d9a92ee8dbc86e2019573e475823cc0fed276fc26de77611deab9197e31d278187c49457a63d122e8e5f8b3a82aa2c128"; + sha512 = "025cdbfa14ae385fd87e71296b67f9b0313c60ac56cb3d0f2734bd803e990b846383d64f65ca9a3d643fe0f2fd678d54a2b2000c7dca1cff73e5ec47acf1e53d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/pl/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/pl/firefox-68.0.2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "c6dd411c9bd1e8ce0db99e619955e3b036aedc084f9065d71c35daefb66f5745905eadf09bf291975b96ea1ab23aac77f56e26ddc73ff4b608dd3a56f345834b"; + sha512 = "569b0dabacb30f8ed02cb1118a062c1e212c4b688a104d9afce8d846572a92723ca1ebbc495dd0e97c3365ab3e5010b9d812e88b111f40a6e87b14c646794dfb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/pt-BR/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/pt-BR/firefox-68.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "81c9a23041e71610efbdd05a37f4a4112715e002b146366640cee437b2da77c776ec98f030c81c58a7fc87b386f1aff9dbae2890fb99d0663bd61375c6aa7e08"; + sha512 = "36e7914fee752f7cbddce0ec5e48ffc0f45a20dc4b62a825488ddb0b49c36f91d2df257ffe2b551bba2261d7786291a2a7fb3f518cef5c6f9b449205eaa733be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/pt-PT/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/pt-PT/firefox-68.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "2d4d770531e166a597fa27c8e95a4586e580a2c872b31aa9a1d7a0ac98fb2571ce368711258d552abdd3205f4beaedfdc0404b8261a047a737f4991abe01ecab"; + sha512 = "fc6dcdec3e6d53111929a70f3cd22948006d9a5bc2c6e4cb305a07c4bc8ee0469297be01d85b68017a026e011c35252c25032156ff383cc708c470fabcbc7198"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/rm/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/rm/firefox-68.0.2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "2bccb963953f99a92e266a5996819db8cf439244fb3e328ca19d7282a3b9839fb44f3da6c6ac78dbd75c91766b7c7bcd1af8dd61b0562a9ab3a390d0789c930f"; + sha512 = "d5b2631fc3076cc251cb82e6c0930f7890750a73902480033ad0b5ec91aecc6f15c01e1e79b88ee4b2e74588a76cd0017fa520175559e1e68a6edd4149cd556d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/ro/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ro/firefox-68.0.2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "8f4f79bbdc55ab8490df7158540ddf79bd75099eea285815f267f72426e8ecc5d8818b9a5617995fb44e3da88d79889f0b2fbd2065a38ab2e04c4d462a5818f8"; + sha512 = "d88ea2b05b262e010b0e447f4480149ddc79874dcce3925d3768211d7016cff99a9a0aef594c7185eb81988edfa46497dc442a4d825358c821461cc0f689c593"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/ru/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ru/firefox-68.0.2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "8b4d2f096c0833e91e9392a874de9cc1adcf90651c49f95792a4b63219b380fb419a8ff5a2a90bfab4da8ccfb212622f295646d0abcf1a3317780fd4b5fd97b9"; + sha512 = "cc28f64e1ba7aa4771667a09e3ef9a2dfbe1af3c3ba552f14d16bf338eaa178c32eaafa39b6c0592e690fc10325b88966f555283669d241fe05bef113e533c02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/si/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/si/firefox-68.0.2.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "ff91edbe087b3302692f2cdc22f1f6961560dd752980c6a2d1859a99489e6a6a8bcd872776a795974d4ef7afb5b21acb4d77c9461b34cb949809ff64d3a3744f"; + sha512 = "9119703b2edc30023b0bf81fdf6083a46544273a5b0dbe0f1d76c00020f1a093ea1df2592375bff9e81af1190f7fbd269f0387e311211a8d806e7519164b24af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/sk/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/sk/firefox-68.0.2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "94334d2ed2819339b725573284b8ffb5b8a8b7cc210e8ff341d0b54172a72053ea7b501189a2d928c79b62f185a00ac02e8bac4e8f90d44f4088b81cd64999e1"; + sha512 = "fababc6cd6644be1404ee1b6ab6f0c01c161b13539702a932e67062bc6d7ca350d0b7c88957d0617b404d892b93fff1b736d93a4061ca0b154e2cf3fbd0972ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/sl/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/sl/firefox-68.0.2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "bffdbadea3d80d51ef2f35cebc245d7649970cdded7a98ba6ad8c6d293cd076445c802c376ee5ca76235416e8dac3793888e3e93f83e88598fe7752dbddb9a46"; + sha512 = "5e16fd5446f742f259fcaaab1bf15e7d56cfd412065c268d625d87fb812312e6caffbdf0502d8d20bd9478bb4b2b3444604d8a1aea7a006c0dfe3d8120b2c1fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/son/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/son/firefox-68.0.2.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "c38f4605af7ae181514d060cf72060c461d5e78c6f63f0e7c2dfc4a42b8fa929b239e189a33d632ffb1517bd6c73e19bca0fdd96c06456969fd9cff2ee22a23b"; + sha512 = "0a36b7350d7cff22bd583bf7d811fac358046ddb0b85da52750e1687d7b82487ccac8575472683302c9a814abd07f81b227db3f2ecc8562f5d069d95045ba7d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/sq/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/sq/firefox-68.0.2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "6aa2a1a2d2cfcbf2c603e825a5331c831aa49a5a1149dfa4112747d0003ef8025ccc5c0ff35c3893f810749edee45cfd9831e0a11020b1d96e4585e4c014625e"; + sha512 = "b18398395e0ea078117987704c962399a385e0ea2e4568291d8449d9fcf5f1784e4074b990e0e5e8a5b6b9dbd789772eeed689e722f4179e3f451064fb08ac92"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/sr/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/sr/firefox-68.0.2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "c9dcdd960e035e937fda42ea96bfb854d293969dd0a0c46ea1585436c4fd5762e3f8a4154027b4919dc582a6eff4412d69d5ef8b27201ad54c6fd07fd502106e"; + sha512 = "469ea3344ef2893333b7c967a72a08a86c24ce511f8d45f95ad159def204e2d5a2665829ddcf6783cb0602f0013f3924045410609b9e2a921f43c79750435648"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/sv-SE/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/sv-SE/firefox-68.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "97ba9fdad986567f6bf4ca3866bd474390a09114413515bc4df848ca832d9e620e7a0e47210fed1503b7e4103b77ec5ed25e0a605557df74515dca0b511956f5"; + sha512 = "4d9080b2bb8d3dbabd2ba6a14d0db8e5a983f5ab077d80dc7ddf892a82c1508b1b9bfe9b346d009b95a1ae89f300e72e37479c905b70ad924fc9d1c34f1317d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/ta/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ta/firefox-68.0.2.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "aec52cc2af72f3b34639435fedde839dfe5da8dfee521e7e987b10587bfd257cc44b848e79df8fda26d35848d47cd56c4732edbd02be8a3be0fda28e9da92237"; + sha512 = "347edc360548f3a254c1eeaec47f1ece912fc79a0c19d3d9a1e455ec847749d8d531aef8bb44e2875afc4618a1eabfb77aaf581788138bb0a8607a443699da91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/te/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/te/firefox-68.0.2.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "bce11fc72ea11b2f5a95f2edb273dfb0829ad49063274427c6b3f1380c6a8cd1c26fbaab0caec241dceaaac96c421cb353a6bb15c28e4943b238ff793ceee39b"; + sha512 = "806a97bdf4030dd8de57f3e2af8e06d71ea17891f4cd08df3cb3e71bfef372f1029b78ec6a16bb6ec96dc5113a0e96616e2fb907e11c98b6f33c9b83f67d9c37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/th/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/th/firefox-68.0.2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "8d97c763b0689e315d866fc27642589cd10bc94dc2281a7eacf60b2509a01e9b0312178f4b387dd1dceccaff9235e41308c10f536efb189039c3374829c2894e"; + sha512 = "a453c97807c46eae98a1fef4184dfe06c3101240e5d20c389b9cfdaf4dfb4c2c3c38758d0451789d326c2d76249651c2d1a7aa4134e514b9de3ef966e4bed60c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/tr/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/tr/firefox-68.0.2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "3443bdd68555d8cb36a827ae9cc2a94e26f6718561286ce1ecf8cce9c15822c1daebdcafb90d02c241d9bdb41641397c1e4ee6175f36e764025003a10d420456"; + sha512 = "79fc0d00870d27ea7485c5807c5e4753b036364f68f71b3a66e11b23e8a6f5498af35411d5baf1dcebbc8959b3ec1870faed90b136aec6a71ee2ccc59832cd3d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/uk/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/uk/firefox-68.0.2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "25af455760eb79dfbbab7d27dc6b738d9b1800f9043f429b978bd087b19f3c0a690634e7ebe07bb1bd03d9e64d2628ffdf4356c74cd0fb042569660f28fe52e3"; + sha512 = "87176598ed9df72c6b05a2469ff404520f8e4171ee42cfdecd4dd461c761bddaaf8735ec9a9d9e651299951a656dc9189c2bf91f2ad896ff387706aaf31614b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/ur/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ur/firefox-68.0.2.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "cde44d69bc67bde135be5f7a9a364aded951ae9f1c69a8209bd09e54aff576400effe538d87473ce5cea633494b035d4d98f4dc63fd9dc6b2e33d66eee66d426"; + sha512 = "761089a4b9a9df1e8aeb61567db383cc7f1068a56a857f9ddd9f306ae0eadd0f1fd0d911243b86dbd7cf755a1d0d9e2728f710d5e4855286c897fbf1bae3621c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/uz/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/uz/firefox-68.0.2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "2c4cfa944e937ec1eb87678eb5a022912b3c8c97a51fccdf673248fc0c06bd0bf175c95ccd26c90c9e9fa02730b0b84f07df5ec5a8be4061c15b494b967ee4cf"; + sha512 = "16838912099255e703f45537810f9a125f162da46654356da5d7284cf5976af0ba47e77b5658f7a95ff63287379411356521fca2250daef3f8ec299231c561c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/vi/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/vi/firefox-68.0.2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "e4039206f13126be5b4ab1fcde6f25ed60054274cba96c2c0cbd3ee37af16275f1e9db9f617b87bcdb5dd81f90b171a444eac194f170b15cad9a9c5d28310cfe"; + sha512 = "26c8651de12544aff98d6657bcd3dfce453d394dd0f4e6045d8a29d8ffeded020335bfc958984e1b79dcc4b8bf4c3b3a29c1b20fb62c0df7a6dc76478f72dc65"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xh/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xh/firefox-68.0.2.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "7162e25df7626472d4f1878d7f8ff9e8bfdf50fe386f53faf5341449915ad62c4c48bc52e1cc34de664bae4e8fe4546610bb0c98e1678dc1f20ea21a583a5f09"; + sha512 = "222a0a22c6e41a6f755ba881097c2c354924bfb809f3a04b588853da667444f8c922fda9bea0f3c7bc82f46938f86810d2cbd5900960180a2a25f9cffaac9088"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/zh-CN/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/zh-CN/firefox-68.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "c2d4c2bf53bed935c38b23e1f31b7b462e676c172682aa7d0c896146b11a050c880af2358dac23b08a3d2faf00750fff928d6174620ac3fda2e77d7e04af71bb"; + sha512 = "3a3eea1dbb9c42c1740ee67b68e71ce84ef1f3f14a52c069a17956911464570429b3576e29ec7370a857dbcaec143bc4ae65e3f01e319b7ca065899e8f864eee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/zh-TW/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/zh-TW/firefox-68.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "c1d916c1e728596046bd9344798d582ce05592e9ea20ba11094181f89084b029b6c237c93d5d65048be624a3bc7f4913005af74663b75a72817c9d7224b52be9"; + sha512 = "a8d53ff606b7bc82dfbec77b299b8f69985472486706f79c960da988063a0e86d232eefb4734b8a624e97e9849fad3e36a483190b8cbc6c3210b2c2d79bd2b25"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index f56154c2764..20509439d2f 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -17,10 +17,10 @@ rec { firefox = common rec { pname = "firefox"; - ffversion = "68.0.1"; + ffversion = "68.0.2"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "20rqfa5sdaagryk00iywnbap0bmhq1c74pfbxi3pq1cs52qs5nhjqn3xm6910zwcn5nw08i9qd5jkg5blvqrjzw780nh8qbrwsm3d4n"; + sha512 = "2xzakpb6mp9hjqkim353afv059i4zfpmhflhv3l3qzajgjz36cacbmp4bkn4cghinm8krhp8z02264ww0bcraryjjwn5q0dzljrha2w"; }; patches = [ @@ -99,10 +99,10 @@ rec { firefox-esr-68 = common rec { pname = "firefox-esr"; - ffversion = "68.0.1esr"; + ffversion = "68.0.2esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "27ncapq18rdlrf0kp5r09spcqazi0g8nbzbfxijs9pi3cvlkayagi3fbbzzq5jkn0n3j580vadc6v1v3zibvdwb5s3c6bz559a7nra2"; + sha512 = "0dyjayrbcq6dg8vmzbf7303aixnhpd6r777chxpdvqq892rgvw5q4f8yfb6pr8j978hahn4dz968vzmi6sp40y3hf62hnzdqpzd2bx1"; }; patches = [ diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 6632b116fc3..1afe4dcea02 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -300,7 +300,8 @@ stdenv.mkDerivation rec { # Clear out some files that tend to capture store references but are # easily generated by firefox at startup. - rm -f "\$HOME/TorBrowser/Data/Browser/profile.default"/{compatibility.ini,extensions.ini,extensions.json} + rm -f "\$HOME/TorBrowser/Data/Browser/profile.default"/{addonStartup.json.lz4,compatibility.ini,extensions.ini,extensions.json} + rm -f "\$HOME/TorBrowser/Data/Browser/profile.default"/startupCache/* # XDG : "\''${XDG_RUNTIME_DIR:=/run/user/\$(id -u)}" diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 2367c0a9855..b06edaf9dcb 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -17,11 +17,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "2.6.1566.49-1"; + version = "2.6.1566.51-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "1hl7aqq3i6mkkg7sdcax26kn08p8mqwlq4xpg4v05ivdvyh5ac9d"; + sha256 = "0582f16saldgn482806f9igb97is4p3ayvh99j0wx9plxnyq5xmm"; }; unpackPhase = '' diff --git a/pkgs/applications/networking/cluster/click/default.nix b/pkgs/applications/networking/cluster/click/default.nix index cb7c41d0c8a..bd8eb545152 100644 --- a/pkgs/applications/networking/cluster/click/default.nix +++ b/pkgs/applications/networking/cluster/click/default.nix @@ -4,18 +4,16 @@ with rustPlatform; buildRustPackage rec { name = "click-${version}"; - version = "0.3.2"; + version = "0.4.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "databricks"; repo = "click"; - sha256 = "0sbj41kypn637z1w115w2h5v6bxz3y6w5ikgpx3ihsh89lkc19d2"; + sha256 = "18mpzvvww2g6y2d3m8wcfajzdshagihn59k03xvcknd5d8zxagl3"; }; - cargoSha256 = "1179a17lfr3001vp1a2adbkhdm9677n56af2c0zvkr18jas6b2w7"; - - patches = [ ./fix_cargo_lock_version.patch ]; + cargoSha256 = "0298x7wkr4j1l5flmv5vhl1ay8icvh4dlhsh4xi8fd3p8jl9jpqv"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/applications/networking/cluster/click/fix_cargo_lock_version.patch b/pkgs/applications/networking/cluster/click/fix_cargo_lock_version.patch deleted file mode 100644 index bc4db7ef7c1..00000000000 --- a/pkgs/applications/networking/cluster/click/fix_cargo_lock_version.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index ff80350..c86c6fe 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -111,7 +111,7 @@ dependencies = [ - - [[package]] - name = "click" --version = "0.3.1" -+version = "0.3.2" - dependencies = [ - "ansi_term 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "base64 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/pkgs/applications/networking/cluster/cni/plugins.nix b/pkgs/applications/networking/cluster/cni/plugins.nix index fb36d3729c0..b5276818f79 100644 --- a/pkgs/applications/networking/cluster/cni/plugins.nix +++ b/pkgs/applications/networking/cluster/cni/plugins.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cni-plugins"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "containernetworking"; repo = "plugins"; rev = "v${version}"; - sha256 = "07d8knnabfjipzvcqbq7h8gd940lln934xp57nf5x31d3hpmvzws"; + sha256 = "0gyxa6mhiyxqw4wpn6r7wgr2kyvflzbdcqsk5ch0b6zih98144ia"; }; buildInputs = [ removeReferencesTo go ]; diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index 96f3354023c..6a721ef14c1 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -1,44 +1,62 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, go-bindata }: - -buildGoPackage rec { - name = "kops-${version}"; - version = "1.12.1"; +{ stdenv, lib, buildGoPackage, fetchFromGitHub, go-bindata }: +let goPackagePath = "k8s.io/kops"; - src = fetchFromGitHub { - rev = version; - owner = "kubernetes"; - repo = "kops"; - sha256 = "09rmgazdrmnh1lqaayzfbn0ld7mbj9whihs9ijv5gf6si9p0ml9y"; + generic = { version, sha256, ...}@attrs: + let attrs' = builtins.removeAttrs attrs ["version" "sha256"] ; in + buildGoPackage { + name = "kops-${version}"; + + inherit goPackagePath; + + src = fetchFromGitHub { + rev = version; + owner = "kubernetes"; + repo = "kops"; + inherit sha256; + }; + + buildInputs = [go-bindata]; + subPackages = ["cmd/kops"]; + + buildFlagsArray = '' + -ldflags= + -X k8s.io/kops.Version=${version} + -X k8s.io/kops.GitVersion=${version} + ''; + + preBuild = '' + (cd go/src/k8s.io/kops + go-bindata -o upup/models/bindata.go -pkg models -prefix upup/models/ upup/models/...) + ''; + + postInstall = '' + mkdir -p $bin/share/bash-completion/completions + mkdir -p $bin/share/zsh/site-functions + $bin/bin/kops completion bash > $bin/share/bash-completion/completions/kops + $bin/bin/kops completion zsh > $bin/share/zsh/site-functions/_kops + ''; + + meta = with stdenv.lib; { + description = "Easiest way to get a production Kubernetes up and running"; + homepage = https://github.com/kubernetes/kops; + license = licenses.asl20; + maintainers = with maintainers; [offline zimbatm]; + platforms = platforms.unix; + }; + } // attrs'; +in rec { + + mkKops = generic; + + kops_1_12 = mkKops { + version = "1.12.3"; + sha256 = "0rpbaz54l5v1z7ab5kpxcb4jyakkl5ysgz1sxajqmw2d6dvf7xly"; }; - buildInputs = [go-bindata]; - subPackages = ["cmd/kops"]; - - buildFlagsArray = '' - -ldflags= - -X k8s.io/kops.Version=${version} - -X k8s.io/kops.GitVersion=${version} - ''; - - preBuild = '' - (cd go/src/k8s.io/kops - go-bindata -o upup/models/bindata.go -pkg models -prefix upup/models/ upup/models/...) - ''; - - postInstall = '' - mkdir -p $bin/share/bash-completion/completions - mkdir -p $bin/share/zsh/site-functions - $bin/bin/kops completion bash > $bin/share/bash-completion/completions/kops - $bin/bin/kops completion zsh > $bin/share/zsh/site-functions/_kops - ''; - - meta = with stdenv.lib; { - description = "Easiest way to get a production Kubernetes up and running"; - homepage = https://github.com/kubernetes/kops; - license = licenses.asl20; - maintainers = with maintainers; [offline zimbatm]; - platforms = platforms.unix; + kops_1_13 = mkKops { + version = "1.13.0"; + sha256 = "04kbbg3gqzwzzzq1lmnpw2gqky3pfwfk7pc0laxv2yssk9wac5k1"; }; } diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/pkgs/applications/networking/cluster/kube3d/default.nix index bc01055244c..c549efa7b40 100644 --- a/pkgs/applications/networking/cluster/kube3d/default.nix +++ b/pkgs/applications/networking/cluster/kube3d/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "kube3d"; - version = "1.1.0"; + version = "1.3.1"; goPackagePath = "github.com/rancher/k3d"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "rancher"; repo = "k3d"; rev = "v${version}"; - sha256 = "180q7a95znpkhfqcaw3asqrq22r6ppw98qsggp2wfm746mllg5pc"; + sha256 = "0bdpjnzyxd6mdc1qv0ml89qds6305kn3wmyci2kv6g2y7r7wxvm2"; }; goDeps = ./deps.nix; diff --git a/pkgs/applications/networking/cluster/prow/13918-fix-go-sum.patch b/pkgs/applications/networking/cluster/prow/13918-fix-go-sum.patch new file mode 100644 index 00000000000..ae407727b9d --- /dev/null +++ b/pkgs/applications/networking/cluster/prow/13918-fix-go-sum.patch @@ -0,0 +1,22 @@ +From b0ab95b9664916618ebf5fe637b1bc4de4ba9a6e Mon Sep 17 00:00:00 2001 +From: "Wael M. Nasreddine" <wael.nasreddine@gmail.com> +Date: Wed, 14 Aug 2019 23:07:51 -0700 +Subject: [PATCH] fix the hash of gomodules.xyz/jsonpatch/v2 + +--- + go.sum | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/go.sum b/go.sum +index 6bb130b4d9b..b3f48a85d4a 100644 +--- a/go.sum ++++ b/go.sum +@@ -452,7 +452,7 @@ golang.org/x/tools v0.0.0-20190312170243-e65039ee4138 h1:H3uGjxCR/6Ds0Mjgyp7LMK8 + golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= + golang.org/x/tools v0.0.0-20190404132500-923d25813098 h1:MtqjsZmyGRgMmLUgxnmMJ6RYdvd2ib8ipiayHhqSxs4= + golang.org/x/tools v0.0.0-20190404132500-923d25813098/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +-gomodules.xyz/jsonpatch/v2 v2.0.0 h1:lHNQverf0+Gm1TbSbVIDWVXOhZ2FpZopxRqpr2uIjs4= ++gomodules.xyz/jsonpatch/v2 v2.0.0 h1:OyHbl+7IOECpPKfVK42oFr6N7+Y2dR+Jsb/IiDV3hOo= + gomodules.xyz/jsonpatch/v2 v2.0.0/go.mod h1:IhYNNY4jnS53ZnfE4PAmpKtDpTCj1JFXc+3mwe7XcUU= + google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= + google.golang.org/api v0.0.0-20181021000519-a2651947f503/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= diff --git a/pkgs/applications/networking/cluster/prow/default.nix b/pkgs/applications/networking/cluster/prow/default.nix new file mode 100644 index 00000000000..1c802802c09 --- /dev/null +++ b/pkgs/applications/networking/cluster/prow/default.nix @@ -0,0 +1,71 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "prow-unstable"; + version = "2019-08-14"; + rev = "35a7744f5737bbc1c4e1256a9c9c5ad135c650e4"; + + src = fetchFromGitHub { + inherit rev; + + owner = "kubernetes"; + repo = "test-infra"; + sha256 = "07kdlzrj59xyaa73vlx4s50fpg0brrkb0h0cyjgx81a0hsc7s03k"; + }; + + patches = [ + # https://github.com/kubernetes/test-infra/pull/13918 + ./13918-fix-go-sum.patch + ]; + + modSha256 = "06q1zvhm78k64aj475k1xl38h7nk83mysd0bja0wknja048ymgsq"; + + subPackages = [ + "./prow/cmd/admission" + "./prow/cmd/artifact-uploader" + "./prow/cmd/branchprotector" + "./prow/cmd/build" + "./prow/cmd/checkconfig" + "./prow/cmd/clonerefs" + "./prow/cmd/config-bootstrapper" + "./prow/cmd/crier" + "./prow/cmd/deck" + "./prow/cmd/entrypoint" + "./prow/cmd/gcsupload" + "./prow/cmd/gerrit" + "./prow/cmd/hook" + "./prow/cmd/horologium" + "./prow/cmd/initupload" + "./prow/cmd/jenkins-operator" + "./prow/cmd/mkbuild-cluster" + "./prow/cmd/mkpj" + "./prow/cmd/mkpod" + "./prow/cmd/peribolos" + "./prow/cmd/phaino" + "./prow/cmd/phony" + "./prow/cmd/pipeline" + "./prow/cmd/plank" + "./prow/cmd/sidecar" + "./prow/cmd/sinker" + "./prow/cmd/status-reconciler" + "./prow/cmd/sub" + "./prow/cmd/tackle" + "./prow/cmd/tide" + "./prow/cmd/tot" + ]; + + meta = with lib; { + description = "Prow is a Kubernetes based CI/CD system"; + longDescription = '' + Prow is a Kubernetes based CI/CD system. Jobs can be triggered by various + types of events and report their status to many different services. In + addition to job execution, Prow provides GitHub automation in the form of + policy enforcement, chat-ops via /foo style commands, and automatic PR + merging. + ''; + homepage = "https://github.com/kubernetes/test-infra/tree/master/prow"; + license = licenses.asl20; + maintainers = with maintainers; [ kalbasit ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix index f3361f30b21..c4075075299 100644 --- a/pkgs/applications/networking/cluster/tilt/default.nix +++ b/pkgs/applications/networking/cluster/tilt/default.nix @@ -5,20 +5,20 @@ buildGoPackage rec { /* Do not use "dev" as a version. If you do, Tilt will consider itself running in development environment and try to serve assets from the source tree, which is not there once build completes. */ - version = "0.9.4"; + version = "0.9.7"; src = fetchFromGitHub { owner = "windmilleng"; repo = pname; rev = "v${version}"; - sha256 = "1n1hys9mwqr4jiwl2z5bi2lgbw4rp800hsavih87xzrda1gzvmad"; + sha256 = "0b7jk7iwjzdsb2wp9qx4gs9g3gi2vcqw5ilkax3gfz7wsplm0n65"; }; goPackagePath = "github.com/windmilleng/tilt"; subPackages = [ "cmd/tilt" ]; - buildFlagsArray = ("-ldflags=-X main.version=${version} -X main.date=2019-07-23"); + buildFlagsArray = ("-ldflags=-X main.version=${version} -X main.date=2019-07-30"); meta = with stdenv.lib; { description = "Local development tool to manage your developer instance when your team deploys to Kubernetes in production"; diff --git a/pkgs/applications/networking/dsvpn/default.nix b/pkgs/applications/networking/dsvpn/default.nix index 68198ae14e2..4958d290529 100644 --- a/pkgs/applications/networking/dsvpn/default.nix +++ b/pkgs/applications/networking/dsvpn/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "dsvpn"; - version = "0.1.0"; + version = "0.1.3"; src = fetchFromGitHub { owner = "jedisct1"; repo = pname; rev = version; - sha256 = "1g747197zpg83ba9l9vxg8m3jv13wcprhnyr8asdxq745kzmynsr"; + sha256 = "1jl9b23s2glims09mb1sq01kaf10bfjsd3qsgk68mp5kvy9f3gj2"; }; installPhase = '' diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index ef4009b0e96..94d5be030da 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -2,7 +2,7 @@ let stableVersion = "2.1.21"; - previewVersion = "2.2.0b4"; + previewVersion = "2.2.0rc3"; addVersion = args: let version = if args.stable then stableVersion else previewVersion; branch = if args.stable then "stable" else "preview"; @@ -18,7 +18,7 @@ in { }; guiPreview = mkGui { stable = false; - sha256Hash = "03jlg4ncs69gv1dn1zsdm0ipvlg6r0lwf8myxric6vv4ks7qqd3w"; + sha256Hash = "0lj2av2kbh1drr8jzd71j85xaiwp53q1g348lk2qqzr35yh16n99"; }; serverStable = mkServer { @@ -27,6 +27,6 @@ in { }; serverPreview = mkServer { stable = false; - sha256Hash = "0mzn62649hmmqq8z2vphqvi0w38jwq8ps4zzbl1dqygbf4gadnqa"; + sha256Hash = "0a4gx0qhy50v7nivqn8c2kz07crgzg2105hzmwag8xw6bpqmgm1d"; }; } diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix new file mode 100644 index 00000000000..ecd76977eb2 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix @@ -0,0 +1,30 @@ +{ fetchgit, stdenv, bitlbee, autoreconfHook, pkgconfig, glib }: + +with stdenv.lib; +stdenv.mkDerivation rec { + pname = "bitlbee-mastodon"; + version = "1.4.2"; + + src = fetchgit { + url = "https://alexschroeder.ch/cgit/bitlbee-mastodon"; + rev = "v${version}"; + sha256 = "04rakgr1pfsg1vhfwlfbggbzw249j7dmk88xrsnf3n84c5ccdyas"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ bitlbee glib ]; + + preConfigure = '' + export BITLBEE_PLUGINDIR=$out/lib/bitlbee + export BITLBEE_DATADIR=$out/share/bitlbee + ./autogen.sh + ''; + + meta = { + description = "Bitlbee plugin for Mastodon"; + homepage = "https://alexschroeder.ch/cgit/bitlbee-mastodon/about"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ jpotier ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix index fb38255ea38..d76cebd11b0 100644 --- a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix +++ b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix @@ -36,14 +36,15 @@ stdenv.mkDerivation rec { --replace-needed libudev.so.0 libudev.so.1 \ opt/bluejeans/bluejeans-bin ln -s $out/opt/bluejeans/bluejeans $out/bin/bluejeans - substituteInPlace $out/bin/bluejeans \ - --replace '#!/bin/bash' '#!${bash}/bin/bash' chmod +x $out/bin/bluejeans + patchShebangs $out ''; - meta = { + meta = with stdenv.lib; { description = "Video, audio, and web conferencing that works together with the collaboration tools you use every day."; - license = stdenv.lib.licenses.unfree; + homepage = "https://www.bluejeans.com"; + license = licenses.unfree; + maintainers = with maintainers; [ veprbl ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index c9dfc79d267..189092a6d5e 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -27,10 +27,10 @@ in { pname = "discord-canary"; binaryName = "DiscordCanary"; desktopName = "Discord Canary"; - version = "0.0.85"; + version = "0.0.93"; src = fetchurl { - url = "https://dl-canary.discordapp.net/apps/linux/0.0.85/discord-canary-0.0.85.tar.gz"; - sha256 = "0kr2mxpghqbj856l09fgw3cmlbdv9h2cd5gxwaymnnywif7czp4j"; + url = "https://dl-canary.discordapp.net/apps/linux/0.0.93/discord-canary-0.0.93.tar.gz"; + sha256 = "1jzm5fm7a1p68ims7bv5am0bpbvrhbynzblpj9qrzzrwakdaywbi"; }; }; }.${branch} diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index 9b1939f0051..d337c62ea09 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchFromGitHub -, cmake, cmark, lmdb, qt5, qtmacextras, mtxclient -, boost, spdlog, olm, pkgconfig, nlohmann_json +, cmake, cmark, lmdb, mkDerivation, qtbase, qtmacextras +, qtmultimedia, qttools, mtxclient, boost, spdlog, olm, pkgconfig +, nlohmann_json }: # These hashes and revisions are based on those from here: @@ -20,7 +21,7 @@ let sha256 = "1whsc5cybf9rmgyaj6qjji03fv5jbgcgygp956s3835b9f9cjg1n"; }; in -stdenv.mkDerivation rec { +mkDerivation rec { name = "nheko-${version}"; version = "0.6.4"; @@ -63,7 +64,7 @@ stdenv.mkDerivation rec { buildInputs = [ mtxclient olm boost lmdb spdlog cmark - qt5.qtbase qt5.qtmultimedia qt5.qttools + qtbase qtmultimedia qttools ] ++ lib.optional stdenv.isDarwin qtmacextras; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix index fbbf6204971..79a197d1a7a 100644 --- a/pkgs/applications/networking/instant-messengers/profanity/default.nix +++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix @@ -8,6 +8,7 @@ , traySupport ? true, gnome2 ? null , pgpSupport ? true, gpgme ? null , pythonPluginSupport ? true, python ? null +, omemoSupport ? true, libsignal-protocol-c ? null, libgcrypt ? null }: assert autoAwaySupport -> libXScrnSaver != null && libX11 != null; @@ -15,18 +16,19 @@ assert notifySupport -> libnotify != null && gdk-pixbuf != null; assert traySupport -> gnome2 != null; assert pgpSupport -> gpgme != null; assert pythonPluginSupport -> python != null; +assert omemoSupport -> libsignal-protocol-c != null && libgcrypt != null; with stdenv.lib; stdenv.mkDerivation rec { name = "profanity-${version}"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { - owner = "boothj5"; + owner = "profanity-im"; repo = "profanity"; rev = "${version}"; - sha256 = "0f5kfzy22wzyj7rnd2nbj93q96ga87b53wlg8lfg83qdphx1ymz9"; + sha256 = "15adg7ndjkzy04lizjmnvv0pf0snhzp6a8x74mndcm0zma0dia0z"; }; patches = [ ./patches/packages-osx.patch ./patches/undefined-macros.patch ]; @@ -44,14 +46,16 @@ stdenv.mkDerivation rec { ++ optionals notifySupport [ libnotify gdk-pixbuf ] ++ optionals traySupport [ gnome2.gtk ] ++ optionals pgpSupport [ gpgme ] - ++ optionals pythonPluginSupport [ python ]; + ++ optionals pythonPluginSupport [ python ] + ++ optionals omemoSupport [ libsignal-protocol-c libgcrypt ]; # Enable feature flags, so that build fail if libs are missing configureFlags = [ "--enable-c-plugins" "--enable-otr" ] ++ optionals notifySupport [ "--enable-notifications" ] ++ optionals traySupport [ "--enable-icons" ] ++ optionals pgpSupport [ "--enable-pgp" ] - ++ optionals pythonPluginSupport [ "--enable-python-plugins" ]; + ++ optionals pythonPluginSupport [ "--enable-python-plugins" ] + ++ optionals omemoSupport [ "--enable-omemo" ]; preAutoreconf = '' mkdir m4 diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index fa72d234ce9..0b4c3aade87 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -57,11 +57,11 @@ let in stdenv.mkDerivation rec { name = "signal-desktop-${version}"; - version = "1.25.3"; + version = "1.26.2"; src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "0f7pip4d97xixwf667xpi50r0r65givvmry862zhp2cq24bs0693"; + sha256 = "08qx7k82x6ybqi3lln6ixzmdz4sr8yz8vfx0y408b85wjfc7ncjk"; }; phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix b/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix index 8fb92766efa..c24e2c4301e 100644 --- a/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix +++ b/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { rev = "e2a6a9cd9da70175881ab991220c86aa87179509"; - version = "2019-07-25"; + version = "2019-07-26"; name = "slack-theme-black-${version}"; src = fetchgit { inherit rev; diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix index 21a98676290..15cec96afc7 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix @@ -4,16 +4,13 @@ let arch = if stdenv.is64bit then "amd64" else "x86"; in stdenv.mkDerivation rec { pname = "teamspeak-server"; - version = "3.8.0"; + version = "3.9.1"; src = fetchurl { - urls = [ - "http://dl.4players.de/ts/releases/${version}/teamspeak3-server_linux_${arch}-${version}.tar.bz2" - "http://teamspeak.gameserver.gamed.de/ts3/releases/${version}/teamspeak3-server_linux_${arch}-${version}.tar.bz2" - ]; + url = "https://files.teamspeak-services.com/releases/server/${version}/teamspeak3-server_linux_${arch}-${version}.tar.bz2"; sha256 = if stdenv.is64bit - then "1bzmqqqpwn6q2pvkrkkxq0ggs8crxbkwaxlggcdxjlyg95cyq8k1" - else "0p5rqwdsvbria5dzjjm5mj8vfy0zpfs669wpbwxd4g3n4vh03kyw"; + then "0vzi0prnqhjxrwlghwgii0rsmml6aa3qk3yv227g9wz5m3b9f10a" + else "1nn0fh4s5rmnn27djbsk21jaah1kxyvap9qaf5p4r7cydwr1bzm6"; }; buildInputs = [ stdenv.cc.cc ]; @@ -28,7 +25,7 @@ in stdenv.mkDerivation rec { # Make symlinks to the binaries from bin. mkdir -p $out/bin/ ln -s $out/lib/teamspeak/ts3server $out/bin/ts3server - ln -s $out/lib/teamspeak/tsdnsserver $out/bin/tsdnsserver + ln -s $out/lib/teamspeak/tsdns/tsdnsserver $out/bin/tsdnsserver ''; meta = { diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 13c03b41909..4f9bbe021d1 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, fetchsvn +{ mkDerivation, lib, fetchFromGitHub, fetchsvn, fetchpatch , pkgconfig, pythonPackages, cmake, wrapGAppsHook, wrapQtAppsHook, gcc8 , qtbase, qtimageformats, gtk3, libappindicator-gtk3, libnotify, xdg_utils , dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 @@ -8,14 +8,14 @@ with lib; mkDerivation rec { name = "telegram-desktop-${version}"; - version = "1.7.14"; + version = "1.8.0"; # Telegram-Desktop with submodules src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${version}"; - sha256 = "1bw804a9kffmn23wv0570wihbvfm7jy9cqmxlv196f4j7bw7zkv3"; + sha256 = "09r62dra6gab8hiyzyysslgqkzswf8vwfkcixbcb0jk5la0m07yy"; fetchSubmodules = true; }; @@ -23,8 +23,12 @@ mkDerivation rec { archPatches = fetchsvn { url = "svn://svn.archlinux.org/community/telegram-desktop/trunk"; # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk - rev = "487779"; - sha256 = "0f09hvimb66xqksb2v0zc4ryshx7y7z0rafzjd99x37rpib9f3kq"; + rev = "498563"; + sha256 = "0g2y6impygqhfiqnyxc1ivxwl8j82q9qcnkqcjn6mwj3cisyxwnl"; + }; + privateHeadersPatch = fetchpatch { + url = "https://github.com/telegramdesktop/tdesktop/commit/b9d3ba621eb8af638af46c6b3cfd7a8330bf0dd5.patch"; + sha256 = "1s5xvcp9dk0jfywssk8xfcsh7bk5xxif8xqnba0413lfx5rgvs5v"; }; patches = [ @@ -32,7 +36,6 @@ mkDerivation rec { "${archPatches}/no-gtk2.patch" # "${archPatches}/Use-system-wide-font.patch" "${archPatches}/tdesktop_lottie_animation_qtdebug.patch" - "${archPatches}/issue6219.patch" ]; postPatch = '' @@ -79,8 +82,11 @@ mkDerivation rec { CPPFLAGS = NIX_CFLAGS_COMPILE; preConfigure = '' + # Patches to revert: patch -R -Np1 -i "${archPatches}/demibold.patch" + patch -R -Np1 -i "${privateHeadersPatch}" + # Patches to apply: pushd "Telegram/ThirdParty/libtgvoip" patch -Np1 -i "${archPatches}/libtgvoip.patch" popd diff --git a/pkgs/applications/networking/irc/weechat/wrapper.nix b/pkgs/applications/networking/irc/weechat/wrapper.nix index 5fe20829c03..e6fa95488e1 100644 --- a/pkgs/applications/networking/irc/weechat/wrapper.nix +++ b/pkgs/applications/networking/irc/weechat/wrapper.nix @@ -15,8 +15,10 @@ let availablePlugins = let simplePlugin = name: {pluginFile = "${weechat.${name}}/lib/weechat/plugins/${name}.so";}; in rec { - python = { - pluginFile = "${weechat.python}/lib/weechat/plugins/python.so"; + python = (simplePlugin "python") // { + extraEnv = '' + export PATH="${pythonPackages.python}/bin:$PATH" + ''; withPackages = pkgsFun: (python // { extraEnv = '' export PYTHONHOME="${pythonPackages.python.withPackages pkgsFun}" diff --git a/pkgs/applications/networking/maestral/default.nix b/pkgs/applications/networking/maestral/default.nix new file mode 100644 index 00000000000..bfacac2eaf4 --- /dev/null +++ b/pkgs/applications/networking/maestral/default.nix @@ -0,0 +1,38 @@ +{ lib, python3Packages, fetchFromGitHub +, withGui ? false, wrapQtAppsHook ? null }: + +python3Packages.buildPythonApplication rec { + pname = "maestral${lib.optionalString withGui "-gui"}"; + version = "0.2.6"; + + src = fetchFromGitHub { + owner = "SamSchott"; + repo = "maestral-dropbox"; + rev = "v${version}"; + sha256 = "1nfjm58f6hnqbx9xnz2h929s2175ka1yf5jjlk4i60v0wppnrrdf"; + }; + + disabled = python3Packages.pythonOlder "3.6"; + + propagatedBuildInputs = (with python3Packages; [ + blinker click dropbox keyring keyrings-alt requests u-msgpack-python watchdog + ] ++ lib.optional withGui pyqt5); + + nativeBuildInputs = lib.optional withGui wrapQtAppsHook; + + postInstall = lib.optionalString withGui '' + makeQtWrapper $out/bin/maestral $out/bin/maestral-gui \ + --add-flags gui + ''; + + # no tests + doCheck = false; + + meta = with lib; { + description = "Open-source Dropbox client for macOS and Linux"; + license = licenses.mit; + maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.unix; + inherit (src.meta) homepage; + }; +} diff --git a/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix b/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix new file mode 100644 index 00000000000..7019c309feb --- /dev/null +++ b/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix @@ -0,0 +1,28 @@ +{ stdenv, python3, notmuch }: + +python3.pkgs.buildPythonApplication rec { + pname = "mlarchive2maildir"; + version = "0.0.6"; + + src = python3.pkgs.fetchPypi { + inherit pname version; + sha256 = "025mv890zsk25cral9cas3qgqdsszh5025khz473zs36innjd0mw"; + }; + + nativeBuildInputs = with python3.pkgs; [ setuptools_scm ]; + + propagatedBuildInputs = with python3.pkgs; [ + beautifulsoup4 + click + click-log + requests + six + ]; + + meta = with stdenv.lib; { + homepage = https://github.com/flokli/mlarchive2maildir; + description = "Imports mail from (pipermail) archives into a maildir"; + license = licenses.mit; + maintainers = with maintainers; [ andir flokli ]; + }; +} diff --git a/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix b/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix deleted file mode 100644 index 5bb24c9ded7..00000000000 --- a/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix +++ /dev/null @@ -1,133 +0,0 @@ -{ dpkg, fetchurl, lib, pkgs, stdenv -, alsaLib -, atk -, cairo -, coreutils -, cups -, dbus -, desktop-file-utils -, expat -, fontconfig -, freetype -, gcc-unwrapped -, gdk-pixbuf -, glib -, gnome2 -, libgnome-keyring -, libnotify -, makeWrapper -, nodejs -, nspr -, nss -, pango -, python2 -, udev -, wget -, xorg -}: - -stdenv.mkDerivation rec { - name = "${pkgname}-${version}"; - pkgname = "nylas-mail-bin"; - version = "2.0.32"; - subVersion = "fec7941"; - - src = - if stdenv.hostPlatform.system == "x86_64-linux" then - fetchurl { - url = "https://edgehill.s3.amazonaws.com/${version}-${subVersion}/linux-deb/x64/NylasMail.deb"; - sha256 = "40060aa1dc3b5187b8ed4a07b9de3427e3c5a291df98c2c82395647fa2aa4ada"; - } - else - throw "NylasMail is not supported on ${stdenv.hostPlatform.system}"; - - propagatedBuildInputs = [ - alsaLib - atk - cairo - coreutils - cups - dbus - desktop-file-utils - expat - fontconfig - freetype - gcc-unwrapped - gdk-pixbuf - glib - gnome2.GConf - gnome2.gtk - libgnome-keyring - libnotify - nodejs - nspr - nss - pango - python2 - udev - wget - xorg.libX11 - xorg.libXScrnSaver - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXtst - xorg.libxkbfile - ]; - - - nativeBuildInputs = [ makeWrapper ]; - - buildCommand = '' - mkdir -p $out - - ${dpkg}/bin/dpkg-deb -x $src unpacked - mv unpacked/usr/* $out/ - - # Fix path in desktop file - substituteInPlace $out/share/applications/nylas-mail.desktop \ - --replace /usr/bin/nylas-mail $out/bin/nylas-mail - - # Patch librariess - noderp=$(patchelf --print-rpath $out/share/nylas-mail/libnode.so) - patchelf --set-rpath $noderp:$out/lib:${stdenv.cc.cc.lib}/lib:${xorg.libxkbfile.out}/lib:${lib.makeLibraryPath propagatedBuildInputs } \ - $out/share/nylas-mail/libnode.so - - ffrp=$(patchelf --print-rpath $out/share/nylas-mail/libffmpeg.so) - patchelf --set-rpath $ffrp:$out/lib:${stdenv.cc.cc.lib}/lib:${lib.makeLibraryPath propagatedBuildInputs } \ - $out/share/nylas-mail/libffmpeg.so - - # Patch binaries - binrp=$(patchelf --print-rpath $out/share/nylas-mail/nylas) - patchelf --interpreter $(cat "$NIX_CC"/nix-support/dynamic-linker) \ - --set-rpath $binrp:$out/lib:${stdenv.cc.cc.lib}/lib:${lib.makeLibraryPath propagatedBuildInputs } \ - $out/share/nylas-mail/nylas - - wrapProgram $out/share/nylas-mail/nylas --set LD_LIBRARY_PATH "${xorg.libxkbfile}/lib:${pkgs.gnome3.libgnome-keyring}/lib"; - - # Fix path to bash so apm can install plugins. - substituteInPlace $out/share/nylas-mail/resources/apm/bin/apm \ - --replace /bin/bash ${stdenv.shell} - - wrapProgram $out/share/nylas-mail/resources/apm/bin/apm \ - --set PATH "${coreutils}/bin" - patchelf --interpreter $(cat "$NIX_CC"/nix-support/dynamic-linker) \ - --set-rpath ${gcc-unwrapped.lib}/lib $out/share/nylas-mail/resources/apm/bin/node - ''; - - meta = with stdenv.lib; { - description = "Open-source mail client built on the modern web with Electron, React, and Flux"; - longDescription = '' - Nylas Mail is an open-source mail client built on the modern web with Electron, React, and Flux. It is designed to be extensible, so it's easy to create new experiences and workflows around email. Nylas Mail can be enabled with it's requirements by enabling 'services.nylas-mail.enable=true'. Alternatively, make sure to have services.gnome3.gnome-keyring.enable = true; in your configuration.nix before running nylas-mail. If you happen to miss this step, you should remove ~/.nylas-mail and "~/.config/Nylas Mail" for a blank setup". - ''; - license = licenses.gpl3; - maintainers = with maintainers; [ johnramsden ]; - homepage = https://nylas.com; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix index 2cbf83c16ae..9ee16298ef1 100644 --- a/pkgs/applications/networking/mullvad-vpn/default.nix +++ b/pkgs/applications/networking/mullvad-vpn/default.nix @@ -40,11 +40,11 @@ in stdenv.mkDerivation rec { pname = "mullvad-vpn"; - version = "2019.5"; + version = "2019.6"; src = fetchurl { url = "https://www.mullvad.net/media/app/MullvadVPN-${version}_amd64.deb"; - sha256 = "542a93521906cd5e97075c9f3e9088c19562b127556a3de151e25bc66b11fe0b"; + sha256 = "0hlkka8mk7qzfhgsl10nz495nswh27gn7l9bd24c6lpkqnapz0vg"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/newsreaders/slrn/default.nix b/pkgs/applications/networking/newsreaders/slrn/default.nix index 9f775f0db65..e8fff0deddf 100644 --- a/pkgs/applications/networking/newsreaders/slrn/default.nix +++ b/pkgs/applications/networking/newsreaders/slrn/default.nix @@ -1,14 +1,13 @@ { stdenv, fetchurl , slang, ncurses, openssl }: -let version = "1.0.2"; in - -stdenv.mkDerivation { - name = "slrn-${version}"; +stdenv.mkDerivation rec { + pname = "slrn"; + version = "1.0.3a"; src = fetchurl { - url = "http://www.jedsoft.org/releases/slrn/slrn-${version}.tar.gz"; - sha256 = "1gn6m2zha2nnnrh9lz3m3nrqk6fgfij1wc53pg25j7sdgvlziv12"; + url = "http://www.jedsoft.org/releases/slrn/slrn-${version}.tar.bz2"; + sha256 = "1b1d9iikr60w0vq86y9a0l4gjl0jxhdznlrdp3r405i097as9a1v"; }; preConfigure = '' diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index 9696c55bd86..7ffd79edba4 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig +{ mkDerivation, lib, fetchFromGitHub, pkgconfig , boost, libtorrentRasterbar, qtbase, qttools, qtsvg , debugSupport ? false # Debugging , guiSupport ? true, dbus ? null # GUI (disable to run headless) @@ -6,17 +6,17 @@ }: assert guiSupport -> (dbus != null); -with stdenv.lib; +with lib; -stdenv.mkDerivation rec { +mkDerivation rec { name = "qbittorrent-${version}"; - version = "4.1.6"; + version = "4.1.7"; src = fetchFromGitHub { owner = "qbittorrent"; repo = "qbittorrent"; rev = "release-${version}"; - sha256 = "1y9kv84sy5fg64wbl4xpm8qh0hjba7ibk045cazp0m736rjmxk8c"; + sha256 = "1z4k64h3ik1a7ir4v9g3ar1wq8zfh4r2pq43hr2wvlamm2111gdv"; }; # NOTE: 2018-05-31: CMake is working but it is not officially supported diff --git a/pkgs/applications/networking/p2p/tixati/default.nix b/pkgs/applications/networking/p2p/tixati/default.nix index ea8b5c3a11f..87b331adf2d 100644 --- a/pkgs/applications/networking/p2p/tixati/default.nix +++ b/pkgs/applications/networking/p2p/tixati/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "tixati-${version}"; - version = "2.61"; + version = "2.62"; src = fetchurl { url = "https://download2.tixati.com/download/tixati-${version}-1.x86_64.manualinstall.tar.gz"; - sha256 = "05f8lcsac2mr90bhk999qkj8wwd6igdl07389bqrd1ydjasacl2k"; + sha256 = "18lmzllkymdigfl1xf696zqmr2b83p4rzlc8ddrcr0zpzy2z2w4a"; }; installPhase = '' diff --git a/pkgs/applications/networking/syncthing-gtk/default.nix b/pkgs/applications/networking/syncthing-gtk/default.nix index 696ced2d246..328561529ce 100644 --- a/pkgs/applications/networking/syncthing-gtk/default.nix +++ b/pkgs/applications/networking/syncthing-gtk/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchFromGitHub, fetchpatch, libnotify, librsvg, killall , gtk3, libappindicator-gtk3, substituteAll, syncthing, wrapGAppsHook , gnome3, buildPythonApplication, dateutil, pyinotify, pygobject3 -, bcrypt, gobject-introspection, gsettings-desktop-schemas }: +, bcrypt, gobject-introspection, gsettings-desktop-schemas +, pango, gdk-pixbuf, atk }: buildPythonApplication rec { version = "0.9.4"; @@ -18,6 +19,7 @@ buildPythonApplication rec { wrapGAppsHook # For setup hook populating GI_TYPELIB_PATH gobject-introspection + pango gdk-pixbuf atk libnotify ]; buildInputs = [ diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index cc916e069a0..5b847163a2a 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -1,21 +1,21 @@ -{ buildGoPackage, stdenv, lib, procps, fetchFromGitHub }: +{ buildGoModule, stdenv, lib, procps, fetchFromGitHub }: let common = { stname, target, postInstall ? "" }: - buildGoPackage rec { - version = "1.1.4"; + buildGoModule rec { + version = "1.2.1"; name = "${stname}-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "0a19l1kp4cwyzcd53v9yzv3ms69gn78gajkyfawafr7ls0i8x82f"; + sha256 = "0q1x6kd5kaij8mvs6yll2vqfzrbb31y5hpg6g5kjc8gngwv4rl6v"; }; goPackagePath = "github.com/syncthing/syncthing"; - goDeps = ./deps.nix; + modSha256 = "1daixrpdj97ck02853hwp8l158sja5a7a37h0gdbwb1lgf5hsn05"; patches = [ ./add-stcli-target.patch @@ -25,18 +25,14 @@ let buildPhase = '' runHook preBuild - pushd go/src/${goPackagePath} go run build.go -no-upgrade -version v${version} build ${target} - popd runHook postBuild ''; installPhase = '' - pushd go/src/${goPackagePath} runHook preInstall - install -Dm755 ${target} $bin/bin/${target} + install -Dm755 ${target} $out/bin/${target} runHook postInstall - popd ''; inherit postInstall; @@ -65,19 +61,19 @@ in { done '' + lib.optionalString (stdenv.isLinux) '' - mkdir -p $bin/lib/systemd/{system,user} + mkdir -p $out/lib/systemd/{system,user} substitute etc/linux-systemd/system/syncthing-resume.service \ - $bin/lib/systemd/system/syncthing-resume.service \ + $out/lib/systemd/system/syncthing-resume.service \ --replace /usr/bin/pkill ${procps}/bin/pkill substitute etc/linux-systemd/system/syncthing@.service \ - $bin/lib/systemd/system/syncthing@.service \ - --replace /usr/bin/syncthing $bin/bin/syncthing + $out/lib/systemd/system/syncthing@.service \ + --replace /usr/bin/syncthing $out/bin/syncthing substitute etc/linux-systemd/user/syncthing.service \ - $bin/lib/systemd/user/syncthing.service \ - --replace /usr/bin/syncthing $bin/bin/syncthing + $out/lib/systemd/user/syncthing.service \ + --replace /usr/bin/syncthing $out/bin/syncthing ''; }; @@ -101,7 +97,7 @@ in { substitute cmd/strelaysrv/etc/linux-systemd/strelaysrv.service \ $out/lib/systemd/system/strelaysrv.service \ - --replace /usr/bin/strelaysrv $bin/bin/strelaysrv + --replace /usr/bin/strelaysrv $out/bin/strelaysrv ''; }; } diff --git a/pkgs/applications/networking/syncthing/deps.nix b/pkgs/applications/networking/syncthing/deps.nix deleted file mode 100644 index 4a58a490cc5..00000000000 --- a/pkgs/applications/networking/syncthing/deps.nix +++ /dev/null @@ -1,480 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "github.com/AudriusButkevicius/go-nat-pmp"; - fetch = { - type = "git"; - url = "https://github.com/AudriusButkevicius/go-nat-pmp"; - rev = "452c97607362"; - sha256 = "1accmpl1llk16a19nlyy991fqrgfay6l53gb64hgmdfmqljdvbk7"; - }; - } - { - goPackagePath = "github.com/AudriusButkevicius/recli"; - fetch = { - type = "git"; - url = "https://github.com/AudriusButkevicius/recli"; - rev = "v0.0.5"; - sha256 = "1m1xna1kb78pkmr1lfmvvnpk9j7c4x71j3a7c6vj7zpzc4srpsmf"; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "3a771d992973"; - sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3"; - }; - } - { - goPackagePath = "github.com/bkaradzic/go-lz4"; - fetch = { - type = "git"; - url = "https://github.com/bkaradzic/go-lz4"; - rev = "7224d8d8f27e"; - sha256 = "10lmya17vdqg2pvqni0p73iahni48s1v11ya9a0hcz4jh5vw4dkb"; - }; - } - { - goPackagePath = "github.com/calmh/du"; - fetch = { - type = "git"; - url = "https://github.com/calmh/du"; - rev = "v1.0.1"; - sha256 = "0qb3a6y3p9nkyn3s66k6zcm16y8n8578qh23ddj14cxf2scrr2n2"; - }; - } - { - goPackagePath = "github.com/calmh/xdr"; - fetch = { - type = "git"; - url = "https://github.com/calmh/xdr"; - rev = "v1.1.0"; - sha256 = "072wqdncz3nd4a3zkhvzzx1y3in1lm29wfvl0d8wrnqs5pyqh0mh"; - }; - } - { - goPackagePath = "github.com/chmduquesne/rollinghash"; - fetch = { - type = "git"; - url = "https://github.com/chmduquesne/rollinghash"; - rev = "a60f8e7142b5"; - sha256 = "0fpaqq4zb0wikgbhn7vwqqj1h865f5xy195vkhivsp922p7qwsjr"; - }; - } - { - goPackagePath = "github.com/d4l3k/messagediff"; - fetch = { - type = "git"; - url = "https://github.com/d4l3k/messagediff"; - rev = "v1.2.1"; - sha256 = "104hl8x57ciaz7mzafg1vp9qggxcyfm8hsv9bmlihbz9ml3nyr8v"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "v1.1.1"; - sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; - }; - } - { - goPackagePath = "github.com/flynn-archive/go-shlex"; - fetch = { - type = "git"; - url = "https://github.com/flynn-archive/go-shlex"; - rev = "3f9db97f8568"; - sha256 = "1j743lysygkpa2s2gii2xr32j7bxgc15zv4113b0q9jhn676ysia"; - }; - } - { - goPackagePath = "github.com/gobwas/glob"; - fetch = { - type = "git"; - url = "https://github.com/gobwas/glob"; - rev = "51eb1ee00b6d"; - sha256 = "090wzpwsjana1qas8ipwh1pj959gvc4b7vwybzi01f3bmd79jwlp"; - }; - } - { - goPackagePath = "github.com/gogo/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/gogo/protobuf"; - rev = "v1.2.0"; - sha256 = "1c3y5m08mvrgvlw0kb9pldh3kkqcj99pa8gqmk1g3hp8ih3b2dv0"; - }; - } - { - goPackagePath = "github.com/golang/groupcache"; - fetch = { - type = "git"; - url = "https://github.com/golang/groupcache"; - rev = "84a468cf14b4"; - sha256 = "1ky1r9qh54yi9zp2769qrjngzndgd8fn7mja2qfac285n06chmcn"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "v1.2.0"; - sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab"; - }; - } - { - goPackagePath = "github.com/golang/snappy"; - fetch = { - type = "git"; - url = "https://github.com/golang/snappy"; - rev = "553a64147049"; - sha256 = "0kssxnih1l722hx9219c7javganjqkqhvl3i0hp0hif6xm6chvqk"; - }; - } - { - goPackagePath = "github.com/jackpal/gateway"; - fetch = { - type = "git"; - url = "https://github.com/jackpal/gateway"; - rev = "5795ac81146e"; - sha256 = "0fkwkwmhfadwk3cha8616bhqxfkr9gjjnynhhxyldlphixgs3f25"; - }; - } - { - goPackagePath = "github.com/kballard/go-shellquote"; - fetch = { - type = "git"; - url = "https://github.com/kballard/go-shellquote"; - rev = "cd60e84ee657"; - sha256 = "1xjpin4jq1zl84dcn96xhjmn9bsfyszf6g9aqyj2dc0xfi6c88y0"; - }; - } - { - goPackagePath = "github.com/kr/pretty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pretty"; - rev = "v0.1.0"; - sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp"; - }; - } - { - goPackagePath = "github.com/kr/pty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pty"; - rev = "v1.1.1"; - sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6"; - }; - } - { - goPackagePath = "github.com/kr/text"; - fetch = { - type = "git"; - url = "https://github.com/kr/text"; - rev = "v0.1.0"; - sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; - }; - } - { - goPackagePath = "github.com/lib/pq"; - fetch = { - type = "git"; - url = "https://github.com/lib/pq"; - rev = "v1.0.0"; - sha256 = "1zqnnyczaf00xi6xh53vq758v5bdlf0iz7kf22l02cal4i6px47i"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "v0.0.4"; - sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "v1.0.1"; - sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; - }; - } - { - goPackagePath = "github.com/minio/sha256-simd"; - fetch = { - type = "git"; - url = "https://github.com/minio/sha256-simd"; - rev = "cc1980cb0338"; - sha256 = "04fp98nal0wsb26zwhw82spn5camxslc68g3xp8g4af9w6k9g31j"; - }; - } - { - goPackagePath = "github.com/onsi/ginkgo"; - fetch = { - type = "git"; - url = "https://github.com/onsi/ginkgo"; - rev = "6c46eb8334b3"; - sha256 = "0lxmpg3zhn7r2q8c29wcw0sqn5c48ihhb7qfh9m676c9j455rpm8"; - }; - } - { - goPackagePath = "github.com/onsi/gomega"; - fetch = { - type = "git"; - url = "https://github.com/onsi/gomega"; - rev = "ba3724c94e4d"; - sha256 = "0fqs7kyqzz2lykbr2xbvd8imvx748xv4lh4d6fdy3wkwxs2f9fhp"; - }; - } - { - goPackagePath = "github.com/oschwald/geoip2-golang"; - fetch = { - type = "git"; - url = "https://github.com/oschwald/geoip2-golang"; - rev = "v1.1.0"; - sha256 = "10pvjmbm1wc8xxwqlcfhdj2mciiyfddghmp6jyn7brd4mg65ppy2"; - }; - } - { - goPackagePath = "github.com/oschwald/maxminddb-golang"; - fetch = { - type = "git"; - url = "https://github.com/oschwald/maxminddb-golang"; - rev = "26fe5ace1c70"; - sha256 = "0szb96zq1jbd9zpf4qn9zng4582ww9mg8zgrqxbkkpf3862r6n49"; - }; - } - { - goPackagePath = "github.com/petermattis/goid"; - fetch = { - type = "git"; - url = "https://github.com/petermattis/goid"; - rev = "3db12ebb2a59"; - sha256 = "0z18a3mr72c52g7g94n08gxw0ksnaafbfwdl5p5jav2sffirb0kd"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "v0.8.1"; - sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "v1.0.0"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "v0.9.2"; - sha256 = "02b4yg6rfag0m3j0i39sillcm5xczwv8h133vn12yr8qw04cnigs"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "5c3871d89910"; - sha256 = "04psf81l9fjcwascsys428v03fx4fi894h7fhrj2vvcz723q57k0"; - }; - } - { - goPackagePath = "github.com/prometheus/common"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/common"; - rev = "4724e9255275"; - sha256 = "0pcx8hlnrxx5nnmpk786cn99rsgqk1jrd3c9f6fsx8qd8y5iwjy6"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "1dc9a6cbc91a"; - sha256 = "1zlv1x30xp7z5c3vn5vp870v4bjim0zcidzc3mr2l3xhazc0svab"; - }; - } - { - goPackagePath = "github.com/rcrowley/go-metrics"; - fetch = { - type = "git"; - url = "https://github.com/rcrowley/go-metrics"; - rev = "e181e095bae9"; - sha256 = "1pwkyw801hy7n94skzk6h177zqcil6ayrmb5gs3jdpsfayh8ia5w"; - }; - } - { - goPackagePath = "github.com/sasha-s/go-deadlock"; - fetch = { - type = "git"; - url = "https://github.com/sasha-s/go-deadlock"; - rev = "v0.2.0"; - sha256 = "13p7b7pakd9k1c2k0fs1hfim3c8mivz679977ai6zb01s4aw7gyg"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "v1.2.2"; - sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; - }; - } - { - goPackagePath = "github.com/syncthing/notify"; - fetch = { - type = "git"; - url = "https://github.com/syncthing/notify"; - rev = "4e389ea6c0d8"; - sha256 = "19gvl14s1l9m82f8c2xsjcr8lmbqrvw1mxkayvfcpimvxfz0j61i"; - }; - } - { - goPackagePath = "github.com/syndtr/goleveldb"; - fetch = { - type = "git"; - url = "https://github.com/syndtr/goleveldb"; - rev = "34011bf325bc"; - sha256 = "097ja0vyj6p27zrxha9nhk09fj977xsvhmd3bk2hbyvnbw4znnhd"; - }; - } - { - goPackagePath = "github.com/thejerf/suture"; - fetch = { - type = "git"; - url = "https://github.com/thejerf/suture"; - rev = "v3.0.2"; - sha256 = "03bdrl78jfwk0kw40lj63ga9cxhgccgss8yi9lp5j0m0ml7921gh"; - }; - } - { - goPackagePath = "github.com/urfave/cli"; - fetch = { - type = "git"; - url = "https://github.com/urfave/cli"; - rev = "v1.20.0"; - sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj"; - }; - } - { - goPackagePath = "github.com/vitrun/qart"; - fetch = { - type = "git"; - url = "https://github.com/vitrun/qart"; - rev = "bf64b92db6b0"; - sha256 = "1xk7qki703xmay9ghi3kq2bjf1iw9dz8wik55739d6i7sn77vvkc"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "c2843e01d9a2"; - sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "351d144fa1fc"; - sha256 = "1c5x25qjyz83y92bq0lll5kmznyi3m02wd4c54scgf0866gy938k"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "42b317875d0f"; - sha256 = "0mrjhk7al7yyh76x9flvxy4jm5jyqh2fxbxagpaazxn1xdgkaif3"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "d0b11bdaac8a"; - sha256 = "18yfsmw622l7gc5sqriv5qmck6903vvhivpzp8i3xfy3z33dybdl"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "e19ae1496984"; - sha256 = "1cvnnx8nwx5c7gr6ajs7sldhbqh52n7h6fsa3i21l2lhx6xrsh4w"; - }; - } - { - goPackagePath = "golang.org/x/time"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/time"; - rev = "6dc17368e09b"; - sha256 = "1fx4cf5fpdz00g3c7vxzy92hdcg0vh4yqw00qp5s52j72qixynbk"; - }; - } - { - goPackagePath = "gopkg.in/asn1-ber.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/asn1-ber.v1"; - rev = "379148ca0225"; - sha256 = "1y8bvzbxpw0lfnn7pbcdwzqj4l90qj6xf88dvv9pxd9yl5g6cskx"; - }; - } - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "788fd7840127"; - sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; - }; - } - { - goPackagePath = "gopkg.in/ldap.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/ldap.v2"; - rev = "v2.5.1"; - sha256 = "1wf81wy04nhkqs0dg5zkivr4sh37r83bxrfwjz9vr4jq6vmljr3h"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "287cf08546ab"; - sha256 = "15502klds9wwv567vclb9kx95gs8lnyzn4ybsk6l9fc7a67lk831"; - }; - } -] diff --git a/pkgs/applications/office/aesop/default.nix b/pkgs/applications/office/aesop/default.nix index 470eabdf6e4..b71334a6a72 100644 --- a/pkgs/applications/office/aesop/default.nix +++ b/pkgs/applications/office/aesop/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "aesop"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "lainsce"; repo = pname; rev = version; - sha256 = "191azshc2z9pzc61fhmzv5cxnihh5wh3nj803kvi3rnk6nl9mhzh"; + sha256 = "1vadm8295jb7jaah2qykf3h9zvl5c013sanmxqi4snmmq4pa32ax"; }; nativeBuildInputs = [ @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { description = "The simplest PDF viewer around"; homepage = https://github.com/lainsce/aesop; license = licenses.gpl2Plus; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = pantheon.maintainers; platforms = platforms.linux; }; } diff --git a/pkgs/applications/office/flexibee/default.nix b/pkgs/applications/office/flexibee/default.nix new file mode 100644 index 00000000000..284fdf7a124 --- /dev/null +++ b/pkgs/applications/office/flexibee/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, makeWrapper, jre }: + +let + version = "2019.2.5"; + majorVersion = builtins.substring 0 6 version; +in + +stdenv.mkDerivation rec { + pname = "flexibee"; + inherit version; + + src = fetchurl { + url = "http://download.flexibee.eu/download/${majorVersion}/${version}/${pname}-${version}.tar.gz"; + sha256 = "0k94y4x6lj1vcb89a95v9mzl95mkpwp9n4a2gwvq0g90zpbnn493"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + cp -R usr/share/flexibee/ $out/ + install -Dm755 usr/bin/flexibee $out/bin/flexibee + wrapProgram $out/bin/flexibee --set JAVA_HOME "${jre}" + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "Client for an accouting economic system"; + homepage = "https://www.flexibee.eu/"; + license = licenses.unfree; + maintainers = [ maintainers.mmahut ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/office/libreoffice/default-primary-src.nix b/pkgs/applications/office/libreoffice/default-primary-src.nix index fbf6047af60..b3b21174bc3 100644 --- a/pkgs/applications/office/libreoffice/default-primary-src.nix +++ b/pkgs/applications/office/libreoffice/default-primary-src.nix @@ -2,9 +2,9 @@ rec { major = "6"; - minor = "2"; - patch = "4"; - tweak = "2"; + minor = "3"; + patch = "0"; + tweak = "4"; subdir = "${major}.${minor}.${patch}"; @@ -12,6 +12,6 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "1drq59lc6p4s8mil2syz93l97phsbk9dcrd5gikqi2dwlzkli0gz"; + sha256 = "1mxflzrcm04djkj8ifyy4rwgl8bxirrvzrn864w6rgvzn43h30w7"; }; } diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index a8299936662..fe33d72a216 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -48,14 +48,14 @@ let translations = fetchSrc { name = "translations"; - sha256 = "0ahyrkg1sa4a0igvvd98spjlm5k34cddpwpxl7qhir8ldgighk2c"; + sha256 = "0730fw2kr00b2d56jkdzjdz49c4k4mxiz879c7ikw59c5zvrh009"; }; # TODO: dictionaries help = fetchSrc { name = "help"; - sha256 = "0zrfm8kw6m60wz6mn4y5jhlng90ya045nxyh46sib9nl4nd4d98s"; + sha256 = "1w9bqwzz75vvxxy9dgln0v6p6isf8mkqnkg1nzlaykvdgsn5sp4z"; }; }; @@ -144,6 +144,8 @@ in stdenv.mkDerivation rec { sed -e '/CPPUNIT_ASSERT_EQUAL(11148L, pOleObj->GetLogicRect().getWidth());/d ' -i sc/qa/unit/subsequent_filters-test.cxx # tilde expansion in path processing checks the existence of $HOME sed -e 's@OString sSysPath("~/tmp");@& return ; @' -i sal/qa/osl/file/osl_File.cxx + # fails on systems using ZFS, see https://github.com/NixOS/nixpkgs/issues/19071 + sed -e '/CPPUNIT_TEST(getSystemPathFromFileURL_005);/d' -i './sal/qa/osl/file/osl_File.cxx' # rendering-dependent: on my computer the test table actually doesn't fit… # interesting fact: test disabled on macOS by upstream sed -re '/DECLARE_WW8EXPORT_TEST[(]testTableKeep, "tdf91083.odt"[)]/,+5d' -i ./sw/qa/extras/ww8export/ww8export.cxx @@ -306,6 +308,9 @@ in stdenv.mkDerivation rec { # Without these, configure does not finish "--without-junit" + # Schema files for validation are not included in the source tarball + "--without-export-validation" + "--disable-libnumbertext" # system-libnumbertext" # We do tarball prefetching ourselves diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix index bfb74d1bb50..4df8ce1059b 100644 --- a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix +++ b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix @@ -28,11 +28,11 @@ md5name = "976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19-apr-util-1.5.4.tar.gz"; } { - name = "boost_1_66_0.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/boost_1_66_0.tar.bz2"; - sha256 = "5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9"; + name = "boost_1_69_0.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/boost_1_69_0.tar.bz2"; + sha256 = "8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406"; md5 = ""; - md5name = "5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9-boost_1_66_0.tar.bz2"; + md5name = "8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406-boost_1_69_0.tar.bz2"; } { name = "breakpad.zip"; @@ -105,11 +105,11 @@ md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt"; } { - name = "curl-7.64.0.tar.gz"; - url = "http://dev-www.libreoffice.org/src/curl-7.64.0.tar.gz"; - sha256 = "cb90d2eb74d4e358c1ed1489f8e3af96b50ea4374ad71f143fa4595e998d81b5"; + name = "curl-7.65.0.tar.xz"; + url = "http://dev-www.libreoffice.org/src/curl-7.65.0.tar.xz"; + sha256 = "7766d263929404f693905b5e5222aa0f2bdf8c66ab4b8758f0c0820a42b966cd"; md5 = ""; - md5name = "cb90d2eb74d4e358c1ed1489f8e3af96b50ea4374ad71f143fa4595e998d81b5-curl-7.64.0.tar.gz"; + md5name = "7766d263929404f693905b5e5222aa0f2bdf8c66ab4b8758f0c0820a42b966cd-curl-7.65.0.tar.xz"; } { name = "libe-book-0.1.3.tar.xz"; @@ -231,11 +231,11 @@ md5name = "edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz"; } { - name = "source-serif-font-2.007R.tar.gz"; - url = "http://dev-www.libreoffice.org/src/source-serif-font-2.007R.tar.gz"; - sha256 = "10b2bbb357d52bf0f516d3e0ac0a09b5f7901470fbf649b69dad9ccc2d29f7cb"; + name = "source-serif-pro-3.000R.tar.gz"; + url = "http://dev-www.libreoffice.org/src/source-serif-pro-3.000R.tar.gz"; + sha256 = "826a2b784d5cdb4c2bbc7830eb62871528360a61a52689c102a101623f1928e3"; md5 = ""; - md5name = "10b2bbb357d52bf0f516d3e0ac0a09b5f7901470fbf649b69dad9ccc2d29f7cb-source-serif-font-2.007R.tar.gz"; + md5name = "826a2b784d5cdb4c2bbc7830eb62871528360a61a52689c102a101623f1928e3-source-serif-pro-3.000R.tar.gz"; } { name = "EmojiOneColor-SVGinOT-1.3.tar.gz"; @@ -308,11 +308,11 @@ md5name = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac-libfreehand-0.1.2.tar.xz"; } { - name = "freetype-2.8.1.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/freetype-2.8.1.tar.bz2"; - sha256 = "e5435f02e02d2b87bb8e4efdcaa14b1f78c9cf3ab1ed80f94b6382fb6acc7d78"; + name = "freetype-2.9.1.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/freetype-2.9.1.tar.bz2"; + sha256 = "db8d87ea720ea9d5edc5388fc7a0497bb11ba9fe972245e0f7f4c7e8b1e1e84d"; md5 = ""; - md5name = "e5435f02e02d2b87bb8e4efdcaa14b1f78c9cf3ab1ed80f94b6382fb6acc7d78-freetype-2.8.1.tar.bz2"; + md5name = "db8d87ea720ea9d5edc5388fc7a0497bb11ba9fe972245e0f7f4c7e8b1e1e84d-freetype-2.9.1.tar.bz2"; } { name = "glm-0.9.4.6-libreoffice.zip"; @@ -329,18 +329,18 @@ md5name = "1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb-gpgme-1.9.0.tar.bz2"; } { - name = "graphite2-minimal-1.3.10.tgz"; - url = "http://dev-www.libreoffice.org/src/graphite2-minimal-1.3.10.tgz"; - sha256 = "aa5e58356cd084000609ebbd93fef456a1bc0ab9e46fea20e81552fb286232a9"; + name = "graphite2-minimal-1.3.13.tgz"; + url = "http://dev-www.libreoffice.org/src/graphite2-minimal-1.3.13.tgz"; + sha256 = "d47d387161db7f7ebade1920aa7cbdc797e79772597d8b55e80b58d1071bcc36"; md5 = ""; - md5name = "aa5e58356cd084000609ebbd93fef456a1bc0ab9e46fea20e81552fb286232a9-graphite2-minimal-1.3.10.tgz"; + md5name = "d47d387161db7f7ebade1920aa7cbdc797e79772597d8b55e80b58d1071bcc36-graphite2-minimal-1.3.13.tgz"; } { - name = "harfbuzz-1.8.4.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/harfbuzz-1.8.4.tar.bz2"; - sha256 = "3c592f86fa0da69e2e0e98cae9f5d5b61def3bb7948aa00ca45748f27fa545fd"; + name = "harfbuzz-2.3.1.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/harfbuzz-2.3.1.tar.bz2"; + sha256 = "f205699d5b91374008d6f8e36c59e419ae2d9a7bb8c5d9f34041b9a5abcae468"; md5 = ""; - md5name = "3c592f86fa0da69e2e0e98cae9f5d5b61def3bb7948aa00ca45748f27fa545fd-harfbuzz-1.8.4.tar.bz2"; + md5name = "f205699d5b91374008d6f8e36c59e419ae2d9a7bb8c5d9f34041b9a5abcae468-harfbuzz-2.3.1.tar.bz2"; } { name = "hsqldb_1_8_0.zip"; @@ -539,11 +539,11 @@ md5name = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483-ltm-1.0.zip"; } { - name = "xmlsec1-1.2.27.tar.gz"; - url = "http://dev-www.libreoffice.org/src/xmlsec1-1.2.27.tar.gz"; - sha256 = "97d756bad8e92588e6997d2227797eaa900d05e34a426829b149f65d87118eb6"; + name = "xmlsec1-1.2.28.tar.gz"; + url = "http://dev-www.libreoffice.org/src/xmlsec1-1.2.28.tar.gz"; + sha256 = "13eec4811ea30e3f0e16a734d1dbf7f9d246a71d540b48d143a07b489f6222d4"; md5 = ""; - md5name = "97d756bad8e92588e6997d2227797eaa900d05e34a426829b149f65d87118eb6-xmlsec1-1.2.27.tar.gz"; + md5name = "13eec4811ea30e3f0e16a734d1dbf7f9d246a71d540b48d143a07b489f6222d4-xmlsec1-1.2.28.tar.gz"; } { name = "libxml2-2.9.9.tar.gz"; @@ -602,11 +602,11 @@ md5name = "ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba-libmspub-0.1.4.tar.xz"; } { - name = "libmwaw-0.3.14.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.14.tar.xz"; - sha256 = "aca8bf1ce55ed83adbea82c70d4c8bebe8139f334b3481bf5a6e407f91f33ce9"; + name = "libmwaw-0.3.15.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.15.tar.xz"; + sha256 = "0440bb09f05e3419423d8dfa36ee847056ebfd837f9cbc091fdb5b057daab0b1"; md5 = ""; - md5name = "aca8bf1ce55ed83adbea82c70d4c8bebe8139f334b3481bf5a6e407f91f33ce9-libmwaw-0.3.14.tar.xz"; + md5name = "0440bb09f05e3419423d8dfa36ee847056ebfd837f9cbc091fdb5b057daab0b1-libmwaw-0.3.15.tar.xz"; } { name = "mythes-1.2.4.tar.gz"; @@ -623,11 +623,11 @@ md5name = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca-neon-0.30.2.tar.gz"; } { - name = "nss-3.38-with-nspr-4.19.tar.gz"; - url = "http://dev-www.libreoffice.org/src/nss-3.38-with-nspr-4.19.tar.gz"; - sha256 = "f271ec73291fa3e4bd4b59109f8035cc3a192fc33886f40ed4f9ee4b31c746e9"; + name = "nss-3.45-with-nspr-4.21.tar.gz"; + url = "http://dev-www.libreoffice.org/src/nss-3.45-with-nspr-4.21.tar.gz"; + sha256 = "fae11751100510d26f16a245f0db9a5b3d638ab28ce0bccd50d4314f7e526ba1"; md5 = ""; - md5name = "f271ec73291fa3e4bd4b59109f8035cc3a192fc33886f40ed4f9ee4b31c746e9-nss-3.38-with-nspr-4.19.tar.gz"; + md5name = "fae11751100510d26f16a245f0db9a5b3d638ab28ce0bccd50d4314f7e526ba1-nss-3.45-with-nspr-4.21.tar.gz"; } { name = "libodfgen-0.1.6.tar.bz2"; @@ -686,11 +686,11 @@ md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz"; } { - name = "pdfium-3550.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/pdfium-3550.tar.bz2"; - sha256 = "572460f7f9e2f86d022a9c6a82f1e2ded6c3c29ba352d4b9fac60b87e2159679"; + name = "pdfium-3794.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/pdfium-3794.tar.bz2"; + sha256 = "e3faddcf741336c64ca2e6f72b23e9e60979969b2cf67c878c9a5bc38328cfc4"; md5 = ""; - md5name = "572460f7f9e2f86d022a9c6a82f1e2ded6c3c29ba352d4b9fac60b87e2159679-pdfium-3550.tar.bz2"; + md5name = "e3faddcf741336c64ca2e6f72b23e9e60979969b2cf67c878c9a5bc38328cfc4-pdfium-3794.tar.bz2"; } { name = "pixman-0.34.0.tar.gz"; diff --git a/pkgs/applications/office/scribus/unstable.nix b/pkgs/applications/office/scribus/unstable.nix index eb2bebb3993..2cd441794a4 100644 --- a/pkgs/applications/office/scribus/unstable.nix +++ b/pkgs/applications/office/scribus/unstable.nix @@ -1,26 +1,24 @@ -{ stdenv, fetchsvn, wrapQtAppsHook, pkgconfig, cmake, qtbase, cairo, pixman, +{ stdenv, fetchurl, mkDerivation, pkgconfig, cmake, qtbase, cairo, pixman, boost, cups, fontconfig, freetype, hunspell, libjpeg, libtiff, libxml2, lcms2, podofo, poppler, poppler_data, python2, harfbuzz, qtimageformats, qttools }: let pythonEnv = python2.withPackages(ps: [ps.tkinter ps.pillow]); - revision = "22806"; in -stdenv.mkDerivation rec { - name = "scribus-unstable-${version}"; - version = "2019-01-16"; +mkDerivation rec { + pname = "scribus"; + version = "1.5.5"; - src = fetchsvn { - url = "svn://scribus.net/trunk/Scribus"; - rev = revision; - sha256 = "16xpsbp6kca78jf48n6zdmyjras38xr11paan839hgy4ik83ncn0"; + src = fetchurl { + url = "mirror://sourceforge/${pname}/${pname}-devel/${pname}-${version}.tar.xz"; + sha256 = "eQiyGmzoQyafWM7fX495GJMlfmIBzOX73ccNrKL+P3E="; }; enableParallelBuilding = true; - nativeBuildInputs = [ wrapQtAppsHook ]; + nativeBuildInputs = [ pkgconfig cmake ]; buildInputs = [ - pkgconfig cmake qtbase cairo pixman boost cups fontconfig + qtbase cairo pixman boost cups fontconfig freetype hunspell libjpeg libtiff libxml2 lcms2 podofo poppler poppler_data pythonEnv harfbuzz qtimageformats qttools ]; diff --git a/pkgs/applications/office/tudu/default.nix b/pkgs/applications/office/tudu/default.nix index dea3ea9731b..89a3d128796 100644 --- a/pkgs/applications/office/tudu/default.nix +++ b/pkgs/applications/office/tudu/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "tudu-${version}"; - version = "0.10.2"; + version = "0.10.3"; src = fetchurl { url = "https://code.meskio.net/tudu/${name}.tar.gz"; - sha256 = "1xsncvd1c6v8y0dzc5mspy9rrwc89pabhz6r2lihsirk83h2rqym"; + sha256 = "0140pw457cd05ysws998yhd3b087j98q8m0g3s4br942l65b8n2y"; }; buildInputs = [ ncurses ]; diff --git a/pkgs/applications/radio/chirp/default.nix b/pkgs/applications/radio/chirp/default.nix index 1c6d0478f76..aeadf49f898 100644 --- a/pkgs/applications/radio/chirp/default.nix +++ b/pkgs/applications/radio/chirp/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "chirp-daily"; - version = "20190511"; + version = "20190718"; src = fetchurl { url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${pname}-${version}.tar.gz"; - sha256 = "1k5smkzkvbr4d8gbl1yczf2i5xrdkgk6i8pmwnlfghzcgy8n4jzj"; + sha256 = "1zngdqqqrlm8qpv8dzinamhwq6rr8zcq7db3vb284wrq0jcvrry5"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/radio/fldigi/default.nix b/pkgs/applications/radio/fldigi/default.nix index fd8c542fb42..b9af3a71233 100644 --- a/pkgs/applications/radio/fldigi/default.nix +++ b/pkgs/applications/radio/fldigi/default.nix @@ -2,12 +2,12 @@ libsamplerate, libpulseaudio, libXinerama, gettext, pkgconfig, alsaLib }: stdenv.mkDerivation rec { - version = "4.1.04"; + version = "4.1.07"; pname = "fldigi"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "0idv6yr5l5z1icziv1shpjqxhjlxmb6qkpwlmcxws15gkqs9rhc9"; + sha256 = "1w11d6vbcvi3y7pps3rqb1ss3kxyyzd7nn1jv6fqns1wwsv68j6w"; }; buildInputs = [ libXinerama gettext hamlib fltk13 libjpeg libpng portaudio diff --git a/pkgs/applications/radio/flrig/default.nix b/pkgs/applications/radio/flrig/default.nix index 2b4a679acca..5bb561f1426 100644 --- a/pkgs/applications/radio/flrig/default.nix +++ b/pkgs/applications/radio/flrig/default.nix @@ -6,12 +6,12 @@ }: stdenv.mkDerivation rec { - version = "1.3.45"; + version = "1.3.47"; pname = "flrig"; src = fetchurl { url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz"; - sha256 = "14rnyqwlk35j2027l7hxfig6v7j7302w4vsvx0l33b782i8phs2v"; + sha256 = "1xih3ik5dssa40lx48228pcrds8r7xmd8rmk2fcr1mw6apw6q141"; }; buildInputs = [ diff --git a/pkgs/applications/radio/gnss-sdr/default.nix b/pkgs/applications/radio/gnss-sdr/default.nix index 7e132efefbb..747015d80ee 100644 --- a/pkgs/applications/radio/gnss-sdr/default.nix +++ b/pkgs/applications/radio/gnss-sdr/default.nix @@ -11,17 +11,22 @@ , pkgconfig , pythonPackages , uhd +, log4cpp +, openblas +, matio +, pugixml +, protobuf }: stdenv.mkDerivation rec { name = "gnss-sdr-${version}"; - version = "0.0.9"; + version = "0.0.11"; src = fetchFromGitHub { owner = "gnss-sdr"; repo = "gnss-sdr"; rev = "v${version}"; - sha256 = "0gis932ly3vk7d5qvznffp54pkmbw3m6v60mxjfdj5dd3r7vf975"; + sha256 = "0ajj0wx68yyzigppxxa1wag3hzkrjj8dqq8k28rj0jhp8a6bw2q7"; }; buildInputs = [ @@ -40,6 +45,11 @@ stdenv.mkDerivation rec { # UHD support is optional, but gnuradio is built with it, so there's # nothing to be gained by leaving it out. uhd + log4cpp + openblas + matio + pugixml + protobuf ]; enableParallelBuilding = true; @@ -53,6 +63,8 @@ stdenv.mkDerivation rec { # armadillo is built using both, so skip checking for them. "-DBLAS=YES" "-DLAPACK=YES" + "-DBLAS_LIBRARIES=-lopenblas" + "-DLAPACK_LIBRARIES=-lopenblas" # Similarly, it doesn't actually use gfortran despite checking for # its presence. diff --git a/pkgs/applications/radio/gqrx/default.nix b/pkgs/applications/radio/gqrx/default.nix index 1258dd32b9f..cd5f8b0db9e 100644 --- a/pkgs/applications/radio/gqrx/default.nix +++ b/pkgs/applications/radio/gqrx/default.nix @@ -1,4 +1,5 @@ { stdenv, fetchFromGitHub, cmake, qtbase, qtsvg, gnuradio, boost, gr-osmosdr +, mkDerivation # drivers (optional): , rtl-sdr, hackrf , pulseaudioSupport ? true, libpulseaudio @@ -6,7 +7,7 @@ assert pulseaudioSupport -> libpulseaudio != null; -stdenv.mkDerivation rec { +mkDerivation rec { name = "gqrx-${version}"; version = "2.11.5"; diff --git a/pkgs/applications/radio/wsjtx/default.nix b/pkgs/applications/radio/wsjtx/default.nix index 6e287b571d7..212f93fb093 100644 --- a/pkgs/applications/radio/wsjtx/default.nix +++ b/pkgs/applications/radio/wsjtx/default.nix @@ -1,22 +1,22 @@ { stdenv, fetchurl, asciidoc, asciidoctor, autoconf, automake, cmake, - docbook_xsl, fftw, fftwFloat, gfortran, libtool, qtbase, - qtmultimedia, qtserialport, texinfo, libusb1 }: + docbook_xsl, fftw, fftwFloat, gfortran, libtool, libusb1, qtbase, + qtmultimedia, qtserialport, qttools, texinfo }: stdenv.mkDerivation rec { name = "wsjtx-${version}"; - version = "2.0.1"; + version = "2.1.0"; # This is a "superbuild" tarball containing both wsjtx and a hamlib fork src = fetchurl { url = "http://physics.princeton.edu/pulsar/k1jt/wsjtx-${version}.tgz"; - sha256 = "1kd0w57i9d9srbbfacza491vah8wa8100zjzzwqwdv70yy9qzw8q"; + sha256 = "04flhyfw0djnnbrzh3f5lx06bnn92khchz3bmswk8if8n8j58v4y"; }; # Hamlib builds with autotools, wsjtx builds with cmake # Omitting pkgconfig because it causes issues locating the built hamlib nativeBuildInputs = [ asciidoc asciidoctor autoconf automake cmake docbook_xsl gfortran libtool - texinfo + qttools texinfo ]; buildInputs = [ fftw fftwFloat libusb1 qtbase qtmultimedia qtserialport ]; @@ -29,8 +29,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Weak-signal digital communication modes for amateur radio"; longDescription = '' - WSJT-X implements communication protocols or "modes" called FT8, JT4, JT9, - JT65, QRA64, ISCAT, MSK144, and WSPR, as well as one called Echo for + WSJT-X implements communication protocols or "modes" called FT4, FT8, JT4, + JT9, JT65, QRA64, ISCAT, MSK144, and WSPR, as well as one called Echo for detecting and measuring your own radio signals reflected from the Moon. These modes were all designed for making reliable, confirmed ham radio contacts under extreme weak-signal conditions. @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { # Older licenses are for the statically-linked hamlib license = with licenses; [ gpl3Plus gpl2Plus lgpl21Plus ]; platforms = platforms.linux; - maintainers = [ maintainers.lasandell ]; + maintainers = with maintainers; [ lasandell ]; }; } diff --git a/pkgs/applications/radio/wsjtx/wsjtx.patch b/pkgs/applications/radio/wsjtx/wsjtx.patch index e92b420e58a..fd7c40fdc13 100644 --- a/pkgs/applications/radio/wsjtx/wsjtx.patch +++ b/pkgs/applications/radio/wsjtx/wsjtx.patch @@ -2,11 +2,12 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 3e7e816b..e7dbb14a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -860,6 +860,7 @@ find_package (Qt5Widgets 5 REQUIRED) - find_package (Qt5Multimedia 5 REQUIRED) - find_package (Qt5PrintSupport 5 REQUIRED) - find_package (Qt5Sql 5 REQUIRED) -+find_package (Qt5SerialPort 5 REQUIRED) +@@ -885,6 +885,6 @@ + # + + # Widgets finds its own dependencies. +-find_package (Qt5 COMPONENTS Widgets Multimedia PrintSupport Sql LinguistTools REQUIRED) ++find_package (Qt5 COMPONENTS Widgets Multimedia PrintSupport Sql LinguistTools SerialPort REQUIRED) if (WIN32) add_definitions (-DQT_NEEDS_QTMAIN) diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix index d58b4bf8c4d..70c72779c52 100644 --- a/pkgs/applications/science/biology/picard-tools/default.nix +++ b/pkgs/applications/science/biology/picard-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "picard-tools-${version}"; - version = "2.20.3"; + version = "2.20.4"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "0qgj062c983w6qlgfkj6in5cl5rmvpak7rdwmjg2gv972kcfs7lp"; + sha256 = "1z2zpwqhk8i7l9awajdrzxwij0vcmkwq7rajzjil7n65apj2hz9i"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/science/chemistry/molden/default.nix b/pkgs/applications/science/chemistry/molden/default.nix index 274afd5fc3d..46a1d96d8d0 100644 --- a/pkgs/applications/science/chemistry/molden/default.nix +++ b/pkgs/applications/science/chemistry/molden/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, which, gfortran, libGLU, xorg } : stdenv.mkDerivation rec { - version = "6.1"; + version = "6.2"; name = "molden-${version}"; src = fetchurl { url = "ftp://ftp.cmbi.ru.nl/pub/molgraph/molden/molden${version}.tar.gz"; - sha256 = "0swbjnqlkwhy8lvjkbx8yklqj4zfphwdg6s3haawxi3dd65ij539"; + sha256 = "01m5p7v5pz1fi77var50sp1bzlvdckwr6kn4wanvic2jmvgp9q5n"; }; nativeBuildInputs = [ which ]; diff --git a/pkgs/applications/science/logic/symbiyosys/default.nix b/pkgs/applications/science/logic/symbiyosys/default.nix index 8ba77159693..064ad204aff 100644 --- a/pkgs/applications/science/logic/symbiyosys/default.nix +++ b/pkgs/applications/science/logic/symbiyosys/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, yosys, bash, python3 }: stdenv.mkDerivation rec { - name = "symbiyosys-${version}"; - version = "2019.04.18"; + pname = "symbiyosys"; + version = "2019.08.13"; src = fetchFromGitHub { owner = "yosyshq"; repo = "symbiyosys"; - rev = "b1de59032ef3de35e56fa420a914c2f14d2495e4"; - sha256 = "0zci1n062csswl5xxjh9fwq09p9clv95ckag3yywxq06hnqzx0r7"; + rev = "9cb542ac7a310b3dfa626349db53bed6236b670c"; + sha256 = "0c7nz740738ybk33zzlfl00cq86n31wvra8pqqkpl4ygxnwca1d6"; }; buildInputs = [ python3 yosys ]; @@ -26,9 +26,6 @@ stdenv.mkDerivation rec { substituteInPlace $out/bin/sby \ --replace "##yosys-sys-path##" \ "sys.path += [p + \"/share/yosys/python3/\" for p in [\"$out\", \"${yosys}\"]]" - substituteInPlace $out/share/yosys/python3/sby_core.py \ - --replace "/bin/bash" \ - "${bash}/bin/bash" ''; meta = { description = "Tooling for Yosys-based verification flows"; diff --git a/pkgs/applications/science/logic/tlaplus/toolbox.nix b/pkgs/applications/science/logic/tlaplus/toolbox.nix index f1116a27c0b..7d39aae6e3c 100644 --- a/pkgs/applications/science/logic/tlaplus/toolbox.nix +++ b/pkgs/applications/science/logic/tlaplus/toolbox.nix @@ -1,9 +1,9 @@ { lib, fetchzip, makeWrapper, makeDesktopItem, stdenv -, jre, swt, gtk, libXtst, glib +, gtk, libXtst, glib, zlib }: let - version = "1.5.7"; + version = "1.6.0"; arch = "x86_64"; desktopItem = makeDesktopItem rec { @@ -24,7 +24,7 @@ in stdenv.mkDerivation { name = "tla-toolbox-${version}"; src = fetchzip { url = "https://tla.msr-inria.inria.fr/tlatoolbox/products/TLAToolbox-${version}-linux.gtk.${arch}.zip"; - sha256 = "0lg9sizpw5mkcnwwvmgqigkizjyz2lf1wrg48h7mg7wcv3macy4q"; + sha256 = "1mgx4p5qykf9q0p4cp6kcpc7fx8g5f2w1g40kdgas24hqwrgs3cm"; }; buildInputs = [ makeWrapper ]; @@ -34,17 +34,20 @@ in stdenv.mkDerivation { installPhase = '' mkdir -p "$out/bin" cp -r "$src" "$out/toolbox" - chmod +w "$out/toolbox" "$out/toolbox/toolbox" + chmod -R +w "$out/toolbox" patchelf \ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ "$out/toolbox/toolbox" + patchelf \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + "$(find "$out/toolbox" -name java)" + makeWrapper $out/toolbox/toolbox $out/bin/tla-toolbox \ --run "set -x; cd $out/toolbox" \ --add-flags "-data ~/.tla-toolbox" \ - --prefix PATH : "${jre}/bin" \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ swt gtk libXtst glib ]}" + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ gtk libXtst glib zlib ]}" echo -e "\nCreating TLA Toolbox icons..." pushd "$src" diff --git a/pkgs/applications/science/math/calc/default.nix b/pkgs/applications/science/math/calc/default.nix index 24cddfb9a1c..348c1e75086 100644 --- a/pkgs/applications/science/math/calc/default.nix +++ b/pkgs/applications/science/math/calc/default.nix @@ -15,7 +15,6 @@ stdenv.mkDerivation rec { patchPhase = '' substituteInPlace Makefile \ - --replace 'all: check_include' 'all:' \ --replace '-install_name ''${LIBDIR}/libcalc''${LIB_EXT_VERSION}' '-install_name ''${T}''${LIBDIR}/libcalc''${LIB_EXT_VERSION}' \ --replace '-install_name ''${LIBDIR}/libcustcalc''${LIB_EXT_VERSION}' '-install_name ''${T}''${LIBDIR}/libcustcalc''${LIB_EXT_VERSION}' ''; @@ -25,7 +24,7 @@ stdenv.mkDerivation rec { makeFlags = [ "T=$(out)" - "INCDIR=${lib.getDev stdenv.cc.libc}/include" + "INCDIR=" "BINDIR=/bin" "LIBDIR=/lib" "CALC_SHAREDIR=/share/calc" diff --git a/pkgs/applications/science/math/calculix/calculix.patch b/pkgs/applications/science/math/calculix/calculix.patch new file mode 100644 index 00000000000..311421f2ef5 --- /dev/null +++ b/pkgs/applications/science/math/calculix/calculix.patch @@ -0,0 +1,31 @@ +diff --git a/ccx_2.15/src/Makefile b/ccx_2.15/src/Makefile +index 9cab2fc..6e977b8 100755 +--- a/ccx_2.15/src/Makefile ++++ b/ccx_2.15/src/Makefile +@@ -1,6 +1,6 @@ + + CFLAGS = -Wall -O3 -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE -DNETWORKOUT +-FFLAGS = -Wall -O3 ++FFLAGS = -Wall -O3 + + CC=cc + FC=gfortran +@@ -18,15 +18,10 @@ OCCXF = $(SCCXF:.f=.o) + OCCXC = $(SCCXC:.c=.o) + OCCXMAIN = $(SCCXMAIN:.c=.o) + +-DIR=../../../SPOOLES.2.2 ++LIBS = -lpthread -lm -lc -lspooles -larpack -lopenblas + +-LIBS = \ +- $(DIR)/spooles.a \ +- ../../../ARPACK/libarpack_INTEL.a \ +- -lpthread -lm -lc +- +-ccx_2.15: $(OCCXMAIN) ccx_2.15.a $(LIBS) +- ./date.pl; $(CC) $(CFLAGS) -c ccx_2.15.c; $(FC) -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.15.a $(LIBS) ++ccx_2.15: $(OCCXMAIN) ccx_2.15.a ++ $(CC) $(CFLAGS) -c ccx_2.15.c; $(FC) -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.15.a $(LIBS) + + ccx_2.15.a: $(OCCXF) $(OCCXC) + ar vr $@ $? diff --git a/pkgs/applications/science/math/calculix/default.nix b/pkgs/applications/science/math/calculix/default.nix new file mode 100644 index 00000000000..24d5f99ec32 --- /dev/null +++ b/pkgs/applications/science/math/calculix/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, gfortran, arpack, spooles, openblas }: + +stdenv.mkDerivation rec { + pname = "calculix"; + version = "2.15"; + + src = fetchurl { + url = "http://www.dhondt.de/ccx_${version}.src.tar.bz2"; + sha256 = "0d4axfxgm3ag4p2vx9rjcky7c122k99a2nhv1jv53brm35rblzdw"; + }; + + nativeBuildInputs = [ gfortran ]; + + buildInputs = [ arpack spooles openblas ]; + + NIX_CFLAGS_COMPILE = [ + "-I${spooles}/include/spooles" + ]; + + patches = [ + ./calculix.patch + ]; + + postPatch = '' + cd ccx*/src + ''; + + installPhase = '' + install -Dm0755 ccx_${version} $out/bin/ccx + ''; + + meta = with stdenv.lib; { + homepage = "http://www.calculix.de/"; + description = "Three-dimensional structural finite element program"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ gebner ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix index fbdbac003dc..1d96c0039ad 100644 --- a/pkgs/applications/science/math/gmsh/default.nix +++ b/pkgs/applications/science/math/gmsh/default.nix @@ -1,10 +1,9 @@ { stdenv, fetchurl, cmake, openblasCompat, gfortran, gmm, fltk, libjpeg -, zlib, libGLU_combined, libGLU, xorg }: +, zlib, libGLU_combined, libGLU, xorg, opencascade-occt }: -let version = "4.4.1"; in - -stdenv.mkDerivation { - name = "gmsh-${version}"; +stdenv.mkDerivation rec { + pname = "gmsh"; + version = "4.4.1"; src = fetchurl { url = "http://gmsh.info/src/gmsh-${version}-source.tgz"; @@ -14,15 +13,14 @@ stdenv.mkDerivation { buildInputs = [ openblasCompat gmm fltk libjpeg zlib libGLU_combined libGLU xorg.libXrender xorg.libXcursor xorg.libXfixes xorg.libXext xorg.libXft xorg.libXinerama xorg.libX11 xorg.libSM xorg.libICE + opencascade-occt ]; nativeBuildInputs = [ cmake gfortran ]; - enableParallelBuilding = true; - meta = { description = "A three-dimensional finite element mesh generator"; - homepage = http://gmsh.info/; + homepage = "http://gmsh.info/"; platforms = [ "x86_64-linux" ]; license = stdenv.lib.licenses.gpl2Plus; }; diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index 4da3a3f3d7b..b4d82b9583c 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qalculate-gtk"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-gtk"; rev = "v${version}"; - sha256 = "1yhhfqcxi1b7dfrl8qh16l9iwgzvw1p0hhl7nnjpxhdwxz880sv0"; + sha256 = "1z2d32dcvdd66114j3km58xfk80hc5rd0zrh2fgz1azv8r4cqq1b"; }; patchPhase = '' diff --git a/pkgs/applications/science/math/sage/dist-tests.nix b/pkgs/applications/science/math/sage/dist-tests.nix new file mode 100644 index 00000000000..24a86a8f37a --- /dev/null +++ b/pkgs/applications/science/math/sage/dist-tests.nix @@ -0,0 +1,17 @@ +# Lists past failures and files associated with it. The intention is to build +# up a subset of a testsuite that catches 95% of failures that are relevant for +# distributions while only taking ~5m to run. This in turn makes it more +# reasonable to re-test sage on dependency changes and makes it easier for +# users to override the sage derivation. +# This is an experiment for now. If it turns out that there really is a small +# subset of files responsible for the vast majority of packaging tests, we can +# think about moving this upstream. +[ + "src/sage/env.py" # [1] + "src/sage/misc/persist.pyx" # [1] + "src/sage/misc/inline_fortran.py" # [1] + "src/sage/repl/ipython_extension.py" # [1] +] + +# Numbered list of past failures to annotate files with +# [1] PYTHONPATH related issue https://github.com/NixOS/nixpkgs/commit/ec7f569211091282410050e89e68832d4fe60528 diff --git a/pkgs/applications/science/math/sage/patches/configurationpy-error-verbose.patch b/pkgs/applications/science/math/sage/patches/configurationpy-error-verbose.patch new file mode 100644 index 00000000000..e687281ad1a --- /dev/null +++ b/pkgs/applications/science/math/sage/patches/configurationpy-error-verbose.patch @@ -0,0 +1,19 @@ +diff --git a/src/sage/repl/configuration.py b/src/sage/repl/configuration.py +index 67d7d2accf..18279581e2 100644 +--- a/src/sage/repl/configuration.py ++++ b/src/sage/repl/configuration.py +@@ -9,10 +9,11 @@ the IPython simple prompt is being used:: + sage: cmd = 'print([sys.stdin.isatty(), sys.stdout.isatty()])' + sage: import pexpect + sage: output = pexpect.run( +- ....: 'bash -c \'echo "{0}" | sage\''.format(cmd), ++ ....: 'bash -c \'export SAGE_BANNER=no; echo "{0}" | sage\''.format(cmd), + ....: ).decode('utf-8', 'surrogateescape') +- sage: 'sage: [False, True]' in output +- True ++ sage: print(output) ++ sage...[False, True] ++ sage...Exiting Sage ... + """ + + #***************************************************************************** diff --git a/pkgs/applications/science/math/sage/patches/sympow-cache.patch b/pkgs/applications/science/math/sage/patches/sympow-cache.patch new file mode 100644 index 00000000000..20020d610f8 --- /dev/null +++ b/pkgs/applications/science/math/sage/patches/sympow-cache.patch @@ -0,0 +1,21 @@ +diff --git a/src/sage/lfunctions/sympow.py b/src/sage/lfunctions/sympow.py +index 1640ac4f6a..03578be7b8 100644 +--- a/src/sage/lfunctions/sympow.py ++++ b/src/sage/lfunctions/sympow.py +@@ -50,6 +50,7 @@ from __future__ import print_function, absolute_import + + import os + ++from sage.env import DOT_SAGE + from sage.structure.sage_object import SageObject + from sage.misc.all import pager, verbose + import sage.rings.all +@@ -76,7 +77,7 @@ class Sympow(SageObject): + """ + Used to call sympow with given args + """ +- cmd = 'sympow %s'%args ++ cmd = 'env SYMPOW_CACHEDIR="%s/sympow///" sympow %s' % (DOT_SAGE, args) + v = os.popen(cmd).read().strip() + verbose(v, level=2) + return v diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 51460154c5d..57d6c852be8 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -61,7 +61,11 @@ stdenv.mkDerivation rec { # Since sage unfortunately does not release bugfix releases, packagers must # fix those bugs themselves. This is for critical bugfixes, where "critical" # == "causes (transient) doctest failures / somebody complained". - bugfixPatches = [ ]; + bugfixPatches = [ + # To help debug the transient error in + # https://trac.sagemath.org/ticket/23087 when it next occurs. + ./patches/configurationpy-error-verbose.patch + ]; # Patches needed because of package updates. We could just pin the versions of # dependencies, but that would lead to rebuilds, confusion and the burdons of @@ -100,6 +104,11 @@ stdenv.mkDerivation rec { rev = "c11d9cfa23ff9f77681a8f12742f68143eed4504"; sha256 = "0xzra7mbgqvahk9v45bjwir2mqz73hrhhy314jq5nxrb35ysdxyi"; }) + + # After updating smypow to (https://trac.sagemath.org/ticket/3360) we can + # now set the cache dir to be withing the .sage directory. This is not + # strictly necessary, but keeps us from littering in the user's HOME. + ./patches/sympow-cache.patch ]; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; diff --git a/pkgs/applications/science/math/sage/sage-tests.nix b/pkgs/applications/science/math/sage/sage-tests.nix index 591fa192d56..0cd5b5d976a 100644 --- a/pkgs/applications/science/math/sage/sage-tests.nix +++ b/pkgs/applications/science/math/sage/sage-tests.nix @@ -51,6 +51,10 @@ stdenv.mkDerivation rec { export HOME="$TMPDIR/sage-home" mkdir -p "$HOME" + # avoid running out of memory with many threads in subprocesses, see + # https://github.com/NixOS/nixpkgs/pull/65802 + export GLIBC_TUNABLES=glibc.malloc.arena_max=4 + echo "Running sage tests with arguments ${timeSpecifier} ${patienceSpecifier} ${testArgs}" "sage" -t --nthreads "$NIX_BUILD_CORES" --optional=sage ${timeSpecifier} ${patienceSpecifier} ${testArgs} ''; diff --git a/pkgs/applications/science/misc/motu-client/default.nix b/pkgs/applications/science/misc/motu-client/default.nix deleted file mode 100644 index d4367ef7e2d..00000000000 --- a/pkgs/applications/science/misc/motu-client/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ python27Packages, fetchurl, lib } : -python27Packages.buildPythonApplication rec { - pname = "motu-client"; - version = "1.5.00"; - - src = fetchurl { - url = "https://github.com/quiet-oceans/motuclient-setuptools/archive/${version}.tar.gz"; - sha256 = "1iqsws3wa2gpb36ms21xmaxfi83i8p8cdya4cxpn4r47c8mz74x8"; - }; - - meta = with lib; { - homepage = https://github.com/quiet-oceans/motuclient-setuptools; - description = "CLI to query oceanographic data to Motu servers"; - longDescription = '' - Access data from (motu)[https://sourceforge.net/projects/cls-motu/] servers. - This is a refactored fork of the original release in order to simplify integration, - deployment and packaging. Upstream code can be found at - https://sourceforge.net/projects/cls-motu/ . - ''; - license = licenses.lgpl3Plus; - maintainers = [ maintainers.lsix ]; - }; -} diff --git a/pkgs/applications/science/physics/sacrifice/default.nix b/pkgs/applications/science/physics/sacrifice/default.nix index 64b88dcc3d4..d43a05f1c61 100644 --- a/pkgs/applications/science/physics/sacrifice/default.nix +++ b/pkgs/applications/science/physics/sacrifice/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, hepmc, lhapdf, pythia, makeWrapper }: +{ stdenv, fetchurl, boost, hepmc2, lhapdf, pythia, makeWrapper }: stdenv.mkDerivation rec { name = "sacrifice-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "10bvpq63kmszy1habydwncm0j1dgvam0fkrmvkgbkvf804dcjp6g"; }; - buildInputs = [ boost hepmc lhapdf pythia ]; + buildInputs = [ boost hepmc2 lhapdf pythia ]; nativeBuildInputs = [ makeWrapper ]; patches = [ @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; configureFlags = [ - "--with-HepMC=${hepmc}" + "--with-HepMC=${hepmc2}" "--with-pythia=${pythia}" ]; diff --git a/pkgs/applications/science/physics/sherpa/default.nix b/pkgs/applications/science/physics/sherpa/default.nix index 7cb3e8881ca..1d61c612563 100644 --- a/pkgs/applications/science/physics/sherpa/default.nix +++ b/pkgs/applications/science/physics/sherpa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gfortran, hepmc, fastjet, lhapdf, rivet, sqlite }: +{ stdenv, fetchurl, gfortran, hepmc2, fastjet, lhapdf, rivet, sqlite }: stdenv.mkDerivation rec { name = "sherpa-${version}"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-sqlite3=${sqlite.dev}" - "--enable-hepmc2=${hepmc}" + "--enable-hepmc2=${hepmc2}" "--enable-fastjet=${fastjet}" "--enable-lhapdf=${lhapdf}" "--enable-rivet=${rivet}" diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 5068647e879..c7d77bf3498 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -145,7 +145,7 @@ let lab = callPackage ./lab { }; - pre-commit = callPackage ./pre-commit { }; + pre-commit = pkgs.python3Packages.toPythonApplication pkgs.python3Packages.pre-commit; pass-git-helper = python3Packages.callPackage ./pass-git-helper { }; diff --git a/pkgs/applications/version-management/git-and-tools/topgit/default.nix b/pkgs/applications/version-management/git-and-tools/topgit/default.nix index c183bbde7e6..0da0cfa02b6 100644 --- a/pkgs/applications/version-management/git-and-tools/topgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/topgit/default.nix @@ -1,26 +1,30 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub, git, perl }: stdenv.mkDerivation rec { - name = "topgit-0.9"; + pname = "topgit"; + version = "0.19.12"; - src = fetchurl { - url = "https://github.com/greenrd/topgit/archive/${name}.tar.gz"; - sha256 = "1z9x42a0cmn8n2n961qcfl522nd6j9a3dpx1jbqfp24ddrk5zd94"; + src = fetchFromGitHub { + owner = "mackyle"; + repo = "topgit"; + rev = "${pname}-${version}"; + sha256 = "1wvf8hmwwl7a2fr17cfs3pbxjccdsjw9ngzivxlgja0gvfz4hjd5"; }; - configurePhase = "makeFlags=prefix=$out"; + makeFlags = [ "prefix=${placeholder "out"}" ]; + + nativeBuildInputs = [ perl git ]; postInstall = '' - mkdir -p "$out/share/doc/${name}" "$out/etc/bash_completion.d/" - mv README "$out/share/doc/${name}/" - mv contrib/tg-completion.bash "$out/etc/bash_completion.d/" + install -Dm644 README -t"$out/share/doc/${pname}-${version}/" + install -Dm755 contrib/tg-completion.bash -t "$out/etc/bash_completion.d/" ''; - meta = { - homepage = https://github.com/greenrd/topgit; + meta = with stdenv.lib; { description = "TopGit manages large amount of interdependent topic branches"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ marcweber ]; + homepage = "https://github.com/mackyle/topgit"; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = with maintainers; [ marcweber ]; }; } diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 378a272dbf6..7352225c017 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -8,13 +8,13 @@ with stdenv.lib; buildGoPackage rec { pname = "gitea"; - version = "1.9.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "go-gitea"; repo = "gitea"; rev = "v${version}"; - sha256 = "1z7rkhxkymv7rgc7blh9ps5sqrgl4sryf0rqcp16nh9n5snfm1rm"; + sha256 = "0sk877rp6zhch1b9c7zbmk8pnlyqjp4nws2gzq24qvw5f4chlprw"; # Required to generate the same checksum on MacOS due to unicode encoding differences # More information: https://github.com/NixOS/nixpkgs/pull/48128 extraPostFetch = '' diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index ffca24ab27d..5b7fc119b5b 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -3,6 +3,7 @@ , libX11, libXi, libxcb, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst , nss, nspr, cups, fetchurl, expat, gdk-pixbuf, libXdamage, libXrandr, dbus , dpkg, makeDesktopItem, openssl, wrapGAppsHook, hicolor-icon-theme, at-spi2-atk, libuuid +, e2fsprogs, krb5 }: with stdenv.lib; @@ -12,11 +13,11 @@ let in stdenv.mkDerivation rec { name = "gitkraken-${version}"; - version = "6.0.0"; + version = "6.1.1"; src = fetchurl { url = "https://release.axocdn.com/linux/GitKraken-v${version}.deb"; - sha256 = "1ykjdnzl34pqr6dhfnswix44i412c7gcba1pk95a8670wmc29a1f"; + sha256 = "1ks8dscidqzmxy650xda6gvqg04iwidanidlsmgsi8365iqxvb1k"; }; libPath = makeLibraryPath [ @@ -55,6 +56,8 @@ stdenv.mkDerivation rec { openssl at-spi2-atk libuuid + e2fsprogs + krb5 ]; desktopItem = makeDesktopItem { diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 840b90b4088..d20236e9f5b 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,30 +1,30 @@ { "ce": { - "version": "12.0.3", - "repo_hash": "0vrw4f9wczcnd66w2ym3mfnrr1qmjs5jyxhvc6sf93lk2n1d27sk", - "deb_hash": "0y1nv0hasphpkxrma43d7ipp2b3wsy08asrwshqc58rw9q7cnbcy", - "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_12.0.3-ce.0_amd64.deb/download.deb", + "version": "12.1.6", + "repo_hash": "0zyqxzyb1m8qa94iiyqf5ivqxrg60y378r94fsixy17fbh4y7sa6", + "deb_hash": "14bwcmwar44pjnjr6fdn2h9y92vyfva0kb76d4pz8pqc9pfm2hmg", + "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_12.1.6-ce.0_amd64.deb/download.deb", "owner": "gitlab-org", "repo": "gitlab-ce", - "rev": "v12.0.3", + "rev": "v12.1.6", "passthru": { - "GITALY_SERVER_VERSION": "1.47.0", - "GITLAB_PAGES_VERSION": "1.6.1", + "GITALY_SERVER_VERSION": "1.53.2", + "GITLAB_PAGES_VERSION": "1.7.1", "GITLAB_SHELL_VERSION": "9.3.0", "GITLAB_WORKHORSE_VERSION": "8.7.0" } }, "ee": { - "version": "12.0.3", - "repo_hash": "1gndyxmr93qrlnbhi75sql49wqnd579yi3aqhx8b477fjac2wd69", - "deb_hash": "082n3dsi2jwv4aagzgk1g0mm2csxgg6lpgnc49zfhyz9frdvf9mq", - "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_12.0.3-ee.0_amd64.deb/download.deb", + "version": "12.1.6", + "repo_hash": "1lxci1hwcccgw567c5733yl95xsxr4gnw41m48igdw9y8p6g7zbc", + "deb_hash": "0yjilhf4bjhl1a596x6n4cvjklfbrwhymslhx977nfjazfb5slx3", + "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_12.1.6-ee.0_amd64.deb/download.deb", "owner": "gitlab-org", "repo": "gitlab-ee", - "rev": "v12.0.3-ee", + "rev": "v12.1.6-ee", "passthru": { - "GITALY_SERVER_VERSION": "1.47.0", - "GITLAB_PAGES_VERSION": "1.6.1", + "GITALY_SERVER_VERSION": "1.53.2", + "GITLAB_PAGES_VERSION": "1.7.1", "GITLAB_SHELL_VERSION": "9.3.0", "GITLAB_WORKHORSE_VERSION": "8.7.0" } diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index a386d3e6322..20f0937274e 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -76,6 +76,7 @@ stdenv.mkDerivation rec { # Work around unpacking deb containing binary with suid bit tar -f gitlab-deb-data.tar --delete ./opt/gitlab/embedded/bin/ksu tar -xf gitlab-deb-data.tar + rm gitlab-deb-data.tar mv -v opt/gitlab/embedded/service/gitlab-rails/public/assets public rm -rf opt # only directory in data.tar.gz diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile b/pkgs/applications/version-management/gitlab/gitaly/Gemfile index 1ad7f4c777d..1a6eb99b678 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile @@ -7,7 +7,7 @@ gem 'rugged', '~> 0.28' gem 'github-linguist', '~> 6.1', require: 'linguist' gem 'gitlab-markup', '~> 1.7.0' gem 'activesupport', '~> 5.1.7' -gem 'gitaly-proto', '~> 1.32.0' +gem 'gitaly-proto', '~> 1.36.0' gem 'rdoc', '~> 4.2' gem 'gitlab-gollum-lib', '~> 4.2.7.7', require: false gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.2', require: false diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock index 852b3f332a3..0a86273f7cb 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock @@ -49,7 +49,7 @@ GEM ffi (1.10.0) gemojione (3.3.0) json - gitaly-proto (1.32.0) + gitaly-proto (1.36.0) grpc (~> 1.0) github-linguist (6.4.1) charlock_holmes (~> 0.7.6) @@ -147,7 +147,7 @@ GEM msgpack (>= 0.4.3) optimist (>= 3.0.0) rdoc (4.3.0) - rouge (3.3.0) + rouge (3.5.1) rspec (3.8.0) rspec-core (~> 3.8.0) rspec-expectations (~> 3.8.0) @@ -217,7 +217,7 @@ DEPENDENCIES bundler (>= 1.17.3) factory_bot faraday (~> 0.12) - gitaly-proto (~> 1.32.0) + gitaly-proto (~> 1.36.0) github-linguist (~> 6.1) gitlab-gollum-lib (~> 4.2.7.7) gitlab-gollum-rugged_adapter (~> 0.4.4.2) diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index a946c7fa7ca..184c6dc7f73 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -17,14 +17,14 @@ let }; }; in buildGoPackage rec { - version = "1.47.0"; + version = "1.53.2"; name = "gitaly-${version}"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "1b8gshvwiypwl0f4963l37y7sjrn851marr77fhczx128axrniiw"; + sha256 = "0x4dhqaxx6n5jlcvf69rglxiz11037ghgcnskks6qnlcbkd85j3d"; }; goPackagePath = "gitlab.com/gitlab-org/gitaly"; diff --git a/pkgs/applications/version-management/gitlab/gitaly/deps.nix b/pkgs/applications/version-management/gitlab/gitaly/deps.nix index 2d38c340d27..5522185783d 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/deps.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/deps.nix @@ -19,15 +19,6 @@ }; } { - goPackagePath = "github.com/OneOfOne/xxhash"; - fetch = { - type = "git"; - url = "https://github.com/OneOfOne/xxhash"; - rev = "v1.2.2"; - sha256 = "1mjfhrwhvxa48rycjnqpqzm521i38h1hdyz6pdwmhd7xb8j6gwi6"; - }; - } - { goPackagePath = "github.com/alecthomas/template"; fetch = { type = "git"; @@ -64,15 +55,6 @@ }; } { - goPackagePath = "github.com/cespare/xxhash"; - fetch = { - type = "git"; - url = "https://github.com/cespare/xxhash"; - rev = "v1.1.0"; - sha256 = "1qyzlcdcayavfazvi03izx83fvip8h36kis44zr2sg7xf6sx6l4x"; - }; - } - { goPackagePath = "github.com/client9/misspell"; fetch = { type = "git"; @@ -109,15 +91,6 @@ }; } { - goPackagePath = "github.com/dgryski/go-sip13"; - fetch = { - type = "git"; - url = "https://github.com/dgryski/go-sip13"; - rev = "e10d5fee7954"; - sha256 = "15fyibfas209ljz3f7g07kdmfbl3hhyd9n5n7aq5n5p9m5mn41d6"; - }; - } - { goPackagePath = "github.com/fsnotify/fsnotify"; fetch = { type = "git"; @@ -149,8 +122,8 @@ fetch = { type = "git"; url = "https://github.com/go-logfmt/logfmt"; - rev = "v0.4.0"; - sha256 = "06smxc112xmixz78nyvk3b2hmc7wasf2sl5vxj1xz62kqcq9lzm9"; + rev = "v0.3.0"; + sha256 = "1gkgh3k5w1xwb2qbjq52p6azq3h1c1rr6pfwjlwj1zrijpzn2xb9"; }; } { @@ -208,6 +181,15 @@ }; } { + goPackagePath = "github.com/google/uuid"; + fetch = { + type = "git"; + url = "https://github.com/google/uuid"; + rev = "v1.1.1"; + sha256 = "0hfxcf9frkb57k6q0rdkrmnfs78ms21r1qfk9fhlqga2yh5xg8zb"; + }; + } + { goPackagePath = "github.com/grpc-ecosystem/go-grpc-middleware"; fetch = { type = "git"; @@ -235,6 +217,15 @@ }; } { + goPackagePath = "github.com/json-iterator/go"; + fetch = { + type = "git"; + url = "https://github.com/json-iterator/go"; + rev = "v1.1.6"; + sha256 = "08caswxvdn7nvaqyj5kyny6ghpygandlbw9vxdj7l5vkp7q0s43r"; + }; + } + { goPackagePath = "github.com/julienschmidt/httprouter"; fetch = { type = "git"; @@ -307,21 +298,30 @@ }; } { - goPackagePath = "github.com/mwitkow/go-conntrack"; + goPackagePath = "github.com/modern-go/concurrent"; fetch = { type = "git"; - url = "https://github.com/mwitkow/go-conntrack"; - rev = "cc309e4a2223"; - sha256 = "0nbrnpk7bkmqg9mzwsxlm0y8m7s9qd9phr1q30qlx2qmdmz7c1mf"; + url = "https://github.com/modern-go/concurrent"; + rev = "bacd9c7ef1dd"; + sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs"; }; } { - goPackagePath = "github.com/oklog/ulid"; + goPackagePath = "github.com/modern-go/reflect2"; fetch = { type = "git"; - url = "https://github.com/oklog/ulid"; - rev = "v1.3.1"; - sha256 = "0hybwyid820n80axrk863k2py93hbqlq6hxhf84ppmz0qd0ys0gq"; + url = "https://github.com/modern-go/reflect2"; + rev = "v1.0.1"; + sha256 = "06a3sablw53n1dqqbr2f53jyksbxdmmk8axaas4yvnhyfi55k4lf"; + }; + } + { + goPackagePath = "github.com/mwitkow/go-conntrack"; + fetch = { + type = "git"; + url = "https://github.com/mwitkow/go-conntrack"; + rev = "cc309e4a2223"; + sha256 = "0nbrnpk7bkmqg9mzwsxlm0y8m7s9qd9phr1q30qlx2qmdmz7c1mf"; }; } { @@ -383,8 +383,8 @@ fetch = { type = "git"; url = "https://github.com/prometheus/client_golang"; - rev = "v0.9.3"; - sha256 = "1608rm1y2p3iv8k2x7wyc6hshvpbfkv2k77hy0x870syms1g3g1p"; + rev = "v1.0.0"; + sha256 = "1f03ndyi3jq7zdxinnvzimz3s4z2374r6dikkc8i42xzb6d1bli6"; }; } { @@ -401,8 +401,8 @@ fetch = { type = "git"; url = "https://github.com/prometheus/common"; - rev = "v0.4.0"; - sha256 = "00008pczafy982m59n1j31pnp41f4grbc2c40jccp52xg3m5klmr"; + rev = "v0.4.1"; + sha256 = "0sf4sjdckblz1hqdfvripk3zyp8xq89w7q75kbsyg4c078af896s"; }; } { @@ -410,17 +410,8 @@ fetch = { type = "git"; url = "https://github.com/prometheus/procfs"; - rev = "5867b95ac084"; - sha256 = "1rahdk62ajj4zpfb3mgzjqip773la9fb0m87m7s9a0b39l3fmzvr"; - }; - } - { - goPackagePath = "github.com/prometheus/tsdb"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/tsdb"; - rev = "v0.7.1"; - sha256 = "1c1da8i5byvhh4fp3vqjfb65aaksjskn3ggb8wg9hcfzjrhgpz04"; + rev = "v0.0.2"; + sha256 = "0s7pvs7fgnfpmym3cd0k219av321h9sf3yvdlnn3qy0ps280lg7k"; }; } { @@ -433,15 +424,6 @@ }; } { - goPackagePath = "github.com/spaolacci/murmur3"; - fetch = { - type = "git"; - url = "https://github.com/spaolacci/murmur3"; - rev = "f09979ecbc72"; - sha256 = "1lv3zyz3jy2d76bhvvs8svygx66606iygdvwy5cwc0p5z8yghq25"; - }; - } - { goPackagePath = "github.com/stretchr/objx"; fetch = { type = "git"; @@ -455,8 +437,8 @@ fetch = { type = "git"; url = "https://github.com/stretchr/testify"; - rev = "v1.2.2"; - sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; + rev = "v1.3.0"; + sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy"; }; } { @@ -500,8 +482,8 @@ fetch = { type = "git"; url = "https://gitlab.com/gitlab-org/gitaly-proto.git"; - rev = "v1.32.0"; - sha256 = "16ykk5gv1gxhhg7xfr5ldgzq8vmlzjsn58fs0bmdc4w35lbnwi4v"; + rev = "v1.36.0"; + sha256 = "0xma8ys3lf1bdhlkmcis31xs1h1dshcr5796wwfwnzijwk6422m3"; }; } { @@ -545,8 +527,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "d8887717615a"; - sha256 = "1wfm6ngxjyj7v5a2dqib6lw8bb2rdnf1kl48diykxjrsddn0s163"; + rev = "d28f0bde5980"; + sha256 = "18xj31h70m7xxb7gc86n9i21w6d7djbjz67zfaljm4jqskz6hxkf"; }; } { diff --git a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix index 9c9ea4934b8..fd1af22dd78 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix @@ -227,10 +227,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0glqy22p0xfaa3kvvrba04pj1dva8wpzlvhka37cvlqq95djcy19"; + sha256 = "11bkrf2z5ppp55cipawdpinrva42x12grp2gl1dp1jdb35crqick"; type = "gem"; }; - version = "1.32.0"; + version = "1.36.0"; }; github-linguist = { dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"]; @@ -680,12 +680,14 @@ version = "4.3.0"; }; rouge = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1digsi2s8wyzx8vsqcxasw205lg6s7izx8jypl8rrpjwshmv83ql"; + sha256 = "0yfhazlhjc4abgzhkgq8zqmdphvkh52211widkl4zhsbhqh8wg2q"; type = "gem"; }; - version = "3.3.0"; + version = "3.5.1"; }; rspec = { dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"]; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile index c9a95fb7a36..8bffc2a973d 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'rails', '5.1.7' +gem 'rails', '5.2.3' # Improves copy-on-write performance for MRI gem 'nakayoshi_fork', '~> 0.0.4' @@ -11,7 +11,7 @@ gem 'responders', '~> 2.0' gem 'sprockets', '~> 3.7.0' # Default values for AR models -gem 'gitlab-default_value_for', '~> 3.1.1', require: 'default_value_for' +gem 'default_value_for', '~> 3.2.0' # Supported DBs gem 'mysql2', '~> 0.4.10', group: :mysql @@ -84,6 +84,7 @@ gem 'rack-cors', '~> 1.0.0', require: 'rack/cors' gem 'graphql', '~> 1.8.0' gem 'graphiql-rails', '~> 1.4.10' gem 'apollo_upload_server', '~> 2.0.0.beta3' +gem 'graphql-docs', '~> 1.6.0', group: [:development, :test] # Disable strong_params so that Mash does not respond to :permitted? gem 'hashie-forbidden_attributes' @@ -99,7 +100,7 @@ gem 'carrierwave', '~> 1.3' gem 'mini_magick' # for backups -gem 'fog-aws', '~> 3.3' +gem 'fog-aws', '~> 3.5' # Locked until fog-google resolves https://github.com/fog/fog-google/issues/421. # Also see config/initializers/fog_core_patch.rb. gem 'fog-core', '= 2.1.0' @@ -129,10 +130,10 @@ gem 'rdoc', '~> 6.0' gem 'org-ruby', '~> 0.9.12' gem 'creole', '~> 0.5.0' gem 'wikicloth', '0.8.1' -gem 'asciidoctor', '~> 1.5.8' +gem 'asciidoctor', '~> 2.0.10' gem 'asciidoctor-include-ext', '~> 0.3.1', require: false -gem 'asciidoctor-plantuml', '0.0.8' -gem 'rouge', '~> 3.1' +gem 'asciidoctor-plantuml', '0.0.9' +gem 'rouge', '~> 3.5' gem 'truncato', '~> 0.7.11' gem 'bootstrap_form', '~> 4.2.0' gem 'nokogiri', '~> 1.10.3' @@ -211,7 +212,7 @@ gem 'discordrb-webhooks-blackst0ne', '~> 3.3', require: false # HipChat integration gem 'hipchat', '~> 1.5.0' -# JIRA integration +# Jira integration gem 'jira-ruby', '~> 1.4' # Flowdock integration @@ -300,13 +301,16 @@ gem 'peek-pg', '~> 1.3.0', group: :postgres gem 'peek-rblineprof', '~> 0.2.0' gem 'peek-redis', '~> 1.2.0' +# Memory benchmarks +gem 'derailed_benchmarks', require: false + # Metrics group :metrics do gem 'method_source', '~> 0.8', require: false gem 'influxdb', '~> 0.2', require: false # Prometheus - gem 'prometheus-client-mmap', '~> 0.9.4' + gem 'prometheus-client-mmap', '~> 0.9.8' gem 'raindrops', '~> 0.18' end @@ -336,7 +340,7 @@ group :development, :test do gem 'database_cleaner', '~> 1.7.0' gem 'factory_bot_rails', '~> 4.8.2' - gem 'rspec-rails', '~> 3.7.0' + gem 'rspec-rails', '~> 3.8.0' gem 'rspec-retry', '~> 0.6.1' gem 'rspec_profiling', '~> 0.0.5' gem 'rspec-set', '~> 0.1.3' @@ -365,6 +369,7 @@ group :development, :test do gem 'haml_lint', '~> 0.31.0', require: false gem 'simplecov', '~> 0.16.1', require: false gem 'bundler-audit', '~> 0.5.0', require: false + gem 'mdl', '~> 0.5.0', require: false gem 'benchmark-ips', '~> 2.3.0', require: false @@ -374,7 +379,6 @@ group :development, :test do gem 'activerecord_sane_schema_dumper', '1.0' gem 'stackprof', '~> 0.2.10', require: false - gem 'derailed_benchmarks', require: false gem 'simple_po_parser', '~> 1.1.2', require: false @@ -417,7 +421,7 @@ gem 'vmstat', '~> 2.3.0' gem 'sys-filesystem', '~> 1.1.6' # SSH host key support -gem 'net-ssh', '~> 5.0' +gem 'net-ssh', '~> 5.2' gem 'sshkey', '~> 2.0' # Required for ED25519 SSH host key support @@ -427,7 +431,7 @@ group :ed25519 do end # Gitaly GRPC client -gem 'gitaly-proto', '~> 1.32.0', require: 'gitaly' +gem 'gitaly-proto', '~> 1.37.0', require: 'gitaly' gem 'grpc', '~> 1.19.0' diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock index 4cebf73f17a..60939ae918c 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock @@ -6,44 +6,48 @@ GEM ace-rails-ap (4.1.2) acme-client (2.0.2) faraday (~> 0.9, >= 0.9.1) - actioncable (5.1.7) - actionpack (= 5.1.7) + actioncable (5.2.3) + actionpack (= 5.2.3) nio4r (~> 2.0) - websocket-driver (~> 0.6.1) - actionmailer (5.1.7) - actionpack (= 5.1.7) - actionview (= 5.1.7) - activejob (= 5.1.7) + websocket-driver (>= 0.6.1) + actionmailer (5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.1.7) - actionview (= 5.1.7) - activesupport (= 5.1.7) + actionpack (5.2.3) + actionview (= 5.2.3) + activesupport (= 5.2.3) rack (~> 2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.1.7) - activesupport (= 5.1.7) + actionview (5.2.3) + activesupport (= 5.2.3) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.1.7) - activesupport (= 5.1.7) + activejob (5.2.3) + activesupport (= 5.2.3) globalid (>= 0.3.6) - activemodel (5.1.7) - activesupport (= 5.1.7) - activerecord (5.1.7) - activemodel (= 5.1.7) - activesupport (= 5.1.7) - arel (~> 8.0) + activemodel (5.2.3) + activesupport (= 5.2.3) + activerecord (5.2.3) + activemodel (= 5.2.3) + activesupport (= 5.2.3) + arel (>= 9.0) activerecord-explain-analyze (0.1.0) activerecord (>= 4) pg activerecord_sane_schema_dumper (1.0) rails (>= 5, < 6) - activesupport (5.1.7) + activestorage (5.2.3) + actionpack (= 5.2.3) + activerecord (= 5.2.3) + marcel (~> 0.3.1) + activesupport (5.2.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -60,17 +64,17 @@ GEM apollo_upload_server (2.0.0.beta.3) graphql (>= 1.8) rails (>= 4.2) - arel (8.0.0) + arel (9.0.0) asana (0.8.1) faraday (~> 0.9) faraday_middleware (~> 0.9) faraday_middleware-multi_json (~> 0.0) oauth2 (~> 1.0) - asciidoctor (1.5.8) + asciidoctor (2.0.10) asciidoctor-include-ext (0.3.1) asciidoctor (>= 1.5.6, < 3.0.0) - asciidoctor-plantuml (0.0.8) - asciidoctor (~> 1.5) + asciidoctor-plantuml (0.0.9) + asciidoctor (>= 1.5.6, < 3.0.0) ast (2.4.0) atomic (1.1.99) attr_encrypted (3.1.0) @@ -163,6 +167,8 @@ GEM html-pipeline declarative (0.0.10) declarative-option (0.1.0) + default_value_for (3.2.0) + activerecord (>= 3.2.0, < 6.0) derailed_benchmarks (1.3.5) benchmark-ips (~> 2) get_process_mem (~> 0) @@ -214,6 +220,8 @@ GEM excon (0.62.0) execjs (2.6.0) expression_parser (0.9.0) + extended-markdown-filter (0.6.0) + html-pipeline (~> 2.0) factory_bot (4.8.2) activesupport (>= 3.0.0) factory_bot_rails (4.8.2) @@ -245,7 +253,7 @@ GEM fog-json ipaddress (~> 0.8) xml-simple (~> 1.1) - fog-aws (3.3.0) + fog-aws (3.5.2) fog-core (~> 2.1) fog-json (~> 1.1) fog-xml (~> 0.1) @@ -288,6 +296,7 @@ GEM fuubar (2.2.0) rspec-core (~> 3.0) ruby-progressbar (~> 1.4) + gemoji (3.0.1) gemojione (3.3.0) json get_process_mem (0.2.3) @@ -301,11 +310,9 @@ GEM gettext_i18n_rails (>= 0.7.1) po_to_json (>= 1.0.0) rails (>= 3.2.0) - gitaly-proto (1.32.0) + gitaly-proto (1.37.0) grpc (~> 1.0) github-markup (1.7.0) - gitlab-default_value_for (3.1.1) - activerecord (>= 3.2.0, < 6.0) gitlab-labkit (0.3.0) actionpack (~> 5) activesupport (~> 5) @@ -370,6 +377,14 @@ GEM railties sprockets-rails graphql (1.8.1) + graphql-docs (1.6.0) + commonmarker (~> 0.16) + escape_utils (~> 1.2) + extended-markdown-filter (~> 0.4) + gemoji (~> 3.0) + graphql (~> 1.6) + html-pipeline (~> 2.8) + sass (~> 3.4) grpc (1.19.0) google-protobuf (~> 3.1) googleapis-common-protos-types (~> 1.0.0) @@ -459,6 +474,7 @@ GEM kgio (2.11.2) knapsack (1.17.0) rake + kramdown (1.17.0) kubeclient (4.2.2) http (~> 3.0) recursive-open-struct (~> 1.0, >= 1.0.4) @@ -492,6 +508,12 @@ GEM mail (2.7.1) mini_mime (>= 0.1.1) mail_room (0.9.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + mdl (0.5.0) + kramdown (~> 1.12, >= 1.12.0) + mixlib-cli (~> 1.7, >= 1.7.0) + mixlib-config (~> 2.2, >= 2.2.1) memoist (0.16.0) memoizable (0.4.2) thread_safe (~> 0.3, >= 0.3.1) @@ -505,6 +527,9 @@ GEM mini_mime (1.0.1) mini_portile2 (2.4.0) minitest (5.11.3) + mixlib-cli (1.7.0) + mixlib-config (2.2.18) + tomlrb msgpack (1.2.10) multi_json (1.13.1) multi_xml (0.6.0) @@ -515,7 +540,7 @@ GEM mysql2 (0.4.10) nakayoshi_fork (0.0.4) net-ldap (0.16.0) - net-ssh (5.0.1) + net-ssh (5.2.0) netrc (0.11.0) nio4r (2.3.1) nokogiri (1.10.3) @@ -652,7 +677,7 @@ GEM parser unparser procto (0.0.3) - prometheus-client-mmap (0.9.4) + prometheus-client-mmap (0.9.8) pry (0.11.3) coderay (~> 1.1.0) method_source (~> 0.9.0) @@ -687,17 +712,18 @@ GEM rack-test (1.1.0) rack (>= 1.0, < 3) rack-timeout (0.5.1) - rails (5.1.7) - actioncable (= 5.1.7) - actionmailer (= 5.1.7) - actionpack (= 5.1.7) - actionview (= 5.1.7) - activejob (= 5.1.7) - activemodel (= 5.1.7) - activerecord (= 5.1.7) - activesupport (= 5.1.7) + rails (5.2.3) + actioncable (= 5.2.3) + actionmailer (= 5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + activemodel (= 5.2.3) + activerecord (= 5.2.3) + activestorage (= 5.2.3) + activesupport (= 5.2.3) bundler (>= 1.3.0) - railties (= 5.1.7) + railties (= 5.2.3) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.2) actionpack (~> 5.x, >= 5.0.1) @@ -711,12 +737,12 @@ GEM rails-i18n (5.1.1) i18n (>= 0.7, < 2) railties (>= 5.0, < 6) - railties (5.1.7) - actionpack (= 5.1.7) - activesupport (= 5.1.7) + railties (5.2.3) + actionpack (= 5.2.3) + activesupport (= 5.2.3) method_source rake (>= 0.8.7) - thor (>= 0.18.1, < 2.0) + thor (>= 0.19.0, < 2.0) rainbow (3.0.0) raindrops (0.19.0) rake (12.3.2) @@ -770,41 +796,41 @@ GEM retriable (3.1.2) rinku (2.0.0) rotp (2.1.2) - rouge (3.3.0) + rouge (3.5.1) rqrcode (0.7.0) chunky_png rqrcode-rails3 (0.1.7) rqrcode (>= 0.4.2) - rspec (3.7.0) - rspec-core (~> 3.7.0) - rspec-expectations (~> 3.7.0) - rspec-mocks (~> 3.7.0) - rspec-core (3.7.1) - rspec-support (~> 3.7.0) - rspec-expectations (3.7.0) + rspec (3.8.0) + rspec-core (~> 3.8.0) + rspec-expectations (~> 3.8.0) + rspec-mocks (~> 3.8.0) + rspec-core (3.8.2) + rspec-support (~> 3.8.0) + rspec-expectations (3.8.4) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.7.0) - rspec-mocks (3.7.0) + rspec-support (~> 3.8.0) + rspec-mocks (3.8.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.7.0) + rspec-support (~> 3.8.0) rspec-parameterized (0.4.2) binding_ninja (>= 0.2.3) parser proc_to_ast rspec (>= 2.13, < 4) unparser - rspec-rails (3.7.2) + rspec-rails (3.8.2) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.7.0) - rspec-expectations (~> 3.7.0) - rspec-mocks (~> 3.7.0) - rspec-support (~> 3.7.0) + rspec-core (~> 3.8.0) + rspec-expectations (~> 3.8.0) + rspec-mocks (~> 3.8.0) + rspec-support (~> 3.8.0) rspec-retry (0.6.1) rspec-core (> 3.3) rspec-set (0.1.3) - rspec-support (3.7.1) + rspec-support (3.8.2) rspec_junit_formatter (0.4.1) rspec-core (>= 2, < 4, != 2.12.0) rspec_profiling (0.0.5) @@ -943,6 +969,7 @@ GEM parslet (~> 1.8.0) toml-rb (1.0.0) citrus (~> 3.0, > 3.0) + tomlrb (1.2.8) truncato (0.7.11) htmlentities (~> 4.3.1) nokogiri (>= 1.7.0, <= 2.0) @@ -999,7 +1026,7 @@ GEM hashdiff webpack-rails (0.9.11) railties (>= 3.2.0) - websocket-driver (0.6.5) + websocket-driver (0.7.0) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.3) wikicloth (0.8.1) @@ -1025,9 +1052,9 @@ DEPENDENCIES akismet (~> 2.0) apollo_upload_server (~> 2.0.0.beta3) asana (~> 0.8.1) - asciidoctor (~> 1.5.8) + asciidoctor (~> 2.0.10) asciidoctor-include-ext (~> 0.3.1) - asciidoctor-plantuml (= 0.0.8) + asciidoctor-plantuml (= 0.0.9) attr_encrypted (~> 3.1.0) awesome_print babosa (~> 1.0.2) @@ -1056,6 +1083,7 @@ DEPENDENCIES creole (~> 0.5.0) database_cleaner (~> 1.7.0) deckar01-task_list (= 2.2.0) + default_value_for (~> 3.2.0) derailed_benchmarks device_detector devise (~> 4.6) @@ -1077,7 +1105,7 @@ DEPENDENCIES flipper-active_support_cache_store (~> 0.13.0) flowdock (~> 0.7) fog-aliyun (~> 0.3) - fog-aws (~> 3.3) + fog-aws (~> 3.5) fog-core (= 2.1.0) fog-google (~> 1.8) fog-local (~> 0.6) @@ -1091,9 +1119,8 @@ DEPENDENCIES gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly-proto (~> 1.32.0) + gitaly-proto (~> 1.37.0) github-markup (~> 1.7.0) - gitlab-default_value_for (~> 3.1.1) gitlab-labkit (~> 0.3.0) gitlab-markup (~> 1.7.0) gitlab-sidekiq-fetcher (~> 0.4.0) @@ -1109,6 +1136,7 @@ DEPENDENCIES grape_logging (~> 1.7) graphiql-rails (~> 1.4.10) graphql (~> 1.8.0) + graphql-docs (~> 1.6.0) grpc (~> 1.19.0) haml_lint (~> 0.31.0) hamlit (~> 2.8.8) @@ -1134,6 +1162,7 @@ DEPENDENCIES lograge (~> 0.5) loofah (~> 2.2) mail_room (~> 0.9.1) + mdl (~> 0.5.0) memory_profiler (~> 0.9) method_source (~> 0.8) mimemagic (~> 0.3.2) @@ -1142,7 +1171,7 @@ DEPENDENCIES mysql2 (~> 0.4.10) nakayoshi_fork (~> 0.0.4) net-ldap - net-ssh (~> 5.0) + net-ssh (~> 5.2) nokogiri (~> 1.10.3) oauth2 (~> 1.4) octokit (~> 4.9) @@ -1173,7 +1202,7 @@ DEPENDENCIES peek-redis (~> 1.2.0) pg (~> 1.1) premailer-rails (~> 1.9.7) - prometheus-client-mmap (~> 0.9.4) + prometheus-client-mmap (~> 0.9.8) pry-byebug (~> 3.5.1) pry-rails (~> 0.3.4) puma (~> 3.12) @@ -1184,7 +1213,7 @@ DEPENDENCIES rack-oauth2 (~> 1.9.3) rack-proxy (~> 0.6.0) rack-timeout - rails (= 5.1.7) + rails (= 5.2.3) rails-controller-testing rails-i18n (~> 5.1) rainbow (~> 3.0) @@ -1199,10 +1228,10 @@ DEPENDENCIES redis-rails (~> 5.0.2) request_store (~> 1.3) responders (~> 2.0) - rouge (~> 3.1) + rouge (~> 3.5) rqrcode-rails3 (~> 0.1.7) rspec-parameterized - rspec-rails (~> 3.7.0) + rspec-rails (~> 3.8.0) rspec-retry (~> 0.6.1) rspec-set (~> 0.1.3) rspec_junit_formatter diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix index 9559f4da985..8da7a3262c1 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix @@ -32,10 +32,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hafk0i6nky7c9m95757y2xxhrilww332d21nf9qn46lxnsa2i63"; + sha256 = "04wd9rf8sglrqc8jz49apqcxbi51gdj7l1apf5qr4i86iddk6pkm"; type = "gem"; }; - version = "5.1.7"; + version = "5.2.3"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"]; @@ -43,10 +43,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gpv8lv8vk4a36hwdvg2hwbzdcism8hzxxvanmc7ffz8y11y0lzh"; + sha256 = "15laym06zcm2021qdhlyr6y9jn1marw436i89hcxqg14a8zvyvwa"; type = "gem"; }; - version = "5.1.7"; + version = "5.2.3"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -54,10 +54,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zyi3dc50ii2msdkawaf11y4xw645ig57ha2jfnr8lpr8s1nlh52"; + sha256 = "1s2iay17i2k0xx36cmnpbrmr5w6x70jk7fq1d8w70xcdw5chm0w1"; type = "gem"; }; - version = "5.1.7"; + version = "5.2.3"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -65,10 +65,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0i2j580njb767yhf0k5ih3qqg38ybiah80ai8dsr6kjjw35aj747"; + sha256 = "1v49rgf8305grqf6gq7qa47qhamr369igyy0giycz60x86afyr4h"; type = "gem"; }; - version = "5.1.7"; + version = "5.2.3"; }; activejob = { dependencies = ["activesupport" "globalid"]; @@ -76,10 +76,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0p55853riiq9irmnm76yi9f8shhg260mrg9dikqb19pwsy8lcjpl"; + sha256 = "17vizibxbsli5yppgrvmw13wj7a9xy19s5nqxf1k23bbk2s5b87s"; type = "gem"; }; - version = "5.1.7"; + version = "5.2.3"; }; activemodel = { dependencies = ["activesupport"]; @@ -87,10 +87,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07pw833i6m2i7fjnxgz5jba4dhsl47qx83hfyzl560wmkhyv16vh"; + sha256 = "0mghh9di8011ara9h1r5a216yzk1vjm9r3p0gdvdi8j1zmkl6k6h"; type = "gem"; }; - version = "5.1.7"; + version = "5.2.3"; }; activerecord = { dependencies = ["activemodel" "activesupport" "arel"]; @@ -98,10 +98,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0i45zqfci974xrza756pvyrjdc7a6q9py87944z5mh75npvln7ss"; + sha256 = "0d6036f592803iyvp6bw98p3sg638mia5dbw19lvachx6jgzfvpw"; type = "gem"; }; - version = "5.1.7"; + version = "5.2.3"; }; activerecord-explain-analyze = { dependencies = ["activerecord" "pg"]; @@ -123,16 +123,27 @@ }; version = "1.0"; }; + activestorage = { + dependencies = ["actionpack" "activerecord" "marcel"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04is6ipjqw1f337i8pm8w5bd99rpygqfd0fzzxkr7jd308ggmsjk"; + type = "gem"; + }; + version = "5.2.3"; + }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; groups = ["default" "development" "mysql" "postgres" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0znhiy90hdlx66jqhaycin4qrphrymsw68c36a1an7g481zvfv91"; + sha256 = "110vp4frgkw3mpzlmshg2f2ig09cknls2w68ym1r1s39d01v0mi8"; type = "gem"; }; - version = "5.1.7"; + version = "5.2.3"; }; acts-as-taggable-on = { dependencies = ["activerecord"]; @@ -195,10 +206,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nw0qbc6ph625p6n3maqq9f527vz3nbl0hk72fbyka8jzsmplxzl"; + sha256 = "1jk7wlmkr61f6g36w9s2sn46nmdg6wn2jfssrhbhirv5x9n95nk0"; type = "gem"; }; - version = "8.0.0"; + version = "9.0.0"; }; asana = { dependencies = ["faraday" "faraday_middleware" "faraday_middleware-multi_json" "oauth2"]; @@ -210,12 +221,14 @@ version = "0.8.1"; }; asciidoctor = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qld3a1pbcjvs8lbxp95iz83bfmg5scmnf8q3rklinmdmhzakslx"; + sha256 = "1b2ajs3sabl0s27r7lhwkacw0yn0zfk4jpmidg9l8lzp2qlgjgbz"; type = "gem"; }; - version = "1.5.8"; + version = "2.0.10"; }; asciidoctor-include-ext = { dependencies = ["asciidoctor"]; @@ -230,12 +243,14 @@ }; asciidoctor-plantuml = { dependencies = ["asciidoctor"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x092ldl8p7svczg4lnrnp0h918acnflh7jz5qwv40ksh1fflqna"; + sha256 = "0lzxj16w7s3w0wnlpg8lfs9v2xxk3x3c1skynqm1sms7rjhnhlnb"; type = "gem"; }; - version = "0.0.8"; + version = "0.0.9"; }; ast = { source = { @@ -706,6 +721,17 @@ }; version = "0.1.0"; }; + default_value_for = { + dependencies = ["activerecord"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xj9d1y2fk3kxfm1kyiwasjpw6r1w7c1xjx26sm3c33xhmz57fla"; + type = "gem"; + }; + version = "3.2.0"; + }; derailed_benchmarks = { dependencies = ["benchmark-ips" "get_process_mem" "heapy" "memory_profiler" "rack" "rake" "thor"]; groups = ["development" "test"]; @@ -918,6 +944,17 @@ }; version = "0.9.0"; }; + extended-markdown-filter = { + dependencies = ["html-pipeline"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "17mi5qayplfaa6p3mfwa36il84ixr0bimqvl0q73lw5i81blp126"; + type = "gem"; + }; + version = "0.6.0"; + }; factory_bot = { dependencies = ["activesupport"]; source = { @@ -1041,12 +1078,14 @@ }; fog-aws = { dependencies = ["fog-core" "fog-json" "fog-xml" "ipaddress"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zprxg0spvkkri1jf40zg3rfr5h2gq6009d7l36lifpvhjn658cs"; + sha256 = "086kyvdhf1k8nk7f4gmybjc3k0m88f9pw99frddcy1w96pj5kyg4"; type = "gem"; }; - version = "3.3.0"; + version = "3.5.2"; }; fog-core = { dependencies = ["builder" "excon" "formatador" "mime-types"]; @@ -1159,6 +1198,16 @@ }; version = "2.2.0"; }; + gemoji = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0vgklpmhdz98xayln5hhqv4ffdyrglzwdixkn5gsk9rj94pkymc0"; + type = "gem"; + }; + version = "3.0.1"; + }; gemojione = { dependencies = ["json"]; source = { @@ -1211,10 +1260,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0glqy22p0xfaa3kvvrba04pj1dva8wpzlvhka37cvlqq95djcy19"; + sha256 = "1lx2cids0r175agdz3wa25ivi17vxx2kryb2v29gdsrpg3pyyq7j"; type = "gem"; }; - version = "1.32.0"; + version = "1.37.0"; }; github-markup = { source = { @@ -1224,15 +1273,6 @@ }; version = "1.7.0"; }; - gitlab-default_value_for = { - dependencies = ["activerecord"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0qqjf7nxmwxnkdlrgbnby8wjckaj2s5yna96avgb7fwm0h90f1sn"; - type = "gem"; - }; - version = "3.1.1"; - }; gitlab-labkit = { dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing"]; groups = ["default"]; @@ -1408,6 +1448,17 @@ }; version = "1.8.1"; }; + graphql-docs = { + dependencies = ["commonmarker" "escape_utils" "extended-markdown-filter" "gemoji" "graphql" "html-pipeline" "sass"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12wzsikbn54b2hcv100hz7isq5gdjm5w5b8xya64ra5sw6sabq8d"; + type = "gem"; + }; + version = "1.6.0"; + }; grpc = { dependencies = ["google-protobuf" "googleapis-common-protos-types"]; groups = ["default"]; @@ -1757,6 +1808,16 @@ }; version = "1.17.0"; }; + kramdown = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1n1c4jmrh5ig8iv1rw81s4mw4xsp4v97hvf8zkigv4hn5h542qjq"; + type = "gem"; + }; + version = "1.17.0"; + }; kubeclient = { dependencies = ["http" "recursive-open-struct" "rest-client"]; source = { @@ -1858,6 +1919,28 @@ }; version = "0.9.1"; }; + marcel = { + dependencies = ["mimemagic"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nxbjmcyg8vlw6zwagf17l9y2mwkagmmkg95xybpn4bmf3rfnksx"; + type = "gem"; + }; + version = "0.3.3"; + }; + mdl = { + dependencies = ["kramdown" "mixlib-cli" "mixlib-config"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "047hp8z1ma630wp38bm1giklkf385rp6wly8aidn825q831w2g4i"; + type = "gem"; + }; + version = "0.5.0"; + }; memoist = { source = { remotes = ["https://rubygems.org"]; @@ -1952,6 +2035,27 @@ }; version = "5.11.3"; }; + mixlib-cli = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0647msh7kp7lzyf6m72g6snpirvhimjm22qb8xgv9pdhbcrmcccp"; + type = "gem"; + }; + version = "1.7.0"; + }; + mixlib-config = { + dependencies = ["tomlrb"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1gm6yj9cbbgsl9x4xqxga0vz5w0ksq2jnq1wj8hvgm5c4wfcrswb"; + type = "gem"; + }; + version = "2.2.18"; + }; msgpack = { groups = ["default" "development" "test"]; platforms = []; @@ -2028,12 +2132,14 @@ version = "0.16.0"; }; net-ssh = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hj2i8rk5wb6235r5n19in1hkrp1fbz2bf40xmagavb5ahv7205w"; + sha256 = "101wd2px9lady54aqmkibvy4j62zk32w0rjz4vnigyg974fsga40"; type = "gem"; }; - version = "5.0.1"; + version = "5.2.0"; }; netrc = { source = { @@ -2492,12 +2598,14 @@ version = "0.0.3"; }; prometheus-client-mmap = { + groups = ["metrics"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14ww8c2qy43jw3fzmq54hsljmqmlx9a7zg9sv6ddw48qy118ls10"; + sha256 = "01f1zkpi7qsmgmk17fpq6ck7jn64sa9afsq20vc5k9f6mpyqkncd"; type = "gem"; }; - version = "0.9.4"; + version = "0.9.8"; }; pry = { dependencies = ["coderay" "method_source"]; @@ -2656,15 +2764,15 @@ version = "0.5.1"; }; rails = { - dependencies = ["actioncable" "actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activesupport" "railties" "sprockets-rails"]; + dependencies = ["actioncable" "actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties" "sprockets-rails"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xfwfhza6lflywaynyxk8jd9ff1cqj0adrh6qnggkqvd8iy54zwd"; + sha256 = "1p7cszi3n9ksxchxnccmz61pd1i3rjg4813dsdinsm8xm5k1pdgr"; type = "gem"; }; - version = "5.1.7"; + version = "5.2.3"; }; rails-controller-testing = { dependencies = ["actionpack" "actionview" "activesupport"]; @@ -2708,10 +2816,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wiyswlln344nd72ynn2hm2s1w9g7cnpdff3fphcya7nhavfnx68"; + sha256 = "1gn9fwb5wm08fbj7zpilqgblfl315l5b7pg4jsvxlizvrzg8h8q4"; type = "gem"; }; - version = "5.1.7"; + version = "5.2.3"; }; rainbow = { source = { @@ -2955,12 +3063,14 @@ version = "2.1.2"; }; rouge = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1digsi2s8wyzx8vsqcxasw205lg6s7izx8jypl8rrpjwshmv83ql"; + sha256 = "0yfhazlhjc4abgzhkgq8zqmdphvkh52211widkl4zhsbhqh8wg2q"; type = "gem"; }; - version = "3.3.0"; + version = "3.5.1"; }; rqrcode = { dependencies = ["chunky_png"]; @@ -2982,39 +3092,47 @@ }; rspec = { dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0134g96wzxjlig2gxzd240gm2dxfw8izcyi2h6hjmr40syzcyx01"; + sha256 = "15ppasvb9qrscwlyjz67ppw1lnxiqnkzx5vkx1bd8x5n3dhikxc3"; type = "gem"; }; - version = "3.7.0"; + version = "3.8.0"; }; rspec-core = { dependencies = ["rspec-support"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zvjbymx3avxm3lf8v4gka3a862vnaxldmwvp6767bpy48nhnvjj"; + sha256 = "0spjgmd3yx6q28q950r32bi0cs8h2si53zn6rq8s7n1i4zp4zwbf"; type = "gem"; }; - version = "3.7.1"; + version = "3.8.2"; }; rspec-expectations = { dependencies = ["diff-lcs" "rspec-support"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fw06wm8jdj8k7wrb8xmzj0fr1wjyb0ya13x31hidnyblm41hmvy"; + sha256 = "0x3iddjjaramqb0yb51c79p2qajgi9wb5b59bzv25czddigyk49r"; type = "gem"; }; - version = "3.7.0"; + version = "3.8.4"; }; rspec-mocks = { dependencies = ["diff-lcs" "rspec-support"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b02ya3qhqgmcywqv4570dlhav70r656f7dmvwg89whpkq1z1xr3"; + sha256 = "12zplnsv4p6wvvxsk8xn6nm87a5qadxlkk497zlxfczd0jfawrni"; type = "gem"; }; - version = "3.7.0"; + version = "3.8.1"; }; rspec-parameterized = { dependencies = ["binding_ninja" "parser" "proc_to_ast" "rspec" "unparser"]; @@ -3029,12 +3147,14 @@ }; rspec-rails = { dependencies = ["actionpack" "activesupport" "railties" "rspec-core" "rspec-expectations" "rspec-mocks" "rspec-support"]; + groups = ["development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cdcnbv5dppwy3b4jdp5a0wd9m07a8wlqwb9yazn8i7k1k2mwgvx"; + sha256 = "1pf6n9l4sw1arlax1bdbm1znsvl8cgna2n6k6yk1bi8vz2n73ls1"; type = "gem"; }; - version = "3.7.2"; + version = "3.8.2"; }; rspec-retry = { dependencies = ["rspec-core"]; @@ -3056,12 +3176,14 @@ version = "0.1.3"; }; rspec-support = { + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nl30xb6jmcl0awhqp6jycl01wdssblifwy921phfml70rd9flj1"; + sha256 = "139mbhfdr10flm2ffryvxkyqgqs1gjdclc1xhyh7i7njfqayxk7g"; type = "gem"; }; - version = "3.7.1"; + version = "3.8.2"; }; rspec_junit_formatter = { dependencies = ["rspec-core"]; @@ -3634,6 +3756,16 @@ }; version = "1.0.0"; }; + tomlrb = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0g28ssfal6vry3cmhy509ba3vi5d5aggz1gnffnvvmc8ml8vkpiv"; + type = "gem"; + }; + version = "1.2.8"; + }; truncato = { dependencies = ["htmlentities" "nokogiri"]; source = { @@ -3837,12 +3969,14 @@ }; websocket-driver = { dependencies = ["websocket-extensions"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1943442yllhldh9dbp374x2q39cxa49xrm28nb78b7mfbv3y195l"; + sha256 = "1551k3fs3kkb3ghqfj3n5lps0ikb9pyrdnzmvgfdxy8574n4g1dn"; type = "gem"; }; - version = "0.6.5"; + version = "0.7.0"; }; websocket-extensions = { source = { @@ -3888,4 +4022,4 @@ }; version = "3.2.0"; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile index 816f16cba87..62ee2990dfa 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'rails', '5.1.7' +gem 'rails', '5.2.3' # Improves copy-on-write performance for MRI gem 'nakayoshi_fork', '~> 0.0.4' @@ -11,7 +11,7 @@ gem 'responders', '~> 2.0' gem 'sprockets', '~> 3.7.0' # Default values for AR models -gem 'gitlab-default_value_for', '~> 3.1.1', require: 'default_value_for' +gem 'default_value_for', '~> 3.2.0' # Supported DBs gem 'mysql2', '~> 0.4.10', group: :mysql @@ -87,6 +87,7 @@ gem 'rack-cors', '~> 1.0.0', require: 'rack/cors' gem 'graphql', '~> 1.8.0' gem 'graphiql-rails', '~> 1.4.10' gem 'apollo_upload_server', '~> 2.0.0.beta3' +gem 'graphql-docs', '~> 1.6.0', group: [:development, :test] # Disable strong_params so that Mash does not respond to :permitted? gem 'hashie-forbidden_attributes' @@ -102,7 +103,7 @@ gem 'carrierwave', '~> 1.3' gem 'mini_magick' # for backups -gem 'fog-aws', '~> 3.3' +gem 'fog-aws', '~> 3.5' # Locked until fog-google resolves https://github.com/fog/fog-google/issues/421. # Also see config/initializers/fog_core_patch.rb. gem 'fog-core', '= 2.1.0' @@ -139,10 +140,10 @@ gem 'rdoc', '~> 6.0' gem 'org-ruby', '~> 0.9.12' gem 'creole', '~> 0.5.0' gem 'wikicloth', '0.8.1' -gem 'asciidoctor', '~> 1.5.8' +gem 'asciidoctor', '~> 2.0.10' gem 'asciidoctor-include-ext', '~> 0.3.1', require: false -gem 'asciidoctor-plantuml', '0.0.8' -gem 'rouge', '~> 3.1' +gem 'asciidoctor-plantuml', '0.0.9' +gem 'rouge', '~> 3.5' gem 'truncato', '~> 0.7.11' gem 'bootstrap_form', '~> 4.2.0' gem 'nokogiri', '~> 1.10.3' @@ -221,7 +222,7 @@ gem 'discordrb-webhooks-blackst0ne', '~> 3.3', require: false # HipChat integration gem 'hipchat', '~> 1.5.0' -# JIRA integration +# Jira integration gem 'jira-ruby', '~> 1.4' # Flowdock integration @@ -315,13 +316,16 @@ gem 'peek-redis', '~> 1.2.0' # Snowplow events tracking gem 'snowplow-tracker', '~> 0.6.1' +# Memory benchmarks +gem 'derailed_benchmarks', require: false + # Metrics group :metrics do gem 'method_source', '~> 0.8', require: false gem 'influxdb', '~> 0.2', require: false # Prometheus - gem 'prometheus-client-mmap', '~> 0.9.4' + gem 'prometheus-client-mmap', '~> 0.9.8' gem 'raindrops', '~> 0.18' end @@ -351,7 +355,7 @@ group :development, :test do gem 'database_cleaner', '~> 1.7.0' gem 'factory_bot_rails', '~> 4.8.2' - gem 'rspec-rails', '~> 3.7.0' + gem 'rspec-rails', '~> 3.8.0' gem 'rspec-retry', '~> 0.6.1' gem 'rspec_profiling', '~> 0.0.5' gem 'rspec-set', '~> 0.1.3' @@ -380,6 +384,7 @@ group :development, :test do gem 'haml_lint', '~> 0.31.0', require: false gem 'simplecov', '~> 0.16.1', require: false gem 'bundler-audit', '~> 0.5.0', require: false + gem 'mdl', '~> 0.5.0', require: false gem 'benchmark-ips', '~> 2.3.0', require: false @@ -389,7 +394,6 @@ group :development, :test do gem 'activerecord_sane_schema_dumper', '1.0' gem 'stackprof', '~> 0.2.10', require: false - gem 'derailed_benchmarks', require: false gem 'simple_po_parser', '~> 1.1.2', require: false @@ -435,7 +439,7 @@ gem 'sys-filesystem', '~> 1.1.6' gem 'net-ntp' # SSH host key support -gem 'net-ssh', '~> 5.0' +gem 'net-ssh', '~> 5.2' gem 'sshkey', '~> 2.0' # Required for ED25519 SSH host key support @@ -445,7 +449,7 @@ group :ed25519 do end # Gitaly GRPC client -gem 'gitaly-proto', '~> 1.32.0', require: 'gitaly' +gem 'gitaly-proto', '~> 1.37.0', require: 'gitaly' gem 'grpc', '~> 1.19.0' diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock index cc0f04a4553..0a6d7fe1370 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock @@ -6,44 +6,48 @@ GEM ace-rails-ap (4.1.2) acme-client (2.0.2) faraday (~> 0.9, >= 0.9.1) - actioncable (5.1.7) - actionpack (= 5.1.7) + actioncable (5.2.3) + actionpack (= 5.2.3) nio4r (~> 2.0) - websocket-driver (~> 0.6.1) - actionmailer (5.1.7) - actionpack (= 5.1.7) - actionview (= 5.1.7) - activejob (= 5.1.7) + websocket-driver (>= 0.6.1) + actionmailer (5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.1.7) - actionview (= 5.1.7) - activesupport (= 5.1.7) + actionpack (5.2.3) + actionview (= 5.2.3) + activesupport (= 5.2.3) rack (~> 2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.1.7) - activesupport (= 5.1.7) + actionview (5.2.3) + activesupport (= 5.2.3) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.1.7) - activesupport (= 5.1.7) + activejob (5.2.3) + activesupport (= 5.2.3) globalid (>= 0.3.6) - activemodel (5.1.7) - activesupport (= 5.1.7) - activerecord (5.1.7) - activemodel (= 5.1.7) - activesupport (= 5.1.7) - arel (~> 8.0) + activemodel (5.2.3) + activesupport (= 5.2.3) + activerecord (5.2.3) + activemodel (= 5.2.3) + activesupport (= 5.2.3) + arel (>= 9.0) activerecord-explain-analyze (0.1.0) activerecord (>= 4) pg activerecord_sane_schema_dumper (1.0) rails (>= 5, < 6) - activesupport (5.1.7) + activestorage (5.2.3) + actionpack (= 5.2.3) + activerecord (= 5.2.3) + marcel (~> 0.3.1) + activesupport (5.2.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -60,17 +64,17 @@ GEM apollo_upload_server (2.0.0.beta.3) graphql (>= 1.8) rails (>= 4.2) - arel (8.0.0) + arel (9.0.0) asana (0.8.1) faraday (~> 0.9) faraday_middleware (~> 0.9) faraday_middleware-multi_json (~> 0.0) oauth2 (~> 1.0) - asciidoctor (1.5.8) + asciidoctor (2.0.10) asciidoctor-include-ext (0.3.1) asciidoctor (>= 1.5.6, < 3.0.0) - asciidoctor-plantuml (0.0.8) - asciidoctor (~> 1.5) + asciidoctor-plantuml (0.0.9) + asciidoctor (>= 1.5.6, < 3.0.0) ast (2.4.0) atomic (1.1.99) attr_encrypted (3.1.0) @@ -172,6 +176,8 @@ GEM html-pipeline declarative (0.0.10) declarative-option (0.1.0) + default_value_for (3.2.0) + activerecord (>= 3.2.0, < 6.0) derailed_benchmarks (1.3.5) benchmark-ips (~> 2) get_process_mem (~> 0) @@ -236,6 +242,8 @@ GEM excon (0.62.0) execjs (2.6.0) expression_parser (0.9.0) + extended-markdown-filter (0.6.0) + html-pipeline (~> 2.0) factory_bot (4.8.2) activesupport (>= 3.0.0) factory_bot_rails (4.8.2) @@ -270,7 +278,7 @@ GEM fog-json ipaddress (~> 0.8) xml-simple (~> 1.1) - fog-aws (3.3.0) + fog-aws (3.5.2) fog-core (~> 2.1) fog-json (~> 1.1) fog-xml (~> 0.1) @@ -313,6 +321,7 @@ GEM fuubar (2.2.0) rspec-core (~> 3.0) ruby-progressbar (~> 1.4) + gemoji (3.0.1) gemojione (3.3.0) json get_process_mem (0.2.3) @@ -326,11 +335,9 @@ GEM gettext_i18n_rails (>= 0.7.1) po_to_json (>= 1.0.0) rails (>= 3.2.0) - gitaly-proto (1.32.0) + gitaly-proto (1.37.0) grpc (~> 1.0) github-markup (1.7.0) - gitlab-default_value_for (3.1.1) - activerecord (>= 3.2.0, < 6.0) gitlab-labkit (0.3.0) actionpack (~> 5) activesupport (~> 5) @@ -396,6 +403,14 @@ GEM railties sprockets-rails graphql (1.8.1) + graphql-docs (1.6.0) + commonmarker (~> 0.16) + escape_utils (~> 1.2) + extended-markdown-filter (~> 0.4) + gemoji (~> 3.0) + graphql (~> 1.6) + html-pipeline (~> 2.8) + sass (~> 3.4) grpc (1.19.0) google-protobuf (~> 3.1) googleapis-common-protos-types (~> 1.0.0) @@ -488,6 +503,7 @@ GEM kgio (2.11.2) knapsack (1.17.0) rake + kramdown (1.17.0) kubeclient (4.2.2) http (~> 3.0) recursive-open-struct (~> 1.0, >= 1.0.4) @@ -521,6 +537,12 @@ GEM mail (2.7.1) mini_mime (>= 0.1.1) mail_room (0.9.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + mdl (0.5.0) + kramdown (~> 1.12, >= 1.12.0) + mixlib-cli (~> 1.7, >= 1.7.0) + mixlib-config (~> 2.2, >= 2.2.1) memoist (0.16.0) memoizable (0.4.2) thread_safe (~> 0.3, >= 0.3.1) @@ -534,6 +556,9 @@ GEM mini_mime (1.0.1) mini_portile2 (2.4.0) minitest (5.11.3) + mixlib-cli (1.7.0) + mixlib-config (2.2.18) + tomlrb msgpack (1.2.10) multi_json (1.13.1) multi_xml (0.6.0) @@ -546,7 +571,7 @@ GEM net-dns (0.9.0) net-ldap (0.16.0) net-ntp (2.1.3) - net-ssh (5.0.1) + net-ssh (5.2.0) netrc (0.11.0) nio4r (2.3.1) nokogiri (1.10.3) @@ -683,7 +708,7 @@ GEM parser unparser procto (0.0.3) - prometheus-client-mmap (0.9.4) + prometheus-client-mmap (0.9.8) pry (0.11.3) coderay (~> 1.1.0) method_source (~> 0.9.0) @@ -718,17 +743,18 @@ GEM rack-test (1.1.0) rack (>= 1.0, < 3) rack-timeout (0.5.1) - rails (5.1.7) - actioncable (= 5.1.7) - actionmailer (= 5.1.7) - actionpack (= 5.1.7) - actionview (= 5.1.7) - activejob (= 5.1.7) - activemodel (= 5.1.7) - activerecord (= 5.1.7) - activesupport (= 5.1.7) + rails (5.2.3) + actioncable (= 5.2.3) + actionmailer (= 5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + activemodel (= 5.2.3) + activerecord (= 5.2.3) + activestorage (= 5.2.3) + activesupport (= 5.2.3) bundler (>= 1.3.0) - railties (= 5.1.7) + railties (= 5.2.3) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.2) actionpack (~> 5.x, >= 5.0.1) @@ -742,12 +768,12 @@ GEM rails-i18n (5.1.1) i18n (>= 0.7, < 2) railties (>= 5.0, < 6) - railties (5.1.7) - actionpack (= 5.1.7) - activesupport (= 5.1.7) + railties (5.2.3) + actionpack (= 5.2.3) + activesupport (= 5.2.3) method_source rake (>= 0.8.7) - thor (>= 0.18.1, < 2.0) + thor (>= 0.19.0, < 2.0) rainbow (3.0.0) raindrops (0.19.0) rake (12.3.2) @@ -801,41 +827,41 @@ GEM retriable (3.1.2) rinku (2.0.0) rotp (2.1.2) - rouge (3.3.0) + rouge (3.5.1) rqrcode (0.7.0) chunky_png rqrcode-rails3 (0.1.7) rqrcode (>= 0.4.2) - rspec (3.7.0) - rspec-core (~> 3.7.0) - rspec-expectations (~> 3.7.0) - rspec-mocks (~> 3.7.0) - rspec-core (3.7.1) - rspec-support (~> 3.7.0) - rspec-expectations (3.7.0) + rspec (3.8.0) + rspec-core (~> 3.8.0) + rspec-expectations (~> 3.8.0) + rspec-mocks (~> 3.8.0) + rspec-core (3.8.2) + rspec-support (~> 3.8.0) + rspec-expectations (3.8.4) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.7.0) - rspec-mocks (3.7.0) + rspec-support (~> 3.8.0) + rspec-mocks (3.8.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.7.0) + rspec-support (~> 3.8.0) rspec-parameterized (0.4.2) binding_ninja (>= 0.2.3) parser proc_to_ast rspec (>= 2.13, < 4) unparser - rspec-rails (3.7.2) + rspec-rails (3.8.2) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.7.0) - rspec-expectations (~> 3.7.0) - rspec-mocks (~> 3.7.0) - rspec-support (~> 3.7.0) + rspec-core (~> 3.8.0) + rspec-expectations (~> 3.8.0) + rspec-mocks (~> 3.8.0) + rspec-support (~> 3.8.0) rspec-retry (0.6.1) rspec-core (> 3.3) rspec-set (0.1.3) - rspec-support (3.7.1) + rspec-support (3.8.2) rspec_junit_formatter (0.4.1) rspec-core (>= 2, < 4, != 2.12.0) rspec_profiling (0.0.5) @@ -976,6 +1002,7 @@ GEM parslet (~> 1.8.0) toml-rb (1.0.0) citrus (~> 3.0, > 3.0) + tomlrb (1.2.8) truncato (0.7.11) htmlentities (~> 4.3.1) nokogiri (>= 1.7.0, <= 2.0) @@ -1032,7 +1059,7 @@ GEM hashdiff webpack-rails (0.9.11) railties (>= 3.2.0) - websocket-driver (0.6.5) + websocket-driver (0.7.0) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.3) wikicloth (0.8.1) @@ -1058,9 +1085,9 @@ DEPENDENCIES akismet (~> 2.0) apollo_upload_server (~> 2.0.0.beta3) asana (~> 0.8.1) - asciidoctor (~> 1.5.8) + asciidoctor (~> 2.0.10) asciidoctor-include-ext (~> 0.3.1) - asciidoctor-plantuml (= 0.0.8) + asciidoctor-plantuml (= 0.0.9) attr_encrypted (~> 3.1.0) awesome_print aws-sdk @@ -1090,6 +1117,7 @@ DEPENDENCIES creole (~> 0.5.0) database_cleaner (~> 1.7.0) deckar01-task_list (= 2.2.0) + default_value_for (~> 3.2.0) derailed_benchmarks device_detector devise (~> 4.6) @@ -1115,7 +1143,7 @@ DEPENDENCIES flipper-active_support_cache_store (~> 0.13.0) flowdock (~> 0.7) fog-aliyun (~> 0.3) - fog-aws (~> 3.3) + fog-aws (~> 3.5) fog-core (= 2.1.0) fog-google (~> 1.8) fog-local (~> 0.6) @@ -1129,9 +1157,8 @@ DEPENDENCIES gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly-proto (~> 1.32.0) + gitaly-proto (~> 1.37.0) github-markup (~> 1.7.0) - gitlab-default_value_for (~> 3.1.1) gitlab-labkit (~> 0.3.0) gitlab-license (~> 1.0) gitlab-markup (~> 1.7.0) @@ -1148,6 +1175,7 @@ DEPENDENCIES grape_logging (~> 1.7) graphiql-rails (~> 1.4.10) graphql (~> 1.8.0) + graphql-docs (~> 1.6.0) grpc (~> 1.19.0) gssapi haml_lint (~> 0.31.0) @@ -1174,6 +1202,7 @@ DEPENDENCIES lograge (~> 0.5) loofah (~> 2.2) mail_room (~> 0.9.1) + mdl (~> 0.5.0) memory_profiler (~> 0.9) method_source (~> 0.8) mimemagic (~> 0.3.2) @@ -1184,7 +1213,7 @@ DEPENDENCIES net-dns (~> 0.9.0) net-ldap net-ntp - net-ssh (~> 5.0) + net-ssh (~> 5.2) nokogiri (~> 1.10.3) oauth2 (~> 1.4) octokit (~> 4.9) @@ -1215,7 +1244,7 @@ DEPENDENCIES peek-redis (~> 1.2.0) pg (~> 1.1) premailer-rails (~> 1.9.7) - prometheus-client-mmap (~> 0.9.4) + prometheus-client-mmap (~> 0.9.8) pry-byebug (~> 3.5.1) pry-rails (~> 0.3.4) puma (~> 3.12) @@ -1226,7 +1255,7 @@ DEPENDENCIES rack-oauth2 (~> 1.9.3) rack-proxy (~> 0.6.0) rack-timeout - rails (= 5.1.7) + rails (= 5.2.3) rails-controller-testing rails-i18n (~> 5.1) rainbow (~> 3.0) @@ -1241,10 +1270,10 @@ DEPENDENCIES redis-rails (~> 5.0.2) request_store (~> 1.3) responders (~> 2.0) - rouge (~> 3.1) + rouge (~> 3.5) rqrcode-rails3 (~> 0.1.7) rspec-parameterized - rspec-rails (~> 3.7.0) + rspec-rails (~> 3.8.0) rspec-retry (~> 0.6.1) rspec-set (~> 0.1.3) rspec_junit_formatter diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix index b93f6d75e89..8050743ab25 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix @@ -32,10 +32,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hafk0i6nky7c9m95757y2xxhrilww332d21nf9qn46lxnsa2i63"; + sha256 = "04wd9rf8sglrqc8jz49apqcxbi51gdj7l1apf5qr4i86iddk6pkm"; type = "gem"; }; - version = "5.1.7"; + version = "5.2.3"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"]; @@ -43,10 +43,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gpv8lv8vk4a36hwdvg2hwbzdcism8hzxxvanmc7ffz8y11y0lzh"; + sha256 = "15laym06zcm2021qdhlyr6y9jn1marw436i89hcxqg14a8zvyvwa"; type = "gem"; }; - version = "5.1.7"; + version = "5.2.3"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -54,10 +54,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zyi3dc50ii2msdkawaf11y4xw645ig57ha2jfnr8lpr8s1nlh52"; + sha256 = "1s2iay17i2k0xx36cmnpbrmr5w6x70jk7fq1d8w70xcdw5chm0w1"; type = "gem"; }; - version = "5.1.7"; + version = "5.2.3"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -65,10 +65,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0i2j580njb767yhf0k5ih3qqg38ybiah80ai8dsr6kjjw35aj747"; + sha256 = "1v49rgf8305grqf6gq7qa47qhamr369igyy0giycz60x86afyr4h"; type = "gem"; }; - version = "5.1.7"; + version = "5.2.3"; }; activejob = { dependencies = ["activesupport" "globalid"]; @@ -76,10 +76,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0p55853riiq9irmnm76yi9f8shhg260mrg9dikqb19pwsy8lcjpl"; + sha256 = "17vizibxbsli5yppgrvmw13wj7a9xy19s5nqxf1k23bbk2s5b87s"; type = "gem"; }; - version = "5.1.7"; + version = "5.2.3"; }; activemodel = { dependencies = ["activesupport"]; @@ -87,10 +87,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07pw833i6m2i7fjnxgz5jba4dhsl47qx83hfyzl560wmkhyv16vh"; + sha256 = "0mghh9di8011ara9h1r5a216yzk1vjm9r3p0gdvdi8j1zmkl6k6h"; type = "gem"; }; - version = "5.1.7"; + version = "5.2.3"; }; activerecord = { dependencies = ["activemodel" "activesupport" "arel"]; @@ -98,10 +98,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0i45zqfci974xrza756pvyrjdc7a6q9py87944z5mh75npvln7ss"; + sha256 = "0d6036f592803iyvp6bw98p3sg638mia5dbw19lvachx6jgzfvpw"; type = "gem"; }; - version = "5.1.7"; + version = "5.2.3"; }; activerecord-explain-analyze = { dependencies = ["activerecord" "pg"]; @@ -123,16 +123,27 @@ }; version = "1.0"; }; + activestorage = { + dependencies = ["actionpack" "activerecord" "marcel"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04is6ipjqw1f337i8pm8w5bd99rpygqfd0fzzxkr7jd308ggmsjk"; + type = "gem"; + }; + version = "5.2.3"; + }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; groups = ["default" "development" "mysql" "postgres" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0znhiy90hdlx66jqhaycin4qrphrymsw68c36a1an7g481zvfv91"; + sha256 = "110vp4frgkw3mpzlmshg2f2ig09cknls2w68ym1r1s39d01v0mi8"; type = "gem"; }; - version = "5.1.7"; + version = "5.2.3"; }; acts-as-taggable-on = { dependencies = ["activerecord"]; @@ -195,10 +206,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nw0qbc6ph625p6n3maqq9f527vz3nbl0hk72fbyka8jzsmplxzl"; + sha256 = "1jk7wlmkr61f6g36w9s2sn46nmdg6wn2jfssrhbhirv5x9n95nk0"; type = "gem"; }; - version = "8.0.0"; + version = "9.0.0"; }; asana = { dependencies = ["faraday" "faraday_middleware" "faraday_middleware-multi_json" "oauth2"]; @@ -210,12 +221,14 @@ version = "0.8.1"; }; asciidoctor = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qld3a1pbcjvs8lbxp95iz83bfmg5scmnf8q3rklinmdmhzakslx"; + sha256 = "1b2ajs3sabl0s27r7lhwkacw0yn0zfk4jpmidg9l8lzp2qlgjgbz"; type = "gem"; }; - version = "1.5.8"; + version = "2.0.10"; }; asciidoctor-include-ext = { dependencies = ["asciidoctor"]; @@ -230,12 +243,14 @@ }; asciidoctor-plantuml = { dependencies = ["asciidoctor"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x092ldl8p7svczg4lnrnp0h918acnflh7jz5qwv40ksh1fflqna"; + sha256 = "0lzxj16w7s3w0wnlpg8lfs9v2xxk3x3c1skynqm1sms7rjhnhlnb"; type = "gem"; }; - version = "0.0.8"; + version = "0.0.9"; }; ast = { source = { @@ -751,6 +766,17 @@ }; version = "0.1.0"; }; + default_value_for = { + dependencies = ["activerecord"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xj9d1y2fk3kxfm1kyiwasjpw6r1w7c1xjx26sm3c33xhmz57fla"; + type = "gem"; + }; + version = "3.2.0"; + }; derailed_benchmarks = { dependencies = ["benchmark-ips" "get_process_mem" "heapy" "memory_profiler" "rack" "rake" "thor"]; groups = ["development" "test"]; @@ -1007,6 +1033,17 @@ }; version = "0.9.0"; }; + extended-markdown-filter = { + dependencies = ["html-pipeline"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "17mi5qayplfaa6p3mfwa36il84ixr0bimqvl0q73lw5i81blp126"; + type = "gem"; + }; + version = "0.6.0"; + }; factory_bot = { dependencies = ["activesupport"]; source = { @@ -1139,12 +1176,14 @@ }; fog-aws = { dependencies = ["fog-core" "fog-json" "fog-xml" "ipaddress"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zprxg0spvkkri1jf40zg3rfr5h2gq6009d7l36lifpvhjn658cs"; + sha256 = "086kyvdhf1k8nk7f4gmybjc3k0m88f9pw99frddcy1w96pj5kyg4"; type = "gem"; }; - version = "3.3.0"; + version = "3.5.2"; }; fog-core = { dependencies = ["builder" "excon" "formatador" "mime-types"]; @@ -1257,6 +1296,16 @@ }; version = "2.2.0"; }; + gemoji = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0vgklpmhdz98xayln5hhqv4ffdyrglzwdixkn5gsk9rj94pkymc0"; + type = "gem"; + }; + version = "3.0.1"; + }; gemojione = { dependencies = ["json"]; source = { @@ -1309,10 +1358,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0glqy22p0xfaa3kvvrba04pj1dva8wpzlvhka37cvlqq95djcy19"; + sha256 = "1lx2cids0r175agdz3wa25ivi17vxx2kryb2v29gdsrpg3pyyq7j"; type = "gem"; }; - version = "1.32.0"; + version = "1.37.0"; }; github-markup = { source = { @@ -1322,15 +1371,6 @@ }; version = "1.7.0"; }; - gitlab-default_value_for = { - dependencies = ["activerecord"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0qqjf7nxmwxnkdlrgbnby8wjckaj2s5yna96avgb7fwm0h90f1sn"; - type = "gem"; - }; - version = "3.1.1"; - }; gitlab-labkit = { dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing"]; groups = ["default"]; @@ -1514,6 +1554,17 @@ }; version = "1.8.1"; }; + graphql-docs = { + dependencies = ["commonmarker" "escape_utils" "extended-markdown-filter" "gemoji" "graphql" "html-pipeline" "sass"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12wzsikbn54b2hcv100hz7isq5gdjm5w5b8xya64ra5sw6sabq8d"; + type = "gem"; + }; + version = "1.6.0"; + }; grpc = { dependencies = ["google-protobuf" "googleapis-common-protos-types"]; groups = ["default"]; @@ -1880,6 +1931,16 @@ }; version = "1.17.0"; }; + kramdown = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1n1c4jmrh5ig8iv1rw81s4mw4xsp4v97hvf8zkigv4hn5h542qjq"; + type = "gem"; + }; + version = "1.17.0"; + }; kubeclient = { dependencies = ["http" "recursive-open-struct" "rest-client"]; source = { @@ -1981,6 +2042,28 @@ }; version = "0.9.1"; }; + marcel = { + dependencies = ["mimemagic"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nxbjmcyg8vlw6zwagf17l9y2mwkagmmkg95xybpn4bmf3rfnksx"; + type = "gem"; + }; + version = "0.3.3"; + }; + mdl = { + dependencies = ["kramdown" "mixlib-cli" "mixlib-config"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "047hp8z1ma630wp38bm1giklkf385rp6wly8aidn825q831w2g4i"; + type = "gem"; + }; + version = "0.5.0"; + }; memoist = { source = { remotes = ["https://rubygems.org"]; @@ -2075,6 +2158,27 @@ }; version = "5.11.3"; }; + mixlib-cli = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0647msh7kp7lzyf6m72g6snpirvhimjm22qb8xgv9pdhbcrmcccp"; + type = "gem"; + }; + version = "1.7.0"; + }; + mixlib-config = { + dependencies = ["tomlrb"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1gm6yj9cbbgsl9x4xqxga0vz5w0ksq2jnq1wj8hvgm5c4wfcrswb"; + type = "gem"; + }; + version = "2.2.18"; + }; msgpack = { groups = ["default" "development" "test"]; platforms = []; @@ -2167,12 +2271,14 @@ version = "2.1.3"; }; net-ssh = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hj2i8rk5wb6235r5n19in1hkrp1fbz2bf40xmagavb5ahv7205w"; + sha256 = "101wd2px9lady54aqmkibvy4j62zk32w0rjz4vnigyg974fsga40"; type = "gem"; }; - version = "5.0.1"; + version = "5.2.0"; }; netrc = { source = { @@ -2631,12 +2737,14 @@ version = "0.0.3"; }; prometheus-client-mmap = { + groups = ["metrics"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14ww8c2qy43jw3fzmq54hsljmqmlx9a7zg9sv6ddw48qy118ls10"; + sha256 = "01f1zkpi7qsmgmk17fpq6ck7jn64sa9afsq20vc5k9f6mpyqkncd"; type = "gem"; }; - version = "0.9.4"; + version = "0.9.8"; }; pry = { dependencies = ["coderay" "method_source"]; @@ -2795,15 +2903,15 @@ version = "0.5.1"; }; rails = { - dependencies = ["actioncable" "actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activesupport" "railties" "sprockets-rails"]; + dependencies = ["actioncable" "actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties" "sprockets-rails"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xfwfhza6lflywaynyxk8jd9ff1cqj0adrh6qnggkqvd8iy54zwd"; + sha256 = "1p7cszi3n9ksxchxnccmz61pd1i3rjg4813dsdinsm8xm5k1pdgr"; type = "gem"; }; - version = "5.1.7"; + version = "5.2.3"; }; rails-controller-testing = { dependencies = ["actionpack" "actionview" "activesupport"]; @@ -2847,10 +2955,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wiyswlln344nd72ynn2hm2s1w9g7cnpdff3fphcya7nhavfnx68"; + sha256 = "1gn9fwb5wm08fbj7zpilqgblfl315l5b7pg4jsvxlizvrzg8h8q4"; type = "gem"; }; - version = "5.1.7"; + version = "5.2.3"; }; rainbow = { source = { @@ -3094,12 +3202,14 @@ version = "2.1.2"; }; rouge = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1digsi2s8wyzx8vsqcxasw205lg6s7izx8jypl8rrpjwshmv83ql"; + sha256 = "0yfhazlhjc4abgzhkgq8zqmdphvkh52211widkl4zhsbhqh8wg2q"; type = "gem"; }; - version = "3.3.0"; + version = "3.5.1"; }; rqrcode = { dependencies = ["chunky_png"]; @@ -3121,39 +3231,47 @@ }; rspec = { dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0134g96wzxjlig2gxzd240gm2dxfw8izcyi2h6hjmr40syzcyx01"; + sha256 = "15ppasvb9qrscwlyjz67ppw1lnxiqnkzx5vkx1bd8x5n3dhikxc3"; type = "gem"; }; - version = "3.7.0"; + version = "3.8.0"; }; rspec-core = { dependencies = ["rspec-support"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zvjbymx3avxm3lf8v4gka3a862vnaxldmwvp6767bpy48nhnvjj"; + sha256 = "0spjgmd3yx6q28q950r32bi0cs8h2si53zn6rq8s7n1i4zp4zwbf"; type = "gem"; }; - version = "3.7.1"; + version = "3.8.2"; }; rspec-expectations = { dependencies = ["diff-lcs" "rspec-support"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fw06wm8jdj8k7wrb8xmzj0fr1wjyb0ya13x31hidnyblm41hmvy"; + sha256 = "0x3iddjjaramqb0yb51c79p2qajgi9wb5b59bzv25czddigyk49r"; type = "gem"; }; - version = "3.7.0"; + version = "3.8.4"; }; rspec-mocks = { dependencies = ["diff-lcs" "rspec-support"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b02ya3qhqgmcywqv4570dlhav70r656f7dmvwg89whpkq1z1xr3"; + sha256 = "12zplnsv4p6wvvxsk8xn6nm87a5qadxlkk497zlxfczd0jfawrni"; type = "gem"; }; - version = "3.7.0"; + version = "3.8.1"; }; rspec-parameterized = { dependencies = ["binding_ninja" "parser" "proc_to_ast" "rspec" "unparser"]; @@ -3168,12 +3286,14 @@ }; rspec-rails = { dependencies = ["actionpack" "activesupport" "railties" "rspec-core" "rspec-expectations" "rspec-mocks" "rspec-support"]; + groups = ["development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cdcnbv5dppwy3b4jdp5a0wd9m07a8wlqwb9yazn8i7k1k2mwgvx"; + sha256 = "1pf6n9l4sw1arlax1bdbm1znsvl8cgna2n6k6yk1bi8vz2n73ls1"; type = "gem"; }; - version = "3.7.2"; + version = "3.8.2"; }; rspec-retry = { dependencies = ["rspec-core"]; @@ -3195,12 +3315,14 @@ version = "0.1.3"; }; rspec-support = { + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nl30xb6jmcl0awhqp6jycl01wdssblifwy921phfml70rd9flj1"; + sha256 = "139mbhfdr10flm2ffryvxkyqgqs1gjdclc1xhyh7i7njfqayxk7g"; type = "gem"; }; - version = "3.7.1"; + version = "3.8.2"; }; rspec_junit_formatter = { dependencies = ["rspec-core"]; @@ -3788,6 +3910,16 @@ }; version = "1.0.0"; }; + tomlrb = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0g28ssfal6vry3cmhy509ba3vi5d5aggz1gnffnvvmc8ml8vkpiv"; + type = "gem"; + }; + version = "1.2.8"; + }; truncato = { dependencies = ["htmlentities" "nokogiri"]; source = { @@ -3991,12 +4123,14 @@ }; websocket-driver = { dependencies = ["websocket-extensions"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1943442yllhldh9dbp374x2q39cxa49xrm28nb78b7mfbv3y195l"; + sha256 = "1551k3fs3kkb3ghqfj3n5lps0ikb9pyrdnzmvgfdxy8574n4g1dn"; type = "gem"; }; - version = "0.6.5"; + version = "0.7.0"; }; websocket-extensions = { source = { @@ -4042,4 +4176,4 @@ }; version = "3.2.0"; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/version-management/nbstripout/default.nix b/pkgs/applications/version-management/nbstripout/default.nix index 18fb672226f..1a6eda6a04e 100644 --- a/pkgs/applications/version-management/nbstripout/default.nix +++ b/pkgs/applications/version-management/nbstripout/default.nix @@ -9,7 +9,8 @@ buildPythonApplication rec { # Mercurial should be added as a build input but because it's a Python # application, it would mess up the Python environment. Thus, don't add it # here, instead add it to PATH when running unit tests - buildInputs = [ pytest pytest-flake8 pytest-cram git pytestrunner ]; + checkInputs = [ pytest pytest-flake8 pytest-cram git ]; + nativeBuildInputs = [ pytestrunner ]; propagatedBuildInputs = [ ipython nbformat ]; # PyPI source is currently missing tests. Thus, use GitHub instead. diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix index 5c9b5a83c18..343d88554d6 100644 --- a/pkgs/applications/version-management/smartgithg/default.nix +++ b/pkgs/applications/version-management/smartgithg/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "smartgithg"; - version = "18.2.9"; + version = "19.1.1"; src = fetchurl { url = "https://www.syntevo.com/downloads/smartgit/smartgit-linux-${builtins.replaceStrings [ "." ] [ "_" ] version}.tar.gz"; - sha256 = "0d08awb2s3w1w8n8048abw2x4wnqhfx96sls9kdsnxj0xrszgz67"; + sha256 = "0i0dvyy9d63f4hk8czlyk83ai0ywhqp7wbdkq3s87l7irwgs42jy"; }; nativeBuildInputs = [ wrapGAppsHook ]; diff --git a/pkgs/applications/version-management/sourcehut/builds.nix b/pkgs/applications/version-management/sourcehut/builds.nix new file mode 100644 index 00000000000..e554afe4a92 --- /dev/null +++ b/pkgs/applications/version-management/sourcehut/builds.nix @@ -0,0 +1,60 @@ +{ stdenv, fetchgit, buildPythonPackage +, python +, buildGoModule +, srht, redis, celery, pyyaml, markdown }: + +let + version = "0.45.13"; + + buildWorker = src: buildGoModule { + inherit src version; + pname = "builds-sr-ht-worker"; + goPackagePath = "git.sr.ht/~sircmpwn/builds.sr.ht/worker"; + + modSha256 = "1jm259ncw8dgqp0fqbjn30c4y3v3vwqj41gfh99jx30bwlmpgfax"; + }; +in buildPythonPackage rec { + inherit version; + pname = "buildsrht"; + + src = fetchgit { + url = "https://git.sr.ht/~sircmpwn/builds.sr.ht"; + rev = version; + sha256 = "002pcj2a98gbmv77a10449w1q6iqhqjz4fim8hm4qm7vn6bwp0hz"; + }; + + patches = [ + ./use-srht-path.patch + ]; + + nativeBuildInputs = srht.nativeBuildInputs; + + propagatedBuildInputs = [ + srht + redis + celery + pyyaml + markdown + ]; + + preBuild = '' + export PKGVER=${version} + export SRHT_PATH=${srht}/${python.sitePackages}/srht + ''; + + postInstall = '' + mkdir -p $out/lib + mkdir -p $out/bin/builds.sr.ht + + cp -r images $out/lib + cp contrib/submit_image_build $out/bin/builds.sr.ht + cp ${buildWorker "${src}/worker"}/bin/worker $out/bin/builds.sr.ht-worker + ''; + + meta = with stdenv.lib; { + homepage = https://git.sr.ht/~sircmpwn/builds.sr.ht; + description = "Continuous integration service for the sr.ht network"; + license = licenses.agpl3; + maintainers = with maintainers; [ eadwu ]; + }; +} diff --git a/pkgs/applications/version-management/sourcehut/core.nix b/pkgs/applications/version-management/sourcehut/core.nix new file mode 100644 index 00000000000..ca054c5cfde --- /dev/null +++ b/pkgs/applications/version-management/sourcehut/core.nix @@ -0,0 +1,80 @@ +{ stdenv, fetchgit, fetchNodeModules, buildPythonPackage +, pgpy, flask, bleach, misaka, humanize, markdown, psycopg2, pygments, requests +, sqlalchemy, flask_login, beautifulsoup4, sqlalchemy-utils, celery, alembic +, sassc, nodejs-11_x +, writeText }: + +buildPythonPackage rec { + pname = "srht"; + version = "0.52.13"; + + src = fetchgit { + url = "https://git.sr.ht/~sircmpwn/core.sr.ht"; + rev = version; + sha256 = "0i7gd2rkq4y4lffxsgb3mql9ddmk3vqckan29w266imrqs6p8c0z"; + }; + + node_modules = fetchNodeModules { + src = "${src}/srht"; + nodejs = nodejs-11_x; + sha256 = "0axl50swhcw8llq8z2icwr4nkr5qsw2riih0a040f9wx4xiw4p6p"; + }; + + patches = [ + ./disable-npm-install.patch + ]; + + nativeBuildInputs = [ + sassc + nodejs-11_x + ]; + + propagatedBuildInputs = [ + pgpy + flask + bleach + misaka + humanize + markdown + psycopg2 + pygments + requests + sqlalchemy + flask_login + beautifulsoup4 + sqlalchemy-utils + + # Unofficial runtime dependencies? + celery + alembic + ]; + + PKGVER = version; + + preBuild = '' + cp -r ${node_modules} srht/node_modules + ''; + + # No actual? tests but seems like it needs this anyway + preCheck = let + config = writeText "config.ini" '' + [webhooks] + private-key=K6JupPpnr0HnBjelKTQUSm3Ro9SgzEA2T2Zv472OvzI= + + [meta.sr.ht] + origin=http://meta.sr.ht.local + ''; + in '' + # Validation needs config option(s) + # webhooks <- ( private-key ) + # meta.sr.ht <- ( origin ) + cp ${config} config.ini + ''; + + meta = with stdenv.lib; { + homepage = https://git.sr.ht/~sircmpwn/srht; + description = "Core modules for sr.ht"; + license = licenses.bsd3; + maintainers = with maintainers; [ eadwu ]; + }; +} diff --git a/pkgs/applications/version-management/sourcehut/default.nix b/pkgs/applications/version-management/sourcehut/default.nix new file mode 100644 index 00000000000..b7c8eaf3820 --- /dev/null +++ b/pkgs/applications/version-management/sourcehut/default.nix @@ -0,0 +1,49 @@ +{ python37, openssl_1_1 +, callPackage }: + +# To expose the *srht modules, they have to be a python module so we use `buildPythonModule` +# Then we expose them through all-packages.nix as an application through `toPythonApplication` +# https://github.com/NixOS/nixpkgs/pull/54425#discussion_r250688781 + +let + fetchNodeModules = callPackage ../../networking/instant-messengers/rambox/fetchNodeModules.nix { }; + + python = python37.override { + packageOverrides = self: super: { + srht = self.callPackage ./core.nix { inherit fetchNodeModules; }; + + buildsrht = self.callPackage ./builds.nix { }; + dispatchsrht = self.callPackage ./dispatch.nix { }; + gitsrht = self.callPackage ./git.nix { }; + hgsrht = self.callPackage ./hg.nix { }; + listssrht = self.callPackage ./lists.nix { }; + mansrht = self.callPackage ./man.nix { }; + metasrht = self.callPackage ./meta.nix { }; + pastesrht = self.callPackage ./paste.nix { }; + todosrht = self.callPackage ./todo.nix { }; + + scmsrht = self.callPackage ./scm.nix { }; + + # OVERRIDES + + cryptography = super.cryptography.override { + openssl = openssl_1_1; + }; + + pyopenssl = super.pyopenssl.override { + openssl = openssl_1_1; + }; + }; + }; +in with python.pkgs; { + inherit python; + buildsrht = toPythonApplication buildsrht; + dispatchsrht = toPythonApplication dispatchsrht; + gitsrht = toPythonApplication gitsrht; + hgsrht = toPythonApplication hgsrht; + listssrht = toPythonApplication listssrht; + mansrht = toPythonApplication mansrht; + metasrht = toPythonApplication metasrht; + pastesrht = toPythonApplication pastesrht; + todosrht = toPythonApplication todosrht; +} diff --git a/pkgs/applications/version-management/sourcehut/disable-npm-install.patch b/pkgs/applications/version-management/sourcehut/disable-npm-install.patch new file mode 100644 index 00000000000..3a8d1c82b34 --- /dev/null +++ b/pkgs/applications/version-management/sourcehut/disable-npm-install.patch @@ -0,0 +1,14 @@ +diff --git a/setup.py b/setup.py +index d63bac8..e1d0c35 100755 +--- a/setup.py ++++ b/setup.py +@@ -5,9 +5,6 @@ import glob + import os + import sys + +-if subprocess.call(["npm", "i"], cwd="srht") != 0: +- sys.exit(1) +- + ver = os.environ.get("PKGVER") or subprocess.run(['git', 'describe', '--tags'], + stdout=subprocess.PIPE).stdout.decode().strip() + diff --git a/pkgs/applications/version-management/sourcehut/dispatch.nix b/pkgs/applications/version-management/sourcehut/dispatch.nix new file mode 100644 index 00000000000..c77fc902277 --- /dev/null +++ b/pkgs/applications/version-management/sourcehut/dispatch.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchgit, buildPythonPackage +, python +, srht, pyyaml, PyGithub, cryptography }: + +buildPythonPackage rec { + pname = "dispatchsrht"; + version = "0.11.0"; + + src = fetchgit { + url = "https://git.sr.ht/~sircmpwn/dispatch.sr.ht"; + rev = version; + sha256 = "1kahl2gy5a5li79djwkzkglkw2s7pl4d29bzqp8c53r0xvx4sqkz"; + }; + + patches = [ + ./use-srht-path.patch + ]; + + nativeBuildInputs = srht.nativeBuildInputs; + + propagatedBuildInputs = [ + srht + pyyaml + PyGithub + cryptography + ]; + + preBuild = '' + export PKGVER=${version} + export SRHT_PATH=${srht}/${python.sitePackages}/srht + ''; + + meta = with stdenv.lib; { + homepage = https://dispatch.sr.ht/~sircmpwn/dispatch.sr.ht; + description = "Task dispatcher and service integration tool for the sr.ht network"; + license = licenses.agpl3; + maintainers = with maintainers; [ eadwu ]; + }; +} diff --git a/pkgs/applications/version-management/sourcehut/git.nix b/pkgs/applications/version-management/sourcehut/git.nix new file mode 100644 index 00000000000..996663761a7 --- /dev/null +++ b/pkgs/applications/version-management/sourcehut/git.nix @@ -0,0 +1,55 @@ +{ stdenv, fetchgit, buildPythonPackage +, python +, buildGoModule +, srht, pygit2, scmsrht }: + +let + version = "0.32.3"; + + buildDispatcher = src: buildGoModule { + inherit src version; + pname = "git-sr-ht-dispatcher"; + goPackagePath = "git.sr.ht/~sircmpwn/git.sr.ht/gitsrht-dispatch"; + + modSha256 = "1lmgmlin460g09dph2hw6yz25d4agqwjhrjv0qqsis7df9qpf3i1"; + }; +in buildPythonPackage rec { + inherit version; + pname = "gitsrht"; + + src = fetchgit { + url = "https://git.sr.ht/~sircmpwn/git.sr.ht"; + rev = version; + sha256 = "0grycmblhm9dnhcf1kcmn6bclgb9znahk2026dan58m9j9pja5vw"; + }; + + patches = [ + ./use-srht-path.patch + ]; + + nativeBuildInputs = srht.nativeBuildInputs; + + propagatedBuildInputs = [ + srht + pygit2 + scmsrht + ]; + + preBuild = '' + export PKGVER=${version} + export SRHT_PATH=${srht}/${python.sitePackages}/srht + ''; + + # TODO: Remove redundant mkdir? + postInstall = '' + mkdir -p $out/bin + cp ${buildDispatcher "${src}/gitsrht-dispatch"}/bin/gitsrht-dispatch $out/bin/gitsrht-dispatch + ''; + + meta = with stdenv.lib; { + homepage = https://git.sr.ht/~sircmpwn/git.sr.ht; + description = "Git repository hosting service for the sr.ht network"; + license = licenses.agpl3; + maintainers = with maintainers; [ eadwu ]; + }; +} diff --git a/pkgs/applications/version-management/sourcehut/hg.nix b/pkgs/applications/version-management/sourcehut/hg.nix new file mode 100644 index 00000000000..93817648468 --- /dev/null +++ b/pkgs/applications/version-management/sourcehut/hg.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchhg, buildPythonPackage +, python +, srht, hglib, scmsrht, unidiff }: + +buildPythonPackage rec { + pname = "hgsrht"; + version = "0.13.0"; + + src = fetchhg { + url = "https://hg.sr.ht/~sircmpwn/hg.sr.ht"; + rev = version; + sha256 = "0qkknvja0pyk69fvzqafj3x8hi5miw22nmksvifbrjcqph8jknqg"; + }; + + patches = [ + ./use-srht-path.patch + ]; + + nativeBuildInputs = srht.nativeBuildInputs; + + propagatedBuildInputs = [ + srht + hglib + scmsrht + unidiff + ]; + + preBuild = '' + export PKGVER=${version} + export SRHT_PATH=${srht}/${python.sitePackages}/srht + ''; + + meta = with stdenv.lib; { + homepage = https://git.sr.ht/~sircmpwn/hg.sr.ht; + description = "Mercurial repository hosting service for the sr.ht network"; + license = licenses.agpl3; + maintainers = with maintainers; [ eadwu ]; + }; +} diff --git a/pkgs/applications/version-management/sourcehut/lists.nix b/pkgs/applications/version-management/sourcehut/lists.nix new file mode 100644 index 00000000000..ac36a219a91 --- /dev/null +++ b/pkgs/applications/version-management/sourcehut/lists.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchgit, buildPythonPackage +, python +, srht, asyncpg, unidiff, aiosmtpd, emailthreads }: + +buildPythonPackage rec { + pname = "listssrht"; + version = "0.36.3"; + + src = fetchgit { + url = "https://git.sr.ht/~sircmpwn/lists.sr.ht"; + rev = version; + sha256 = "1q2z2pjwz4zifsrkxab9b9jh1vzayjqych1cx3i4859f1swl2gwa"; + }; + + patches = [ + ./use-srht-path.patch + ]; + + nativeBuildInputs = srht.nativeBuildInputs; + + propagatedBuildInputs = [ + srht + asyncpg + unidiff + aiosmtpd + emailthreads + ]; + + preBuild = '' + export PKGVER=${version} + export SRHT_PATH=${srht}/${python.sitePackages}/srht + ''; + + meta = with stdenv.lib; { + homepage = https://git.sr.ht/~sircmpwn/lists.sr.ht; + description = "Mailing list service for the sr.ht network"; + license = licenses.agpl3; + maintainers = with maintainers; [ eadwu ]; + }; +} diff --git a/pkgs/applications/version-management/sourcehut/man.nix b/pkgs/applications/version-management/sourcehut/man.nix new file mode 100644 index 00000000000..a0198cb52cf --- /dev/null +++ b/pkgs/applications/version-management/sourcehut/man.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchgit, buildPythonPackage +, python +, srht, pygit2 }: + +buildPythonPackage rec { + pname = "mansrht"; + version = "0.12.4"; + + src = fetchgit { + url = "https://git.sr.ht/~sircmpwn/man.sr.ht"; + rev = version; + sha256 = "1csnw71yh5zw7l17xmmxyskwiqbls0ynbbjrg45y5k1i3622mhiy"; + }; + + patches = [ + ./use-srht-path.patch + ]; + + nativeBuildInputs = srht.nativeBuildInputs; + + propagatedBuildInputs = [ + srht + pygit2 + ]; + + preBuild = '' + export PKGVER=${version} + export SRHT_PATH=${srht}/${python.sitePackages}/srht + ''; + + meta = with stdenv.lib; { + homepage = https://git.sr.ht/~sircmpwn/man.sr.ht; + description = "Wiki service for the sr.ht network"; + license = licenses.agpl3; + maintainers = with maintainers; [ eadwu ]; + }; +} diff --git a/pkgs/applications/version-management/sourcehut/meta.nix b/pkgs/applications/version-management/sourcehut/meta.nix new file mode 100644 index 00000000000..af3685c472c --- /dev/null +++ b/pkgs/applications/version-management/sourcehut/meta.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchgit, buildPythonPackage +, python +, pgpy, srht, redis, bcrypt, qrcode, stripe, zxcvbn, alembic, pystache +, sshpubkeys, weasyprint, prometheus_client }: + +buildPythonPackage rec { + pname = "metasrht"; + version = "0.34.3"; + + src = fetchgit { + url = "https://git.sr.ht/~sircmpwn/meta.sr.ht"; + rev = version; + sha256 = "1yj3npw1vlqawzj6q1mh6qryx009dg5prja9fn6rasfmxjn2gr7v"; + }; + + nativeBuildInputs = srht.nativeBuildInputs; + + propagatedBuildInputs = [ + pgpy + srht + redis + bcrypt + qrcode + stripe + zxcvbn + alembic + pystache + sshpubkeys + weasyprint + prometheus_client + ]; + + patches = [ + ./use-srht-path.patch + ]; + + preBuild = '' + export PKGVER=${version} + export SRHT_PATH=${srht}/${python.sitePackages}/srht + ''; + + meta = with stdenv.lib; { + homepage = https://git.sr.ht/~sircmpwn/meta.sr.ht; + description = "Account management service for the sr.ht network"; + license = licenses.agpl3; + maintainers = with maintainers; [ eadwu ]; + }; +} diff --git a/pkgs/applications/version-management/sourcehut/paste.nix b/pkgs/applications/version-management/sourcehut/paste.nix new file mode 100644 index 00000000000..47153d9f204 --- /dev/null +++ b/pkgs/applications/version-management/sourcehut/paste.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchgit, buildPythonPackage +, python +, srht, pyyaml }: + +buildPythonPackage rec { + pname = "pastesrht"; + version = "0.5.1"; + + src = fetchgit { + url = "https://git.sr.ht/~sircmpwn/paste.sr.ht"; + rev = version; + sha256 = "0bzw03hcwi1pw16kliqjsr7kphqq3qw0pbpdjqkcs7jdr0a59vny"; + }; + + patches = [ + ./use-srht-path.patch + ]; + + nativeBuildInputs = srht.nativeBuildInputs; + + propagatedBuildInputs = [ + srht + pyyaml + ]; + + preBuild = '' + export PKGVER=${version} + export SRHT_PATH=${srht}/${python.sitePackages}/srht + ''; + + meta = with stdenv.lib; { + homepage = https://git.sr.ht/~sircmpwn/paste.sr.ht; + description = "Ad-hoc text file hosting service for the sr.ht network"; + license = licenses.agpl3; + maintainers = with maintainers; [ eadwu ]; + }; +} diff --git a/pkgs/applications/version-management/sourcehut/scm.nix b/pkgs/applications/version-management/sourcehut/scm.nix new file mode 100644 index 00000000000..ef6ed3a744b --- /dev/null +++ b/pkgs/applications/version-management/sourcehut/scm.nix @@ -0,0 +1,55 @@ +{ stdenv, fetchgit, buildPythonPackage +, srht, redis, pyyaml, buildsrht +, writeText }: + +buildPythonPackage rec { + pname = "scmsrht"; + version = "0.13.3"; + + src = fetchgit { + url = "https://git.sr.ht/~sircmpwn/scm.sr.ht"; + rev = version; + sha256 = "0bapddgfqrs27y6prd6kwpz6jdlr33zdqr6ci6ixi584a7z8z7d6"; + }; + + nativeBuildInputs = srht.nativeBuildInputs; + + propagatedBuildInputs = [ + srht + redis + pyyaml + buildsrht + ]; + + preBuild = '' + export PKGVER=${version} + ''; + + # No actual? tests but seems like it needs this anyway + preCheck = let + config = writeText "config.ini" '' + [webhooks] + private-key=K6JupPpnr0HnBjelKTQUSm3Ro9SgzEA2T2Zv472OvzI= + + [builds.sr.ht] + origin=http://builds.sr.ht.local + oauth-client-id= + + [meta.sr.ht] + origin=http://meta.sr.ht.local + ''; + in '' + # Validation needs config option(s) + # webhooks <- ( private-key ) + # meta.sr.ht <- ( origin ) + # builds.sr.ht <- ( origin, oauth-client-id ) + cp ${config} config.ini + ''; + + meta = with stdenv.lib; { + homepage = https://git.sr.ht/~sircmpwn/git.sr.ht; + description = "Shared support code for sr.ht source control services."; + license = licenses.agpl3; + maintainers = with maintainers; [ eadwu ]; + }; +} diff --git a/pkgs/applications/version-management/sourcehut/todo.nix b/pkgs/applications/version-management/sourcehut/todo.nix new file mode 100644 index 00000000000..6b67478aa67 --- /dev/null +++ b/pkgs/applications/version-management/sourcehut/todo.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchgit, buildPythonPackage +, python +, srht, redis, alembic, pystache }: + +buildPythonPackage rec { + pname = "todosrht"; + version = "0.46.8"; + + src = fetchgit { + url = "https://git.sr.ht/~sircmpwn/todo.sr.ht"; + rev = version; + sha256 = "17nqqy81535jnkidjiqv8v2301w5wzbbvx4czib69aagw1l85gnn"; + }; + + patches = [ + ./use-srht-path.patch + ]; + + nativeBuildInputs = srht.nativeBuildInputs; + + propagatedBuildInputs = [ + srht + redis + alembic + pystache + ]; + + preBuild = '' + export PKGVER=${version} + export SRHT_PATH=${srht}/${python.sitePackages}/srht + ''; + + # Tests require a network connection + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://todo.sr.ht/~sircmpwn/todo.sr.ht; + description = "Ticket tracking service for the sr.ht network"; + license = licenses.agpl3; + maintainers = with maintainers; [ eadwu ]; + }; +} diff --git a/pkgs/applications/version-management/sourcehut/update.sh b/pkgs/applications/version-management/sourcehut/update.sh new file mode 100755 index 00000000000..fdc0639c4c6 --- /dev/null +++ b/pkgs/applications/version-management/sourcehut/update.sh @@ -0,0 +1,54 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i bash -p git mercurial common-updater-scripts + +cd "$(dirname "${BASH_SOURCE[0]}")" +root=../../../.. + +default() { + (cd "$root" && nix-instantiate --eval --strict -A "sourcehut.python.pkgs.$1.meta.position" | sed -re 's/^"(.*):[0-9]+"$/\1/') +} + +version() { + (cd "$root" && nix-instantiate --eval --strict -A "sourcehut.python.pkgs.$1.version" | tr -d '"') +} + +src_url() { + (cd "$root" && nix-instantiate --eval --strict -A "sourcehut.python.pkgs.$1.src.drvAttrs.url" | tr -d '"') +} + +get_latest_version() { + src="$(src_url "$1")" + tmp=$(mktemp -d) + + if [ "$1" = "hgsrht" ]; then + hg clone "$src" "$tmp" &> /dev/null + printf "%s" "$(cd "$tmp" && hg log --limit 1 --template '{latesttag}')" + else + git clone "$src" "$tmp" + printf "%s" "$(cd "$tmp" && git describe $(git rev-list --tags --max-count=1))" + fi +} + +update_version() { + default_nix="$(default "$1")" + version_old="$(version "$1")" + version="$(get_latest_version "$1")" + + (cd "$root" && update-source-version "sourcehut.python.pkgs.$1" "$version") + + git add "$default_nix" + git commit -m "$1: $version_old -> $version" +} + +services=( "srht" "buildsrht" "dispatchsrht" "gitsrht" "hgsrht" "listssrht" "mansrht" "metasrht" + "pastesrht" "todosrht" "scmsrht" ) + +# Whether or not a specific service is requested +if [ -n "$1" ]; then + version="$(get_latest_version "$1")" + (cd "$root" && update-source-version "sourcehut.python.pkgs.$1" "$version") +else + for service in "${services[@]}"; do + update_version "$service" + done +fi diff --git a/pkgs/applications/version-management/sourcehut/use-srht-path.patch b/pkgs/applications/version-management/sourcehut/use-srht-path.patch new file mode 100644 index 00000000000..43b494bf9d2 --- /dev/null +++ b/pkgs/applications/version-management/sourcehut/use-srht-path.patch @@ -0,0 +1,43 @@ +diff --git a/setup.py b/setup.py +index e6ecfb6..89fa92a 100755 +--- a/setup.py ++++ b/setup.py +@@ -5,28 +5,16 @@ import os + import site + import sys + +-if hasattr(site, 'getsitepackages'): +- pkg_dirs = site.getsitepackages() +- if site.getusersitepackages(): +- pkg_dirs.append(site.getusersitepackages()) +- for pkg_dir in pkg_dirs: +- srht_path = os.path.join(pkg_dir, "srht") +- if os.path.isdir(srht_path): +- break +- else: +- raise Exception("Can't find core srht module in your site packages " +- "directories. Please install it first.") +-else: +- srht_path = os.getenv("SRHT_PATH") +- if not srht_path: +- raise Exception("You're running inside a virtual environment. " +- "Due to virtualenv limitations, you need to set the " +- "$SRHT_PATH environment variable to the path of the " +- "core srht module.") +- elif not os.path.isdir(srht_path): +- raise Exception( +- "The $SRHT_PATH environment variable points to an invalid " +- "directory: {}".format(srht_path)) ++srht_path = os.getenv("SRHT_PATH") ++if not srht_path: ++ raise Exception("You're running inside a virtual environment. " ++ "Due to virtualenv limitations, you need to set the " ++ "$SRHT_PATH environment variable to the path of the " ++ "core srht module.") ++elif not os.path.isdir(srht_path): ++ raise Exception( ++ "The $SRHT_PATH environment variable points to an invalid " ++ "directory: {}".format(srht_path)) + + subp = subprocess.run(["make", "SRHT_PATH=" + srht_path]) + if subp.returncode != 0: diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 81949f95106..dffe3fadd74 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -19,10 +19,10 @@ let common = { version, sha256, extraBuildInputs ? [ ] }: stdenv.mkDerivation (rec { inherit version; - name = "subversion-${version}"; + pname = "subversion"; src = fetchurl { - url = "mirror://apache/subversion/${name}.tar.bz2"; + url = "mirror://apache/subversion/${pname}-${version}.tar.bz2"; inherit sha256; }; @@ -98,7 +98,7 @@ let meta = with stdenv.lib; { description = "A version control system intended to be a compelling replacement for CVS in the open source community"; license = licenses.asl20; - homepage = http://subversion.apache.org/; + homepage = "http://subversion.apache.org/"; maintainers = with maintainers; [ eelco lovek323 ]; platforms = platforms.linux ++ platforms.darwin; }; @@ -112,19 +112,19 @@ let in { subversion19 = common { - version = "1.9.10"; - sha256 = "1mwwbjs8nqr8qyc0xzy7chnylh4q3saycvly8rzq32swadbcca5f"; + version = "1.9.12"; + sha256 = "15z33gdnfiqblm5515020wfdwnp2837r3hnparava6m2fgyiafiw"; }; subversion_1_10 = common { - version = "1.10.4"; - sha256 = "18c1vdq32nil76w678lxmp73jsbqha3dmzgmfrj76nc0xjmywql2"; + version = "1.10.6"; + sha256 = "19zc215mhpnm92mlyl5jbv57r5zqp6cavr3s2g9yglp6j4kfgj0q"; extraBuildInputs = [ lz4 utf8proc ]; }; subversion = common { - version = "1.12.0"; - sha256 = "1prfbrd1jnndb5fcsvwnzvdi7c0bpirb6pmfq03w21x0v1rprbkz"; + version = "1.12.2"; + sha256 = "0wgpw3kzsiawzqk4y0xgh1z93kllxydgv4lsviim45y5wk4bbl1v"; extraBuildInputs = [ lz4 utf8proc ]; }; } diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix index 2cca53d6fe7..7bd1e9586c9 100644 --- a/pkgs/applications/version-management/tortoisehg/default.nix +++ b/pkgs/applications/version-management/tortoisehg/default.nix @@ -2,11 +2,11 @@ python2Packages.buildPythonApplication rec { name = "tortoisehg-${version}"; - version = "4.9.1"; + version = "5.0.2"; src = fetchurl { url = "https://bitbucket.org/tortoisehg/targz/downloads/${name}.tar.gz"; - sha256 = "0c5gp5wyaiyh8w2zzy1q0f2qv8aa3219shb6swpsdzqr2j9gkk4b"; + sha256 = "1fkawx4ymaacah2wpv2w7rxmv1mx08mg4x4r4fxh41jz1njjb8sz"; }; pythonPath = with python2Packages; [ pyqt4 mercurial qscintilla iniparse ]; diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix index 8e87a0589c5..4cbd506c177 100644 --- a/pkgs/applications/video/avidemux/default.nix +++ b/pkgs/applications/video/avidemux/default.nix @@ -25,11 +25,11 @@ assert !withQT -> default != "qt5"; stdenv.mkDerivation rec { name = "avidemux-${version}"; - version = "2.7.3"; + version = "2.7.4"; src = fetchurl { url = "mirror://sourceforge/avidemux/avidemux/${version}/avidemux_${version}.tar.gz"; - sha256 = "17x2mnnr5h8pp764p55l1xcn2ljnzhbj8cykajlllvk4rc4qwxld"; + sha256 = "1acdb3m37vdzzbm8mwyibcn8msi7birb5v30qfi7jli5r00src3x"; }; patches = [ diff --git a/pkgs/applications/video/openshot-qt/default.nix b/pkgs/applications/video/openshot-qt/default.nix index 19a8ff6c822..0b1d9e95115 100644 --- a/pkgs/applications/video/openshot-qt/default.nix +++ b/pkgs/applications/video/openshot-qt/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub +{ stdenv, mkDerivationWith, fetchFromGitHub , doxygen, python3Packages, libopenshot , wrapGAppsHook, gtk3 }: -python3Packages.buildPythonApplication rec { +mkDerivationWith python3Packages.buildPythonApplication rec { pname = "openshot-qt"; version = "2.4.4"; @@ -19,12 +19,20 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ libopenshot pyqt5_with_qtwebkit requests sip httplib2 pyzmq ]; + dontWrapGApps = true; + dontWrapQtApps = true; preConfigure = '' # tries to create caching directories during install export HOME=$(mktemp -d) ''; + postFixup = '' + wrapProgram $out/bin/openshot-qt \ + "''${gappsWrapperArgs[@]}" \ + "''${qtWrapperArgs[@]}" + ''; + doCheck = false; meta = with stdenv.lib; { diff --git a/pkgs/applications/video/qstopmotion/default.nix b/pkgs/applications/video/qstopmotion/default.nix index f2b23fbdea0..ea4816ad6d0 100644 --- a/pkgs/applications/video/qstopmotion/default.nix +++ b/pkgs/applications/video/qstopmotion/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, qt5, ffmpeg, guvcview, cmake, ninja, libxml2 -, gettext, pkgconfig, libgphoto2, gphoto2, v4l_utils, libv4l, pcre +, gettext, pkgconfig, libgphoto2, gphoto2, v4l-utils, libv4l, pcre , qwt, extra-cmake-modules }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "03r6jxyq0bak2vsy2b78nk27m7fm96hnl8cx11l3l17704j4iglh"; }; - buildInputs = with qt5; [ v4l_utils libv4l pcre qtbase qtmultimedia ffmpeg guvcview + buildInputs = with qt5; [ v4l-utils libv4l pcre qtbase qtmultimedia ffmpeg guvcview qwt qtquickcontrols qtimageformats qtxmlpatterns ]; nativeBuildInputs = [ pkgconfig cmake extra-cmake-modules ninja diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index a683e192f11..1b80e379008 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -1,12 +1,11 @@ -{ stdenv, fetchFromGitHub, SDL2, frei0r, gettext, mlt, jack1, pkgconfig, qtbase -, qtmultimedia, qtwebkit, qtx11extras, qtwebsockets, qtquickcontrols -, qtgraphicaleffects, libmlt -, qmake, makeWrapper, qttools }: +{ stdenv, fetchFromGitHub, SDL2, frei0r, gettext, mlt, jack1, mkDerivation +, pkgconfig, qtbase, qtmultimedia, qtwebkit, qtx11extras, qtwebsockets +, qtquickcontrols, qtgraphicaleffects, libmlt, qmake, qttools }: assert stdenv.lib.versionAtLeast libmlt.version "6.8.0"; assert stdenv.lib.versionAtLeast mlt.version "6.8.0"; -stdenv.mkDerivation rec { +mkDerivation rec { name = "shotcut-${version}"; version = "19.07.15"; @@ -18,7 +17,7 @@ stdenv.mkDerivation rec { }; enableParallelBuilding = true; - nativeBuildInputs = [ makeWrapper pkgconfig qmake ]; + nativeBuildInputs = [ pkgconfig qmake ]; buildInputs = [ SDL2 frei0r gettext mlt libmlt qtbase qtmultimedia qtwebkit qtx11extras qtwebsockets qtquickcontrols @@ -35,10 +34,15 @@ stdenv.mkDerivation rec { sed "s_/usr/bin/nice_''${NICE}_" -i src/jobs/meltjob.cpp src/jobs/ffmpegjob.cpp ''; + qtWrapperArgs = [ + "--prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1" + "--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [jack1 SDL2 ]}" + "--prefix PATH : ${mlt}/bin" + ]; + postInstall = '' mkdir -p $out/share/shotcut cp -r src/qml $out/share/shotcut/ - wrapProgram $out/bin/shotcut --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1 --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ jack1 SDL2 ]} --prefix PATH : ${mlt}/bin ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix index 00a0942ccf6..495fc6f6745 100644 --- a/pkgs/applications/video/smplayer/default.nix +++ b/pkgs/applications/video/smplayer/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, qmake, qtscript }: +{ lib, mkDerivation, fetchurl, qmake, qtscript }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "smplayer-19.5.0"; src = fetchurl { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "A complete front-end for MPlayer"; homepage = http://smplayer.sourceforge.net/; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/video/smtube/default.nix b/pkgs/applications/video/smtube/default.nix index 41f82a8bdd5..59e541892ee 100644 --- a/pkgs/applications/video/smtube/default.nix +++ b/pkgs/applications/video/smtube/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, qmake, qtscript, qtwebkit }: +{ lib, mkDerivation, fetchurl, qmake, qtscript, qtwebkit }: -stdenv.mkDerivation rec { +mkDerivation rec { version = "19.6.0"; name = "smtube-${version}"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ qmake ]; buildInputs = [ qtscript qtwebkit ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Play and download Youtube videos"; homepage = http://smplayer.sourceforge.net/smtube.php; license = licenses.gpl2Plus; diff --git a/pkgs/applications/virtualization/conmon/default.nix b/pkgs/applications/virtualization/conmon/default.nix index eb143412bd4..0b523d7b88d 100644 --- a/pkgs/applications/virtualization/conmon/default.nix +++ b/pkgs/applications/virtualization/conmon/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { project = "conmon"; name = "${project}-${version}"; - version = "0.3.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "containers"; repo = project; rev = "v${version}"; - sha256 = "0s23gm0cq4mylv882dr1n8bqql42674vny3z58yy77lwzmifc6id"; + sha256 = "1sigcylya668f5jzkf1vgfsgqy26l3glh9a3g8lhd2468ax6wymk"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/virtualization/looking-glass-client/default.nix b/pkgs/applications/virtualization/looking-glass-client/default.nix index afb2088c6a6..58f4dd48cc8 100644 --- a/pkgs/applications/virtualization/looking-glass-client/default.nix +++ b/pkgs/applications/virtualization/looking-glass-client/default.nix @@ -1,33 +1,26 @@ { stdenv, fetchFromGitHub, fetchpatch , cmake, pkgconfig, SDL2, SDL, SDL2_ttf, openssl, spice-protocol, fontconfig -, libX11, freefont_ttf, nettle, libconfig +, libX11, freefont_ttf, nettle, libconfig, wayland, libpthreadstubs, libXdmcp +, libXfixes, libbfd }: stdenv.mkDerivation rec { name = "looking-glass-client-${version}"; - version = "a12"; + version = "B1"; src = fetchFromGitHub { owner = "gnif"; repo = "LookingGlass"; rev = version; - sha256 = "0r6bvl9q94039r6ff4f2bg8si95axx9w8bf1h1qr5730d2kv5yxq"; + sha256 = "0vykv7yjz4fima9d82m83acd8ab72nq4wyzyfs1c499i27wz91ia"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ SDL SDL2 SDL2_ttf openssl spice-protocol fontconfig - libX11 freefont_ttf nettle libconfig cmake - ]; - - patches = [ - # Fix obsolete spice header usage. Remove with the next release. See https://github.com/gnif/LookingGlass/pull/126 - (fetchpatch { - url = "https://github.com/gnif/LookingGlass/commit/2567447b24b28458ba0f09c766a643ad8d753255.patch"; - sha256 = "04j2h75rpxd71szry15f31r6s0kgk96i8q9khdv9q3i2fvkf242n"; - stripLen = 1; - }) + libX11 freefont_ttf nettle libconfig wayland libpthreadstubs + libXdmcp libXfixes libbfd cmake ]; enableParallelBuilding = true; @@ -50,7 +43,7 @@ stdenv.mkDerivation rec { ''; homepage = https://looking-glass.hostfission.com/; license = licenses.gpl2Plus; - maintainers = [ maintainers.pneumaticat ]; + maintainers = [ maintainers.alexbakker ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index 8d264f3062c..f7ea6df8493 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -5,13 +5,13 @@ buildGoPackage rec { name = "podman-${version}"; - version = "1.4.4"; + version = "1.5.1"; src = fetchFromGitHub { owner = "containers"; repo = "libpod"; rev = "v${version}"; - sha256 = "13qgrvqawrrz4apdcds4amkljyjzx056545962wk8p0d291hqv5a"; + sha256 = "1jg7fdshqz0x71339i0wndskb17x1k5rwpkjiwd463f96fnbfp4x"; }; goPackagePath = "github.com/containers/libpod"; diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index b36d918a803..1a6ba5ac527 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -1,7 +1,7 @@ -{ config, stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2 -, libX11, xorgproto, libXext, libXcursor, libXmu, qt5, libIDL, SDL, libcap, libGL -, libpng, glib, lvm2, libXrandr, libXinerama, libopus -, pkgconfig, which, docbook_xsl, docbook_xml_dtd_43 +{ config, stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2, wrapQtAppsHook +, libX11, xorgproto, libXext, libXcursor, libXmu, libIDL, SDL, libcap, libGL +, libpng, glib, lvm2, libXrandr, libXinerama, libopus, qtbase, qtx11extras +, qttools, pkgconfig, which, docbook_xsl, docbook_xml_dtd_43 , alsaLib, curl, libvpx, nettools, dbus , makeself, perl , javaBindings ? true, jdk ? null # Almost doesn't affect closure size @@ -33,7 +33,11 @@ in stdenv.mkDerivation { outputs = [ "out" "modsrc" ]; - nativeBuildInputs = [ pkgconfig which docbook_xsl docbook_xml_dtd_43 patchelfUnstable ]; + nativeBuildInputs = [ pkgconfig which docbook_xsl docbook_xml_dtd_43 patchelfUnstable ] + ++ optional (!headless) wrapQtAppsHook; + + # Wrap manually because we just need to wrap one executable + dontWrapQtApps = true; buildInputs = [ iasl dev86 libxslt libxml2 xorgproto libX11 libXext libXcursor libIDL @@ -43,7 +47,7 @@ in stdenv.mkDerivation { ++ optional pythonBindings python # Python is needed even when not building bindings ++ optional pulseSupport libpulseaudio ++ optionals (headless) [ libXrandr libGL ] - ++ optionals (!headless) [ qt5.qtbase qt5.qtx11extras libXinerama SDL ]; + ++ optionals (!headless) [ qtbase qtx11extras libXinerama SDL ]; hardeningDisable = [ "format" "fortify" "pic" "stackprotector" ]; @@ -53,7 +57,7 @@ in stdenv.mkDerivation { -e 's@PYTHONDIR=.*@PYTHONDIR=${if pythonBindings then python else ""}@' \ -e 's@CXX_FLAGS="\(.*\)"@CXX_FLAGS="-std=c++11 \1"@' \ ${optionalString (!headless) '' - -e 's@TOOLQT5BIN=.*@TOOLQT5BIN="${getDev qt5.qtbase}/bin"@' \ + -e 's@TOOLQT5BIN=.*@TOOLQT5BIN="${getDev qtbase}/bin"@' \ ''} -i configure 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 @@ -105,9 +109,9 @@ in stdenv.mkDerivation { VBOX_JAVA_HOME := ${jdk} ''} ${optionalString (!headless) '' - PATH_QT5_X11_EXTRAS_LIB := ${getLib qt5.qtx11extras}/lib - PATH_QT5_X11_EXTRAS_INC := ${getDev qt5.qtx11extras}/include - TOOL_QT5_LRC := ${getDev qt5.qttools}/bin/lrelease + PATH_QT5_X11_EXTRAS_LIB := ${getLib qtx11extras}/lib + PATH_QT5_X11_EXTRAS_INC := ${getDev qtx11extras}/include + TOOL_QT5_LRC := ${getDev qttools}/bin/lrelease ''} LOCAL_CONFIG @@ -177,6 +181,10 @@ in stdenv.mkDerivation { cp -rv out/linux.*/${buildType}/bin/src "$modsrc" ''; + preFixup = optionalString (!headless) '' + wrapQtApp $out/bin/VirtualBox + ''; + passthru = { inherit version; # for guest additions inherit extensionPack; # for inclusion in profile to prevent gc diff --git a/pkgs/applications/window-managers/bspwm/default.nix b/pkgs/applications/window-managers/bspwm/default.nix index 8fd85aaeb86..b81f6625437 100644 --- a/pkgs/applications/window-managers/bspwm/default.nix +++ b/pkgs/applications/window-managers/bspwm/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "bspwm-${version}"; - version = "0.9.8"; + version = "0.9.9"; src = fetchFromGitHub { owner = "baskerville"; repo = "bspwm"; rev = version; - sha256 = "1vc4pdm4fwb5gz7hyzwvjqkx5087f0vrw11898nq1s7kxzl2lhbx"; + sha256 = "1i7crmljk1vra1r6alxvj6lqqailjjcv0llyg7a0gm23rbv4a42g"; }; buildInputs = [ libxcb libXinerama xcbutil xcbutilkeysyms xcbutilwm ]; diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index bef38e7a72a..3e9618f6e5d 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "i3-${version}"; - version = "4.16.1"; + version = "4.17"; src = fetchurl { url = "https://i3wm.org/downloads/${name}.tar.bz2"; - sha256 = "0xl56y196vxv001gvx35xwfr25zah8m3xwizp9ycdgdc0rfc4rdb"; + sha256 = "1z8qmkkq9dhqmqy8sjw3rnpnmnb8v7lr456bs0qzp23bgpj17gjf"; }; nativeBuildInputs = [ which pkgconfig makeWrapper ]; diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix index 27d568ae9ed..9d02dbafa5d 100644 --- a/pkgs/applications/window-managers/i3/lock.nix +++ b/pkgs/applications/window-managers/i3/lock.nix @@ -1,18 +1,18 @@ { fetchurl, stdenv, which, pkgconfig, libxcb, xcbutilkeysyms, xcbutilimage, - pam, libX11, libev, cairo, libxkbcommon, libxkbfile }: + xcbutilxrm, pam, libX11, libev, cairo, libxkbcommon, libxkbfile }: stdenv.mkDerivation rec { name = "i3lock-${version}"; - version = "2.10"; + version = "2.12"; src = fetchurl { url = "https://i3wm.org/i3lock/${name}.tar.bz2"; - sha256 = "1vn8828ih7mpdl58znfnzpdwdgwksq16rghm5qlppbbz66zk5sr9"; + sha256 = "02dwaqxpclcwiwvpvq7zwz4sxcv9c15dbf17ifalj1p8djls3cnh"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ which libxcb xcbutilkeysyms xcbutilimage pam libX11 - libev cairo libxkbcommon libxkbfile ]; + buildInputs = [ which libxcb xcbutilkeysyms xcbutilimage xcbutilxrm + pam libX11 libev cairo libxkbcommon libxkbfile ]; makeFlags = "all"; installFlags = "PREFIX=\${out} SYSCONFDIR=\${out}/etc"; diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index ae3d93ff3db..83e21c8945d 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -291,9 +291,10 @@ rec { # Files to add to the layer. closure, configJson, - # Docker has a 42-layer maximum, we pick 24 to ensure there is plenty - # of room for extension - maxLayers ? 24 + # Docker has a 125-layer maximum, we pick 100 to ensure there is + # plenty of room for extension. + # https://github.com/moby/moby/blob/b3e9f7b13b0f0c414fa6253e1f17a86b2cff68b5/layer/layer_store.go#L23-L26 + maxLayers ? 100 }: let storePathToLayer = substituteAll diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index f2336db8852..d09b775d42c 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -268,13 +268,14 @@ rec { # Apache mirrors (see http://www.apache.org/mirrors/). apache = [ + https://www-eu.apache.org/dist/ + https://www-us.apache.org/dist/ http://www.eu.apache.org/dist/ - http://wwwftp.ciril.fr/pub/apache/ ftp://ftp.fu-berlin.de/unix/www/apache/ http://ftp.tudelft.nl/apache/ http://mirror.cc.columbia.edu/pub/software/apache/ - http://www.apache.org/dist/ - http://archive.apache.org/dist/ # fallback for old releases + https://www.apache.org/dist/ + https://archive.apache.org/dist/ # fallback for old releases ftp://ftp.funet.fi/pub/mirrors/apache.org/ http://apache.cs.uu.nl/ http://apache.cs.utah.edu/ diff --git a/pkgs/build-support/ocaml/oasis.nix b/pkgs/build-support/ocaml/oasis.nix new file mode 100644 index 00000000000..74977486f2f --- /dev/null +++ b/pkgs/build-support/ocaml/oasis.nix @@ -0,0 +1,46 @@ +{ stdenv, ocaml_oasis, ocaml, findlib, ocamlbuild }: + +{ pname, version, buildInputs ? [], meta ? { platforms = ocaml.meta.platforms or []; }, + minimumOCamlVersion ? null, + createFindlibDestdir ? true, + dontStrip ? true, + ... +}@args: + +if args ? minimumOCamlVersion && + ! stdenv.lib.versionAtLeast ocaml.version args.minimumOCamlVersion +then throw "${pname}-${version} is not available for OCaml ${ocaml.version}" +else + +stdenv.mkDerivation (args // { + name = "ocaml${ocaml.version}-${pname}-${version}"; + + buildInputs = [ ocaml findlib ocamlbuild ocaml_oasis ] ++ buildInputs; + + inherit createFindlibDestdir; + inherit dontStrip; + + buildPhase = '' + runHook preBuild + oasis setup + ocaml setup.ml -configure + ocaml setup.ml -build + runHook postBuild + ''; + + checkPhase = '' + runHook preCheck + ocaml setup.ml -test + runHook postCheck + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out + sed -i s+/usr/local+$out+g setup.ml + sed -i s+/usr/local+$out+g setup.data + prefix=$OCAMLFIND_DESTDIR ocaml setup.ml -install + runHook postInstall + ''; + +}) diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 6afe93c7e4c..09802d56d34 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cacert, git, cargo, rustc, fetchcargo, buildPackages }: +{ stdenv, cacert, git, cargo, rustc, fetchcargo, buildPackages, windows }: { name ? "${args.pname}-${args.version}" , cargoSha256 ? "unset" @@ -41,18 +41,26 @@ let cargoDepsCopy="$sourceRoot/${cargoVendorDir}" ''; + hostConfig = stdenv.hostPlatform.config; + + rustHostConfig = { + "x86_64-pc-mingw32" = "x86_64-pc-windows-gnu"; + }."${hostConfig}" or hostConfig; + ccForBuild="${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc"; cxxForBuild="${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}c++"; ccForHost="${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"; cxxForHost="${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++"; - releaseDir = "target/${stdenv.hostPlatform.config}/${buildType}"; -in stdenv.mkDerivation (args // { + releaseDir = "target/${rustHostConfig}/${buildType}"; +in + +stdenv.mkDerivation (args // { inherit cargoDeps; patchRegistryDeps = ./patch-registry-deps; - nativeBuildInputs = [ cargo rustc git cacert ] ++ nativeBuildInputs; - inherit buildInputs; + nativeBuildInputs = nativeBuildInputs ++ [ cacert git cargo rustc ]; + buildInputs = buildInputs ++ stdenv.lib.optional stdenv.hostPlatform.isMinGW windows.pthreads; patches = cargoPatches ++ patches; @@ -72,23 +80,21 @@ in stdenv.mkDerivation (args // { substitute $config .cargo/config \ --subst-var-by vendor "$(pwd)/$cargoDepsCopy" - unset cargoDepsCopy - - export RUST_LOG=${logLevel} - '' + (args.postUnpack or ""); - - configurePhase = args.configurePhase or '' - runHook preConfigure - mkdir -p .cargo cat >> .cargo/config <<'EOF' [target."${stdenv.buildPlatform.config}"] "linker" = "${ccForBuild}" ${stdenv.lib.optionalString (stdenv.buildPlatform.config != stdenv.hostPlatform.config) '' - [target."${stdenv.hostPlatform.config}"] + [target."${rustHostConfig}"] "linker" = "${ccForHost}" ''} EOF - cat .cargo/config + + unset cargoDepsCopy + export RUST_LOG=${logLevel} + '' + (args.postUnpack or ""); + + configurePhase = args.configurePhase or '' + runHook preConfigure runHook postConfigure ''; @@ -104,7 +110,7 @@ in stdenv.mkDerivation (args // { "CXX_${stdenv.hostPlatform.config}"="${cxxForHost}" \ cargo build \ ${stdenv.lib.optionalString (buildType == "release") "--release"} \ - --target ${stdenv.hostPlatform.config} \ + --target ${rustHostConfig} \ --frozen ${concatStringsSep " " cargoBuildFlags} ) diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix index d495efc79ec..b3c6d585b8b 100644 --- a/pkgs/data/fonts/unifont/default.nix +++ b/pkgs/data/fonts/unifont/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { name = "unifont-${version}"; - version = "12.1.01"; + version = "12.1.03"; ttf = fetchurl { url = "mirror://gnu/unifont/${name}/${name}.ttf"; - sha256 = "05knv3vlnk8ahaybwz6r95d3a1h7h7q9ll6ij2jl7zgjhcx4zy5d"; + sha256 = "10igjlf05d97h3vcggr2ahxmq9ljby4ypja2g4s9bvxs2w1si51p"; }; pcf = fetchurl { url = "mirror://gnu/unifont/${name}/${name}.pcf.gz"; - sha256 = "0q7dlnfzk49m4pgf2s7jv05jysa6sfxx3w0y17yis9j7g18lyw1b"; + sha256 = "1cd1fnk3m7giqp099kynnjj4m7q00lqm4ybqb1vzd2wi3j4a1awf"; }; nativeBuildInputs = [ mkfontscale mkfontdir ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "0sgdr9dma4hkda3siydfvjrnzrpri8r7iqs2zqf77z9n4zn90qp5"; + outputHash = "0n3ms2k2mk7j6144l05c45smggwf3j5cwkaxhw93wf9hd1lhpwq1"; meta = with stdenv.lib; { description = "Unicode font for Base Multilingual Plane"; diff --git a/pkgs/data/fonts/unifont_upper/default.nix b/pkgs/data/fonts/unifont_upper/default.nix index ee2c2406bc6..21d31914479 100644 --- a/pkgs/data/fonts/unifont_upper/default.nix +++ b/pkgs/data/fonts/unifont_upper/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "12.1.02"; + version = "12.1.03"; in fetchzip rec { name = "unifont_upper-${version}"; @@ -9,7 +9,7 @@ in fetchzip rec { postFetch = "install -Dm644 $downloadedFile $out/share/fonts/truetype/unifont_upper.ttf"; - sha256 = "1bpzsgn64762sjkx4hssbm4qw0c1szwli38pch7r8z8hk4mgcv92"; + sha256 = "1w0bg276cyv6xs6clld8gv4w88rj9fw9rc8zs9ahc6y9hv677knj"; meta = with lib; { description = "Unicode font for glyphs above the Unicode Basic Multilingual Plane"; diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index eeee8d56664..87c4afb986b 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/4db96602103463d72e59ce214d0da8af35405f07.tar.gz"; - sha256 = "14r7m3555ngfafk2wgdj4lnv7zzajcc4j4fiws4k3kr3xwbrwrxr"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/2b4df08d487f0821b932f92392b67fe12dc1d42c.tar.gz"; + sha256 = "02d06fr2jr69za5751z25c3x3zspiwdmlhmdmxaj1g48v00gbfag"; } diff --git a/pkgs/data/misc/iana-etc/default.nix b/pkgs/data/misc/iana-etc/default.nix index 163f230e077..3124b57ac2b 100644 --- a/pkgs/data/misc/iana-etc/default.nix +++ b/pkgs/data/misc/iana-etc/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchzip }: let - version = "20190504"; + version = "20190731"; in fetchzip { name = "iana-etc-${version}"; url = "https://github.com/Mic92/iana-etc/releases/download/${version}/iana-etc-${version}.tar.gz"; - sha256 = "1h61qnb3ybyfivyq8qjnisj4arbnhn8hcwad1bp4iqidjk6rjfv3"; + sha256 = "0vqr4zm53zn7z75ynmf59xfrlhpyk8f41xd6i4v8j0f7k6hfdvpi"; postFetch = '' tar -xzvf $downloadedFile --strip-components=1 diff --git a/pkgs/desktops/enlightenment/terminology.nix b/pkgs/desktops/enlightenment/terminology.nix index 92d36c0e772..52f0ff15e23 100644 --- a/pkgs/desktops/enlightenment/terminology.nix +++ b/pkgs/desktops/enlightenment/terminology.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "terminology"; - version = "1.4.1"; + version = "1.5.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0mm9v5a94369is3kaarnr3a28wy42wslzi1mcisaidlcldgv7f6p"; + sha256 = "0v4amfg8ji0mb6j7kcxh3wz1xw5zyxg4rw6ylx17rfw2nc1yamfy"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix index 5c2eae883cf..078145e1231 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -2,7 +2,7 @@ , intltool, libsoup, libxml2, libsecret, icu, sqlite, tzdata, libcanberra-gtk3, gcr , p11-kit, db, nspr, nss, libical, gperf, wrapGAppsHook, glib-networking, pcre , vala, cmake, ninja, kerberos, openldap, webkitgtk, libaccounts-glib, json-glib -, glib, gtk3, gnome-online-accounts, libgweather, libgdata }: +, glib, gtk3, gnome-online-accounts, libgweather, libgdata, gsettings-desktop-schemas }: stdenv.mkDerivation rec { name = "evolution-data-server-${version}"; @@ -20,9 +20,14 @@ stdenv.mkDerivation rec { src = ./fix-paths.patch; inherit tzdata; }) - ./hardcode-gsettings.patch ]; + prePatch = '' + substitute ${./hardcode-gsettings.patch} hardcode-gsettings.patch --subst-var-by ESD_GSETTINGS_PATH $out/share/gsettings-schemas/${name}/glib-2.0/schemas \ + --subst-var-by GDS_GSETTINGS_PATH "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}/glib-2.0/schemas" + patches="$patches $PWD/hardcode-gsettings.patch" + ''; + nativeBuildInputs = [ cmake ninja pkgconfig intltool python3 gperf wrapGAppsHook gobject-introspection vala ]; @@ -43,11 +48,6 @@ stdenv.mkDerivation rec { "-DINCLUDE_INSTALL_DIR=${placeholder "dev"}/include" ]; - postPatch = '' - substituteInPlace src/libedataserver/e-source-registry.c --subst-var-by ESD_GSETTINGS_PATH $out/share/gsettings-schemas/${name}/glib-2.0/schemas - ''; - - passthru = { updateScript = gnome3.updateScript { packageName = "evolution-data-server"; diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/hardcode-gsettings.patch b/pkgs/desktops/gnome-3/core/evolution-data-server/hardcode-gsettings.patch index 8b64b3df801..c499bac4552 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/hardcode-gsettings.patch +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/hardcode-gsettings.patch @@ -1,36 +1,526 @@ -diff --git a/src/libedataserver/e-source-registry.c b/src/libedataserver/e-source-registry.c -index 9c166dbaf..ef368f8d4 100644 ---- a/src/libedataserver/e-source-registry.c -+++ b/src/libedataserver/e-source-registry.c -@@ -116,6 +116,8 @@ struct _ESourceRegistryPrivate { - GHashTable *sources; - GMutex sources_lock; +diff --git a/src/addressbook/libebook/e-book-client.c b/src/addressbook/libebook/e-book-client.c +index 2c0557c3c..5955aa55e 100644 +--- a/src/addressbook/libebook/e-book-client.c ++++ b/src/addressbook/libebook/e-book-client.c +@@ -1989,7 +1989,20 @@ e_book_client_get_self (ESourceRegistry *registry, -+ GSettingsSchemaSource *schema_source; -+ GSettingsSchema *schema; - GSettings *settings; + *out_client = book_client; + +- settings = g_settings_new (SELF_UID_PATH_ID); ++ { ++ GSettingsSchemaSource *schema_source; ++ GSettingsSchema *schema; ++ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ SELF_UID_PATH_ID, ++ FALSE); ++ settings = g_settings_new_full(schema, NULL, NULL); ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); ++ } + uid = g_settings_get_string (settings, SELF_UID_KEY); + g_object_unref (settings); - gboolean initialized; -@@ -1339,7 +1341,11 @@ source_registry_dispose (GObject *object) - if (priv->settings != NULL) { - g_signal_handlers_disconnect_by_data (priv->settings, object); - g_object_unref (priv->settings); -+ g_settings_schema_unref (priv->schema); -+ g_settings_schema_source_unref (priv->schema_source); - priv->settings = NULL; -+ priv->schema = NULL; -+ priv->schema_source = NULL; +@@ -2057,7 +2070,20 @@ e_book_client_set_self (EBookClient *client, + g_return_val_if_fail ( + e_contact_get_const (contact, E_CONTACT_UID) != NULL, FALSE); + +- settings = g_settings_new (SELF_UID_PATH_ID); ++ { ++ GSettingsSchemaSource *schema_source; ++ GSettingsSchema *schema; ++ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ SELF_UID_PATH_ID, ++ FALSE); ++ settings = g_settings_new_full(schema, NULL, NULL); ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); ++ } + g_settings_set_string ( + settings, SELF_UID_KEY, + e_contact_get_const (contact, E_CONTACT_UID)); +@@ -2093,8 +2119,20 @@ e_book_client_is_self (EContact *contact) + * unfortunately the API doesn't allow that. + */ + g_mutex_lock (&mutex); +- if (!settings) +- settings = g_settings_new (SELF_UID_PATH_ID); ++ if (!settings) { ++ GSettingsSchemaSource *schema_source; ++ GSettingsSchema *schema; ++ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ SELF_UID_PATH_ID, ++ FALSE); ++ settings = g_settings_new_full(schema, NULL, NULL); ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); ++ } + uid = g_settings_get_string (settings, SELF_UID_KEY); + g_mutex_unlock (&mutex); + +diff --git a/src/addressbook/libebook/e-book.c b/src/addressbook/libebook/e-book.c +index 3396b57c0..ac6420b2e 100644 +--- a/src/addressbook/libebook/e-book.c ++++ b/src/addressbook/libebook/e-book.c +@@ -2594,7 +2594,20 @@ e_book_get_self (ESourceRegistry *registry, + return FALSE; } - /* Chain up to parent's finalize() method. */ -@@ -1743,7 +1749,9 @@ e_source_registry_init (ESourceRegistry *registry) +- settings = g_settings_new (SELF_UID_PATH_ID); ++ { ++ GSettingsSchemaSource *schema_source; ++ GSettingsSchema *schema; ++ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ SELF_UID_PATH_ID, ++ FALSE); ++ settings = g_settings_new_full(schema, NULL, NULL); ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); ++ } + uid = g_settings_get_string (settings, SELF_UID_KEY); + g_object_unref (settings); + +@@ -2649,7 +2662,20 @@ e_book_set_self (EBook *book, + g_return_val_if_fail (E_IS_BOOK (book), FALSE); + g_return_val_if_fail (E_IS_CONTACT (contact), FALSE); + +- settings = g_settings_new (SELF_UID_PATH_ID); ++ { ++ GSettingsSchemaSource *schema_source; ++ GSettingsSchema *schema; ++ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ SELF_UID_PATH_ID, ++ FALSE); ++ settings = g_settings_new_full(schema, NULL, NULL); ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); ++ } + g_settings_set_string ( + settings, SELF_UID_KEY, + e_contact_get_const (contact, E_CONTACT_UID)); +@@ -2677,7 +2703,20 @@ e_book_is_self (EContact *contact) + + g_return_val_if_fail (E_IS_CONTACT (contact), FALSE); + +- settings = g_settings_new (SELF_UID_PATH_ID); ++ { ++ GSettingsSchemaSource *schema_source; ++ GSettingsSchema *schema; ++ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ SELF_UID_PATH_ID, ++ FALSE); ++ settings = g_settings_new_full(schema, NULL, NULL); ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); ++ } + uid = g_settings_get_string (settings, SELF_UID_KEY); + g_object_unref (settings); + +diff --git a/src/calendar/backends/contacts/e-cal-backend-contacts.c b/src/calendar/backends/contacts/e-cal-backend-contacts.c +index de1716941..e83b104f1 100644 +--- a/src/calendar/backends/contacts/e-cal-backend-contacts.c ++++ b/src/calendar/backends/contacts/e-cal-backend-contacts.c +@@ -1397,7 +1397,20 @@ e_cal_backend_contacts_init (ECalBackendContacts *cbc) + (GDestroyNotify) g_free, + (GDestroyNotify) contact_record_free); + +- cbc->priv->settings = g_settings_new ("org.gnome.evolution-data-server.calendar"); ++ { ++ GSettingsSchemaSource *schema_source; ++ GSettingsSchema *schema; ++ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ "org.gnome.evolution-data-server.calendar", ++ FALSE); ++ cbc->priv->settings = g_settings_new_full(schema, NULL, NULL); ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); ++ } + cbc->priv->notifyid = 0; + cbc->priv->update_alarms_id = 0; + cbc->priv->alarm_enabled = FALSE; +diff --git a/src/calendar/libecal/e-reminder-watcher.c b/src/calendar/libecal/e-reminder-watcher.c +index b08a7f301..a49fe39c5 100644 +--- a/src/calendar/libecal/e-reminder-watcher.c ++++ b/src/calendar/libecal/e-reminder-watcher.c +@@ -2202,7 +2202,21 @@ e_reminder_watcher_init (EReminderWatcher *watcher) + + watcher->priv = G_TYPE_INSTANCE_GET_PRIVATE (watcher, E_TYPE_REMINDER_WATCHER, EReminderWatcherPrivate); + watcher->priv->cancellable = g_cancellable_new (); +- watcher->priv->settings = g_settings_new ("org.gnome.evolution-data-server.calendar"); ++ { ++ GSettingsSchemaSource *schema_source; ++ GSettingsSchema *schema; ++ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ "org.gnome.evolution-data-server.calendar", ++ FALSE); ++ watcher->priv->settings = g_settings_new_full(schema, NULL, ++ NULL); ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); ++ } + watcher->priv->scheduled = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, e_reminder_watcher_free_rd_slist); + watcher->priv->default_zone = icaltimezone_copy (zone); + watcher->priv->timers_enabled = TRUE; +diff --git a/src/camel/camel-cipher-context.c b/src/camel/camel-cipher-context.c +index dcdc3eed0..fd2e428c2 100644 +--- a/src/camel/camel-cipher-context.c ++++ b/src/camel/camel-cipher-context.c +@@ -1635,7 +1635,20 @@ camel_cipher_can_load_photos (void) + GSettings *settings; + gboolean load_photos; + +- settings = g_settings_new ("org.gnome.evolution-data-server"); ++ { ++ GSettingsSchemaSource *schema_source; ++ GSettingsSchema *schema; ++ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ "org.gnome.evolution-data-server", ++ FALSE); ++ settings = g_settings_new_full(schema, NULL, NULL); ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); ++ } + load_photos = g_settings_get_boolean (settings, "camel-cipher-load-photos"); + g_clear_object (&settings); + +diff --git a/src/camel/camel-gpg-context.c b/src/camel/camel-gpg-context.c +index 1b3362886..f0811b292 100644 +--- a/src/camel/camel-gpg-context.c ++++ b/src/camel/camel-gpg-context.c +@@ -573,7 +573,20 @@ gpg_ctx_get_executable_name (void) + GSettings *settings; + gchar *path; + +- settings = g_settings_new ("org.gnome.evolution-data-server"); ++ { ++ GSettingsSchemaSource *schema_source; ++ GSettingsSchema *schema; ++ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ "org.gnome.evolution-data-server", ++ FALSE); ++ settings = g_settings_new_full(schema, NULL, NULL); ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); ++ } + path = g_settings_get_string (settings, "camel-gpg-binary"); + g_clear_object (&settings); + +diff --git a/src/libedataserver/e-network-monitor.c b/src/libedataserver/e-network-monitor.c +index e0d8b87d6..3a4d5a359 100644 +--- a/src/libedataserver/e-network-monitor.c ++++ b/src/libedataserver/e-network-monitor.c +@@ -255,7 +255,20 @@ e_network_monitor_constructed (GObject *object) + /* Chain up to parent's method. */ + G_OBJECT_CLASS (e_network_monitor_parent_class)->constructed (object); + +- settings = g_settings_new ("org.gnome.evolution-data-server"); ++ { ++ GSettingsSchemaSource *schema_source; ++ GSettingsSchema *schema; ++ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ "org.gnome.evolution-data-server", ++ FALSE); ++ settings = g_settings_new_full(schema, NULL, NULL); ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); ++ } + g_settings_bind ( + settings, "network-monitor-gio-name", + object, "gio-name", +diff --git a/src/libedataserver/e-oauth2-service-google.c b/src/libedataserver/e-oauth2-service-google.c +index f0c6f2cbf..0053e3ce6 100644 +--- a/src/libedataserver/e-oauth2-service-google.c ++++ b/src/libedataserver/e-oauth2-service-google.c +@@ -69,7 +69,20 @@ eos_google_read_settings (EOAuth2Service *service, + if (!value) { + GSettings *settings; + +- settings = g_settings_new ("org.gnome.evolution-data-server"); ++ { ++ GSettingsSchemaSource *schema_source; ++ GSettingsSchema *schema; ++ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ "org.gnome.evolution-data-server", ++ FALSE); ++ settings = g_settings_new_full(schema, NULL, NULL); ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); ++ } + value = g_settings_get_string (settings, key_name); + g_object_unref (settings); + +diff --git a/src/libedataserver/e-oauth2-service-outlook.c b/src/libedataserver/e-oauth2-service-outlook.c +index 687c10d3b..684583c35 100644 +--- a/src/libedataserver/e-oauth2-service-outlook.c ++++ b/src/libedataserver/e-oauth2-service-outlook.c +@@ -70,7 +70,20 @@ eos_outlook_read_settings (EOAuth2Service *service, + if (!value) { + GSettings *settings; + +- settings = g_settings_new ("org.gnome.evolution-data-server"); ++ { ++ GSettingsSchemaSource *schema_source; ++ GSettingsSchema *schema; ++ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ "org.gnome.evolution-data-server", ++ FALSE); ++ settings = g_settings_new_full(schema, NULL, NULL); ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); ++ } + value = g_settings_get_string (settings, key_name); + g_object_unref (settings); + +diff --git a/src/libedataserver/e-oauth2-service.c b/src/libedataserver/e-oauth2-service.c +index 682673c16..436f52d5f 100644 +--- a/src/libedataserver/e-oauth2-service.c ++++ b/src/libedataserver/e-oauth2-service.c +@@ -95,7 +95,20 @@ eos_default_guess_can_process (EOAuth2Service *service, + name_len = strlen (name); + hostname_len = strlen (hostname); + +- settings = g_settings_new ("org.gnome.evolution-data-server"); ++ { ++ GSettingsSchemaSource *schema_source; ++ GSettingsSchema *schema; ++ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ "org.gnome.evolution-data-server", ++ FALSE); ++ settings = g_settings_new_full(schema, NULL, NULL); ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); ++ } + values = g_settings_get_strv (settings, "oauth2-services-hint"); + g_object_unref (settings); + +diff --git a/src/libedataserver/e-proxy.c b/src/libedataserver/e-proxy.c +index 883379a60..989353494 100644 +--- a/src/libedataserver/e-proxy.c ++++ b/src/libedataserver/e-proxy.c +@@ -969,8 +969,37 @@ e_proxy_init (EProxy *proxy) + + proxy->priv->type = PROXY_TYPE_SYSTEM; + +- proxy->priv->evolution_proxy_settings = g_settings_new ("org.gnome.evolution.shell.network-config"); +- proxy->priv->proxy_settings = g_settings_new ("org.gnome.system.proxy"); ++ { ++ GSettingsSchemaSource *schema_source; ++ GSettingsSchema *schema; ++ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ "org.gnome.evolution.shell.network-config", ++ FALSE); ++ proxy->priv->evolution_proxy_settings = g_settings_new_full(schema, ++ NULL, ++ NULL); ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); ++ } ++ { ++ GSettingsSchemaSource *schema_source; ++ GSettingsSchema *schema; ++ schema_source = g_settings_schema_source_new_from_directory("@GDS_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ "org.gnome.system.proxy", ++ FALSE); ++ proxy->priv->proxy_settings = g_settings_new_full(schema, ++ NULL, NULL); ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); ++ } + proxy->priv->proxy_http_settings = g_settings_get_child (proxy->priv->proxy_settings, "http"); + proxy->priv->proxy_https_settings = g_settings_get_child (proxy->priv->proxy_settings, "https"); + proxy->priv->proxy_socks_settings = g_settings_get_child (proxy->priv->proxy_settings, "socks"); +diff --git a/src/libedataserver/e-source-registry.c b/src/libedataserver/e-source-registry.c +index a5a30a3e1..5fbdf8190 100644 +--- a/src/libedataserver/e-source-registry.c ++++ b/src/libedataserver/e-source-registry.c +@@ -1749,7 +1749,21 @@ e_source_registry_init (ESourceRegistry *registry) g_mutex_init (®istry->priv->sources_lock); - registry->priv->settings = g_settings_new (GSETTINGS_SCHEMA); -+ GSettingsSchemaSource *schema_source = registry->priv->schema_source = g_settings_schema_source_new_from_directory ("@ESD_GSETTINGS_PATH@", g_settings_schema_source_get_default (), TRUE, NULL); -+ registry->priv->schema = g_settings_schema_source_lookup (schema_source, GSETTINGS_SCHEMA, FALSE); -+ registry->priv->settings = g_settings_new_full (registry->priv->schema, NULL, NULL); ++ { ++ GSettingsSchemaSource *schema_source; ++ GSettingsSchema *schema; ++ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ GSETTINGS_SCHEMA, ++ FALSE); ++ registry->priv->settings = g_settings_new_full(schema, NULL, ++ NULL); ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); ++ } g_signal_connect ( registry->priv->settings, "changed", +diff --git a/src/libedataserverui/e-reminders-widget.c b/src/libedataserverui/e-reminders-widget.c +index f89cd4a5c..06cca9b5f 100644 +--- a/src/libedataserverui/e-reminders-widget.c ++++ b/src/libedataserverui/e-reminders-widget.c +@@ -1642,7 +1642,21 @@ static void + e_reminders_widget_init (ERemindersWidget *reminders) + { + reminders->priv = G_TYPE_INSTANCE_GET_PRIVATE (reminders, E_TYPE_REMINDERS_WIDGET, ERemindersWidgetPrivate); +- reminders->priv->settings = g_settings_new ("org.gnome.evolution-data-server.calendar"); ++ { ++ GSettingsSchemaSource *schema_source; ++ GSettingsSchema *schema; ++ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ "org.gnome.evolution-data-server.calendar", ++ FALSE); ++ reminders->priv->settings = g_settings_new_full(schema, NULL, ++ NULL); ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); ++ } + reminders->priv->cancellable = g_cancellable_new (); + reminders->priv->is_empty = TRUE; + reminders->priv->is_mapped = FALSE; +diff --git a/src/services/evolution-source-registry/evolution-source-registry-autoconfig.c b/src/services/evolution-source-registry/evolution-source-registry-autoconfig.c +index 6f03053d6..dffc186c7 100644 +--- a/src/services/evolution-source-registry/evolution-source-registry-autoconfig.c ++++ b/src/services/evolution-source-registry/evolution-source-registry-autoconfig.c +@@ -706,7 +706,20 @@ evolution_source_registry_merge_autoconfig_sources (ESourceRegistryServer *serve + gchar *autoconfig_directory; + gint ii; + +- settings = g_settings_new ("org.gnome.evolution-data-server"); ++ { ++ GSettingsSchemaSource *schema_source; ++ GSettingsSchema *schema; ++ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ "org.gnome.evolution-data-server", ++ FALSE); ++ settings = g_settings_new_full(schema, NULL, NULL); ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); ++ } + + autoconfig_sources = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, e_autoconfig_free_merge_source_data); + +diff --git a/src/services/evolution-source-registry/evolution-source-registry-migrate-proxies.c b/src/services/evolution-source-registry/evolution-source-registry-migrate-proxies.c +index d531cb9e2..c5b1c761c 100644 +--- a/src/services/evolution-source-registry/evolution-source-registry-migrate-proxies.c ++++ b/src/services/evolution-source-registry/evolution-source-registry-migrate-proxies.c +@@ -61,7 +61,20 @@ evolution_source_registry_migrate_proxies (ESourceRegistryServer *server) + extension_name = E_SOURCE_EXTENSION_PROXY; + extension = e_source_get_extension (source, extension_name); + +- settings = g_settings_new (NETWORK_CONFIG_SCHEMA_ID); ++ { ++ GSettingsSchemaSource *schema_source; ++ GSettingsSchema *schema; ++ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ NETWORK_CONFIG_SCHEMA_ID, ++ FALSE); ++ settings = g_settings_new_full(schema, NULL, NULL); ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); ++ } + + switch (g_settings_get_int (settings, "proxy-type")) { + case 1: +diff --git a/src/services/evolution-source-registry/evolution-source-registry.c b/src/services/evolution-source-registry/evolution-source-registry.c +index 1c0a11382..3e144845e 100644 +--- a/src/services/evolution-source-registry/evolution-source-registry.c ++++ b/src/services/evolution-source-registry/evolution-source-registry.c +@@ -181,7 +181,20 @@ main (gint argc, + + reload: + +- settings = g_settings_new ("org.gnome.evolution-data-server"); ++ { ++ GSettingsSchemaSource *schema_source; ++ GSettingsSchema *schema; ++ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ "org.gnome.evolution-data-server", ++ FALSE); ++ settings = g_settings_new_full(schema, NULL, NULL); ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); ++ } + + if (!opt_disable_migration && !g_settings_get_boolean (settings, "migrated")) { + g_settings_set_boolean (settings, "migrated", TRUE); diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix index e301305d405..6d487597900 100644 --- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-software/default.nix @@ -3,6 +3,12 @@ , gtk3, gsettings-desktop-schemas, gnome-desktop, libxmlb, gnome-online-accounts, hicolor-icon-theme , json-glib, libsecret, valgrind-light, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_43, gtk-doc, desktop-file-utils }: +let + + withFwupd = stdenv.isx86_64 || stdenv.isi686; + +in + stdenv.mkDerivation rec { name = "gnome-software-${version}"; version = "3.32.4"; @@ -29,13 +35,16 @@ stdenv.mkDerivation rec { gtk3 glib packagekit appstream-glib libsoup gsettings-desktop-schemas gnome-desktop gspell json-glib libsecret ostree - polkit flatpak fwupd - libxmlb gnome-online-accounts + polkit flatpak libxmlb gnome-online-accounts + ] ++ stdenv.lib.optionals withFwupd [ + fwupd ]; mesonFlags = [ "-Dubuntu_reviews=false" "-Dgudev=false" + ] ++ stdenv.lib.optionals (!withFwupd) [ + "-Dfwupd=false" ]; passthru = { diff --git a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix index 4a4850a0824..bcbe50e5de3 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix @@ -1,25 +1,38 @@ -{ stdenv, fetchFromGitHub, pantheon, pkgconfig -, meson, ninja, vala, desktop-file-utils, libxml2 -, gtk3, python3, granite, libgee, elementary-icon-theme -, appstream, wrapGAppsHook }: +{ stdenv +, fetchFromGitHub +, pantheon +, pkgconfig +, meson +, ninja +, vala +, desktop-file-utils +, libxml2 +, gtk3 +, python3 +, granite +, libgee +, elementary-icon-theme +, appstream +, wrapGAppsHook +}: stdenv.mkDerivation rec { - pname = "calculator"; + pname = "elementary-calculator"; version = "1.5.2"; - name = "elementary-${pname}-${version}"; + repoName = "calculator"; src = fetchFromGitHub { owner = "elementary"; - repo = pname; + repo = repoName; rev = version; sha256 = "1vdgl89hdf9q1ya6as7310hlr0xls3w7js2gzsd9z8arb6037ccl"; }; passthru = { updateScript = pantheon.updateScript { - repoName = pname; - attrPath = "elementary-${pname}"; + inherit repoName; + attrPath = pname; }; }; diff --git a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix index 9f684c22767..b806c085f84 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix @@ -1,26 +1,45 @@ -{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson -, ninja, vala, desktop-file-utils, gtk3, granite, libgee -, geoclue2, libchamplain, clutter, folks, geocode-glib, python3 -, libnotify, libical, evolution-data-server, appstream-glib -, elementary-icon-theme, wrapGAppsHook }: +{ stdenv +, fetchFromGitHub +, pantheon +, pkgconfig +, meson +, ninja +, vala +, desktop-file-utils +, gtk3 +, granite +, libgee +, geoclue2 +, libchamplain +, clutter +, folks +, geocode-glib +, python3 +, libnotify +, libical +, evolution-data-server +, appstream-glib +, elementary-icon-theme +, wrapGAppsHook +}: stdenv.mkDerivation rec { - pname = "calendar"; + pname = "elementary-calendar"; version = "5.0"; - name = "elementary-${pname}-${version}"; + repoName = "calendar"; src = fetchFromGitHub { owner = "elementary"; - repo = pname; + repo = repoName; rev = version; sha256 = "0yiis5ig98gjw4s2qh8lppkdmv1cgi6qchxqncsjdki7yxyyni35"; }; passthru = { updateScript = pantheon.updateScript { - repoName = pname; - attrPath = "elementary-${pname}"; + inherit repoName; + attrPath = pname; }; }; diff --git a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix index 90f326fb826..279e9eff87a 100644 --- a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix @@ -1,24 +1,43 @@ -{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, vala -, desktop-file-utils, python3, gettext, libxml2, gtk3, granite, libgee, gst_all_1 -, libcanberra, clutter-gtk, clutter-gst, elementary-icon-theme, appstream, wrapGAppsHook }: +{ stdenv +, fetchFromGitHub +, pantheon +, pkgconfig +, meson +, ninja +, vala +, desktop-file-utils +, python3 +, gettext +, libxml2 +, gtk3 +, granite +, libgee +, gst_all_1 +, libcanberra +, clutter-gtk +, clutter-gst +, elementary-icon-theme +, appstream +, wrapGAppsHook +}: stdenv.mkDerivation rec { - pname = "camera"; + pname = "elementary-camera"; version = "1.0.4"; - name = "elementary-${pname}-${version}"; + repoName = "camera"; src = fetchFromGitHub { owner = "elementary"; - repo = pname; + repo = repoName; rev = version; sha256 = "1p532f961cjdg7szmxw7hw3av9v342hv5rx7in3bbhlc7adxflyc"; }; passthru = { updateScript = pantheon.updateScript { - repoName = pname; - attrPath = "elementary-${pname}"; + inherit repoName; + attrPath = pname; }; }; diff --git a/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/pkgs/desktops/pantheon/apps/elementary-code/default.nix index a869ff24e92..355f3ea8d0f 100644 --- a/pkgs/desktops/pantheon/apps/elementary-code/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-code/default.nix @@ -1,25 +1,47 @@ -{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, vala -, python3, desktop-file-utils, gtk3, granite, libgee, elementary-icon-theme -, appstream, libpeas, editorconfig-core-c, gtksourceview3, gtkspell3, libsoup -, vte, webkitgtk, zeitgeist, ctags, libgit2-glib, wrapGAppsHook }: +{ stdenv +, fetchFromGitHub +, pantheon +, pkgconfig +, meson +, ninja +, vala +, python3 +, desktop-file-utils +, gtk3 +, granite +, libgee +, elementary-icon-theme +, appstream +, libpeas +, editorconfig-core-c +, gtksourceview3 +, gtkspell3 +, libsoup +, vte +, webkitgtk +, zeitgeist +, ctags +, libgit2-glib +, wrapGAppsHook +}: stdenv.mkDerivation rec { - pname = "code"; + pname = "elementary-code"; version = "3.1.1"; - name = "elementary-${pname}-${version}"; + repoName = "code"; src = fetchFromGitHub { owner = "elementary"; - repo = pname; + repo = repoName; rev = version; sha256 = "0l469fi5vbcazwfhy320nr8wrzz96jbrqn4hag0kdm16wvf5x1yc"; }; passthru = { updateScript = pantheon.updateScript { - repoName = pname; - attrPath = "elementary-${pname}"; + inherit repoName; + attrPath = pname; }; }; @@ -36,8 +58,8 @@ stdenv.mkDerivation rec { buildInputs = [ ctags - elementary-icon-theme editorconfig-core-c + elementary-icon-theme granite gtk3 gtksourceview3 diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix index ad4cfa86c27..ae6583c4672 100644 --- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix @@ -1,25 +1,49 @@ -{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, gettext, vala -, python3, desktop-file-utils, libcanberra, gtk3, libgee, granite, libnotify -, libunity, pango, plank, bamf, sqlite, libdbusmenu-gtk3, zeitgeist, glib-networking -, elementary-icon-theme, wrapGAppsHook }: +{ stdenv +, fetchFromGitHub +, pantheon +, pkgconfig +, meson +, ninja +, gettext +, vala +, python3 +, desktop-file-utils +, libcanberra +, gtk3 +, libgee +, granite +, libnotify +, libunity +, pango +, plank +, bamf +, sqlite +, libdbusmenu-gtk3 +, zeitgeist +, glib-networking +, elementary-icon-theme +, wrapGAppsHook +}: stdenv.mkDerivation rec { - pname = "files"; + pname = "elementary-files"; version = "4.1.9"; - name = "elementary-${pname}-${version}"; + repoName = "files"; + + outputs = [ "out" "dev" ]; src = fetchFromGitHub { owner = "elementary"; - repo = pname; + repo = repoName; rev = version; sha256 = "12p1li9a7kqdlgkq20svaly5kr661ww93qngaiic6zv1bdw2bpmv"; }; passthru = { updateScript = pantheon.updateScript { - repoName = pname; - attrPath = "elementary-${pname}"; + inherit repoName; + attrPath = pname; }; }; @@ -57,7 +81,8 @@ stdenv.mkDerivation rec { chmod +x meson/post_install.py patchShebangs meson/post_install.py - substituteInPlace filechooser-module/FileChooserDialog.vala --subst-var-by ELEMENTARY_FILES_GSETTINGS_PATH $out/share/gsettings-schemas/${name}/glib-2.0/schemas + substituteInPlace filechooser-module/FileChooserDialog.vala \ + --subst-var-by ELEMENTARY_FILES_GSETTINGS_PATH $out/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/pantheon/apps/elementary-music/default.nix b/pkgs/desktops/pantheon/apps/elementary-music/default.nix index cba593e4c96..7d235551a80 100644 --- a/pkgs/desktops/pantheon/apps/elementary-music/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-music/default.nix @@ -1,27 +1,49 @@ -{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson -, ninja, vala, desktop-file-utils, gtk3, granite -, python3, libgee, clutter-gtk, json-glib, libgda, libgpod -, libnotify, libpeas, libsoup, zeitgeist, gst_all_1, taglib -, libdbusmenu, libsignon-glib, libaccounts-glib -, elementary-icon-theme, wrapGAppsHook }: +{ stdenv +, fetchFromGitHub +, pantheon +, pkgconfig +, meson +, ninja +, vala +, desktop-file-utils +, gtk3 +, granite +, python3 +, libgee +, clutter-gtk +, json-glib +, libgda +, libgpod +, libnotify +, libpeas +, libsoup +, zeitgeist +, gst_all_1 +, taglib +, libdbusmenu +, libsignon-glib +, libaccounts-glib +, elementary-icon-theme +, wrapGAppsHook +}: stdenv.mkDerivation rec { - pname = "music"; + pname = "elementary-music"; version = "5.0.4"; - name = "elementary-${pname}-${version}"; + repoName = "music"; src = fetchFromGitHub { owner = "elementary"; - repo = pname; + repo = repoName; rev = version; sha256 = "02qjsf9xnfh043xbls9mll2r1wcdvclw60x8wysv12rhbm90gwvp"; }; passthru = { updateScript = pantheon.updateScript { - repoName = pname; - attrPath = "elementary-${pname}"; + inherit repoName; + attrPath = pname; }; }; @@ -51,9 +73,9 @@ stdenv.mkDerivation rec { libgda libgee libgpod - libsignon-glib libnotify libpeas + libsignon-glib libsoup taglib zeitgeist diff --git a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix index 1704db78c5e..94b6a2fce8e 100644 --- a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix @@ -1,25 +1,53 @@ -{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, vala, desktop-file-utils -, gtk3, libaccounts-glib, libexif, libgee, geocode-glib, gexiv2,libgphoto2 -, granite, gst_all_1, libgudev, json-glib, libraw, librest, libsoup, sqlite, python3 -, scour, webkitgtk, libwebp, appstream, libunity, wrapGAppsHook, elementary-icon-theme }: +{ stdenv +, fetchFromGitHub +, pantheon +, meson +, ninja +, pkgconfig +, vala +, desktop-file-utils +, gtk3 +, libaccounts-glib +, libexif +, libgee +, geocode-glib +, gexiv2 +, libgphoto2 +, granite +, gst_all_1 +, libgudev +, json-glib +, libraw +, librest +, libsoup +, sqlite +, python3 +, scour +, webkitgtk +, libwebp +, appstream +, libunity +, wrapGAppsHook +, elementary-icon-theme +}: stdenv.mkDerivation rec { - pname = "photos"; + pname = "elementary-photos"; version = "2.6.4"; - name = "elementary-${pname}-${version}"; + repoName = "photos"; src = fetchFromGitHub { owner = "elementary"; - repo = pname; + repo = repoName; rev = version; sha256 = "17r9658s0pqy6s45ysi3915sm8hpvmsp7cw2jahqvjc61r4qpdc1"; }; passthru = { updateScript = pantheon.updateScript { - repoName = pname; - attrPath = "elementary-${pname}"; + inherit repoName; + attrPath = pname; }; }; @@ -52,10 +80,10 @@ stdenv.mkDerivation rec { libgphoto2 libgudev libraw + librest libsoup libunity libwebp - librest scour sqlite webkitgtk diff --git a/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix b/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix index 74af15e2787..4dd168f25f0 100644 --- a/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix @@ -1,24 +1,37 @@ -{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson -, ninja, vala, python3, desktop-file-utils, gtk3, granite, libgee -, libcanberra, elementary-icon-theme, wrapGAppsHook }: +{ stdenv +, fetchFromGitHub +, pantheon +, pkgconfig +, meson +, ninja +, vala +, python3 +, desktop-file-utils +, gtk3 +, granite +, libgee +, libcanberra +, elementary-icon-theme +, wrapGAppsHook +}: stdenv.mkDerivation rec { - pname = "screenshot-tool"; # This will be renamed to "screenshot" soon. See -> https://github.com/elementary/screenshot/pull/93 + pname = "elementary-screenshot-tool"; # This will be renamed to "screenshot" soon. See -> https://github.com/elementary/screenshot/pull/93 version = "1.6.2"; - name = "elementary-${pname}-${version}"; + repoName = "screenshot"; src = fetchFromGitHub { owner = "elementary"; - repo = "screenshot"; + repo = repoName; rev = version; sha256 = "1z61j96jk9zjr3bn5hgsp25m4v8h1rqwxm0kg8c34bvl06f13v8q"; }; passthru = { updateScript = pantheon.updateScript { - repoName = "screenshot"; - attrPath = "elementary-${pname}"; + inherit repoName; + attrPath = pname; }; }; diff --git a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix index 2479d999e8f..8bd335c6530 100644 --- a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix @@ -1,24 +1,40 @@ -{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, python3 -, vala, desktop-file-utils, gtk3, libxml2, granite, libnotify, vte, libgee -, elementary-icon-theme, appstream, wrapGAppsHook }: +{ stdenv +, fetchFromGitHub +, pantheon +, pkgconfig +, meson +, ninja +, python3 +, vala +, desktop-file-utils +, gtk3 +, libxml2 +, granite +, libnotify +, vte +, libgee +, elementary-icon-theme +, appstream +, wrapGAppsHook +}: stdenv.mkDerivation rec { - pname = "terminal"; + pname = "elementary-terminal"; version = "5.3.6"; - name = "elementary-${pname}-${version}"; + repoName = "terminal"; src = fetchFromGitHub { owner = "elementary"; - repo = pname; + repo = repoName; rev = version; sha256 = "0jp21sy8k3jq3ycvng9yy2hbhcvfgiknxxa8vcg3c06vqhadmnc3"; }; passthru = { updateScript = pantheon.updateScript { - repoName = pname; - attrPath = "elementary-${pname}"; + inherit repoName; + attrPath = pname; }; }; diff --git a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix index 2d978d966b9..9132707db2b 100644 --- a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix @@ -1,24 +1,39 @@ -{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, vala, python3 -, desktop-file-utils, gtk3, granite, libgee, clutter-gst, clutter-gtk, gst_all_1 -, elementary-icon-theme, wrapGAppsHook }: +{ stdenv +, fetchFromGitHub +, pantheon +, pkgconfig +, meson +, ninja +, vala +, python3 +, desktop-file-utils +, gtk3 +, granite +, libgee +, clutter-gst +, clutter-gtk +, gst_all_1 +, elementary-icon-theme +, wrapGAppsHook +}: stdenv.mkDerivation rec { - pname = "videos"; + pname = "elementary-videos"; version = "2.6.3"; - name = "elementary-${pname}-${version}"; + repoName = "videos"; src = fetchFromGitHub { owner = "elementary"; - repo = pname; + repo = repoName; rev = version; sha256 = "1ncm8kh6dcy83p8pmpilnk03b4dx3b1jm8w13izq2dkglfgdwvqx"; }; passthru = { updateScript = pantheon.updateScript { - repoName = pname; - attrPath = "elementary-${pname}"; + inherit repoName; + attrPath = pname; }; }; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix index 859e04eb954..a03594b7b18 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix @@ -1,5 +1,15 @@ -{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig -, vala, libgee, granite, gtk3, switchboard }: +{ stdenv +, fetchFromGitHub +, pantheon +, meson +, ninja +, pkgconfig +, vala +, libgee +, granite +, gtk3 +, switchboard +}: stdenv.mkDerivation rec { pname = "switchboard-plug-a11y"; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix index 6d7ecbffa31..bd6df460c04 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix @@ -1,5 +1,17 @@ -{ stdenv, fetchFromGitHub, pantheon, substituteAll, meson, ninja -, pkgconfig, vala, libgee, granite, gtk3, switchboard, pciutils }: +{ stdenv +, fetchFromGitHub +, pantheon +, substituteAll +, meson +, ninja +, pkgconfig +, vala +, libgee +, granite +, gtk3 +, switchboard +, pciutils +}: stdenv.mkDerivation rec { pname = "switchboard-plug-about"; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix index 0d7586391ce..dca9cc662a2 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix @@ -1,5 +1,15 @@ -{ stdenv, fetchFromGitHub, pantheon, meson, ninja -, pkgconfig, vala, libgee, granite, gtk3, switchboard }: +{ stdenv +, fetchFromGitHub +, pantheon +, meson +, ninja +, pkgconfig +, vala +, libgee +, granite +, gtk3 +, switchboard +}: stdenv.mkDerivation rec { pname = "switchboard-plug-applications"; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix index 547b6d897e4..d1663ad48cd 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix @@ -1,5 +1,16 @@ -{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig -, vala, libgee, granite, gtk3, bluez, switchboard }: +{ stdenv +, fetchFromGitHub +, pantheon +, meson +, ninja +, pkgconfig +, vala +, libgee +, granite +, gtk3 +, bluez +, switchboard +}: stdenv.mkDerivation rec { pname = "switchboard-plug-bluetooth"; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix index e1303a3cc48..fb7ea18e88b 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix @@ -1,5 +1,18 @@ -{ stdenv, fetchFromGitHub, pantheon, meson, ninja, substituteAll, pkgconfig -, vala, libgee, granite, gtk3, libxml2, switchboard, tzdata }: +{ stdenv +, fetchFromGitHub +, pantheon +, meson +, ninja +, substituteAll +, pkgconfig +, vala +, libgee +, granite +, gtk3 +, libxml2 +, switchboard +, tzdata +}: stdenv.mkDerivation rec { pname = "switchboard-plug-datetime"; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix index 22fb795297e..c15abfd8cb8 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix @@ -1,5 +1,15 @@ -{ stdenv, fetchFromGitHub, pantheon, meson, ninja -, pkgconfig, vala, libgee, granite, gtk3, switchboard }: +{ stdenv +, fetchFromGitHub +, pantheon +, meson +, ninja +, pkgconfig +, vala +, libgee +, granite +, gtk3 +, switchboard +}: stdenv.mkDerivation rec { pname = "switchboard-plug-display"; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix index 71f865bdeb6..ba753af7e20 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix @@ -1,5 +1,20 @@ -{ stdenv, fetchFromGitHub, pantheon, substituteAll, meson, ninja, pkgconfig -, vala, libgee, granite, gtk3, libxml2, libgnomekbd, libxklavier, xorg, switchboard }: +{ stdenv +, fetchFromGitHub +, pantheon +, substituteAll +, meson +, ninja +, pkgconfig +, vala +, libgee +, granite +, gtk3 +, libxml2 +, libgnomekbd +, libxklavier +, xorg +, switchboard +}: stdenv.mkDerivation rec { pname = "switchboard-plug-keyboard"; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix index 76edfa18add..00579c54525 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix @@ -1,5 +1,16 @@ -{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, vala -, libgee, granite, gtk3, switchboard, elementary-settings-daemon }: +{ stdenv +, fetchFromGitHub +, pantheon +, meson +, ninja +, pkgconfig +, vala +, libgee +, granite +, gtk3 +, switchboard +, elementary-settings-daemon +}: stdenv.mkDerivation rec { pname = "switchboard-plug-mouse-touchpad"; @@ -17,7 +28,8 @@ stdenv.mkDerivation rec { ]; postPatch = '' - substituteInPlace src/Views/General.vala --subst-var-by GSD_GSETTINGS ${elementary-settings-daemon}/share/gsettings-schemas/${elementary-settings-daemon.name}/glib-2.0/schemas + substituteInPlace src/Views/General.vala \ + --subst-var-by GSD_GSETTINGS ${elementary-settings-daemon}/share/gsettings-schemas/${elementary-settings-daemon.name}/glib-2.0/schemas ''; passthru = { diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix index 283a13bd82a..09d6da4f246 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix @@ -1,5 +1,18 @@ -{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, substituteAll, vala -, libgee, granite, gtk3, networkmanager, networkmanagerapplet, switchboard }: +{ stdenv +, fetchFromGitHub +, pantheon +, meson +, ninja +, pkgconfig +, substituteAll +, vala +, libgee +, granite +, gtk3 +, networkmanager +, networkmanagerapplet +, switchboard +}: stdenv.mkDerivation rec { pname = "switchboard-plug-network"; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix index 277f70cf984..e547f22fec1 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix @@ -1,5 +1,15 @@ -{ stdenv, fetchFromGitHub, pantheon, meson, ninja -, pkgconfig, vala, libgee, granite, gtk3, switchboard }: +{ stdenv +, fetchFromGitHub +, pantheon +, meson +, ninja +, pkgconfig +, vala +, libgee +, granite +, gtk3 +, switchboard +}: stdenv.mkDerivation rec { pname = "switchboard-plug-notifications"; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix index 496a69ce1f6..aa9cdfa0ddd 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix @@ -1,6 +1,21 @@ -{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, vala -, libgee, granite, gtk3, libaccounts-glib, libsignon-glib, json-glib -, librest, webkitgtk, libsoup, switchboard }: +{ stdenv +, fetchFromGitHub +, pantheon +, meson +, ninja +, pkgconfig +, vala +, libgee +, granite +, gtk3 +, libaccounts-glib +, libsignon-glib +, json-glib +, librest +, webkitgtk +, libsoup +, switchboard +}: stdenv.mkDerivation rec { pname = "switchboard-plug-onlineaccounts"; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix index 57ae3215f5f..b9fad17c2f7 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix @@ -50,8 +50,10 @@ stdenv.mkDerivation rec { ]; postPatch = '' - substituteInPlace src/Views/Appearance.vala --subst-var-by GALA_GSETTINGS_PATH ${gala}/share/gsettings-schemas/${gala.name}/glib-2.0/schemas - substituteInPlace src/Views/Appearance.vala --subst-var-by WINGPANEL_GSETTINGS_PATH ${wingpanel}/share/gsettings-schemas/${wingpanel.name}/glib-2.0/schemas + substituteInPlace src/Views/Appearance.vala \ + --subst-var-by GALA_GSETTINGS_PATH ${gala}/share/gsettings-schemas/${gala.name}/glib-2.0/schemas + substituteInPlace src/Views/Appearance.vala \ + --subst-var-by WINGPANEL_GSETTINGS_PATH ${wingpanel}/share/gsettings-schemas/${wingpanel.name}/glib-2.0/schemas ''; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix index 8a56a8535e8..461ddcd3764 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix @@ -1,6 +1,20 @@ -{ stdenv, fetchFromGitHub, pantheon, substituteAll, meson, ninja -, pkgconfig, vala, libgee, elementary-dpms-helper, elementary-settings-daemon -, granite, gtk3, dbus, polkit, switchboard }: +{ stdenv +, fetchFromGitHub +, pantheon +, substituteAll +, meson +, ninja +, pkgconfig +, vala +, libgee +, elementary-dpms-helper +, elementary-settings-daemon +, granite +, gtk3 +, dbus +, polkit +, switchboard +}: stdenv.mkDerivation rec { pname = "switchboard-plug-power"; @@ -44,8 +58,10 @@ stdenv.mkDerivation rec { ]; postPatch = '' - substituteInPlace src/MainView.vala --subst-var-by DPMS_HELPER_GSETTINGS_PATH ${elementary-dpms-helper}/share/gsettings-schemas/${elementary-dpms-helper.name}/glib-2.0/schemas - substituteInPlace src/MainView.vala --subst-var-by GSD_GSETTINGS_PATH ${elementary-settings-daemon}/share/gsettings-schemas/${elementary-settings-daemon.name}/glib-2.0/schemas + substituteInPlace src/MainView.vala \ + --subst-var-by DPMS_HELPER_GSETTINGS_PATH ${elementary-dpms-helper}/share/gsettings-schemas/${elementary-dpms-helper.name}/glib-2.0/schemas + substituteInPlace src/MainView.vala \ + --subst-var-by GSD_GSETTINGS_PATH ${elementary-settings-daemon}/share/gsettings-schemas/${elementary-settings-daemon.name}/glib-2.0/schemas ''; PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard"; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix index 293faad51c7..5c303e04982 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix @@ -1,5 +1,16 @@ -{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig -, vala, libgee, granite, gtk3, cups, switchboard }: +{ stdenv +, fetchFromGitHub +, pantheon +, meson +, ninja +, pkgconfig +, vala +, libgee +, granite +, gtk3 +, cups +, switchboard +}: stdenv.mkDerivation rec { pname = "switchboard-plug-printers"; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix index d35844320a1..19967c3bce0 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix @@ -1,6 +1,19 @@ -{ stdenv, fetchFromGitHub, pantheon, meson, python3, ninja -, pkgconfig, vala, libgee, granite, gtk3, polkit, zeitgeist -, switchboard, lightlocker }: +{ stdenv +, fetchFromGitHub +, pantheon +, meson +, python3 +, ninja +, pkgconfig +, vala +, libgee +, granite +, gtk3 +, polkit +, zeitgeist +, switchboard +, lightlocker +}: stdenv.mkDerivation rec { pname = "switchboard-plug-security-privacy"; @@ -46,8 +59,10 @@ stdenv.mkDerivation rec { chmod +x meson/post_install.py patchShebangs meson/post_install.py - substituteInPlace src/Views/LockPanel.vala --subst-var-by LIGHTLOCKER_GSETTINGS_PATH ${lightlocker}/share/gsettings-schemas/${lightlocker.name}/glib-2.0/schemas - substituteInPlace src/Views/FirewallPanel.vala --subst-var-by SWITCHBOARD_SEC_PRIV_GSETTINGS_PATH $out/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas + substituteInPlace src/Views/LockPanel.vala \ + --subst-var-by LIGHTLOCKER_GSETTINGS_PATH ${lightlocker}/share/gsettings-schemas/${lightlocker.name}/glib-2.0/schemas + substituteInPlace src/Views/FirewallPanel.vala \ + --subst-var-by SWITCHBOARD_SEC_PRIV_GSETTINGS_PATH $out/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix index 265352ed881..b4aafb27006 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix @@ -1,5 +1,15 @@ -{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig -, vala, libgee, granite, gtk3, switchboard }: +{ stdenv +, fetchFromGitHub +, pantheon +, meson +, ninja +, pkgconfig +, vala +, libgee +, granite +, gtk3 +, switchboard +}: stdenv.mkDerivation rec { pname = "switchboard-plug-sharing"; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix index 907bdc37e2a..ed3518c764f 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix @@ -1,5 +1,18 @@ -{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, vala, libgee -, granite, gtk3, pulseaudio, libcanberra, libcanberra-gtk3, switchboard }: +{ stdenv +, fetchFromGitHub +, pantheon +, meson +, ninja +, pkgconfig +, vala +, libgee +, granite +, gtk3 +, pulseaudio +, libcanberra +, libcanberra-gtk3 +, switchboard +}: stdenv.mkDerivation rec { pname = "switchboard-plug-sound"; diff --git a/pkgs/desktops/pantheon/apps/switchboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard/default.nix index 12edf97f6ba..5c10cc0e9e4 100644 --- a/pkgs/desktops/pantheon/apps/switchboard/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard/default.nix @@ -1,6 +1,20 @@ -{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, python3, ninja -, vala, gtk3, libgee, granite, gettext, clutter-gtk, libunity -, elementary-icon-theme, wrapGAppsHook }: +{ stdenv +, fetchFromGitHub +, pantheon +, pkgconfig +, meson +, python3 +, ninja +, vala +, gtk3 +, libgee +, granite +, gettext +, clutter-gtk +, libunity +, elementary-icon-theme +, wrapGAppsHook +}: stdenv.mkDerivation rec { pname = "switchboard"; @@ -38,7 +52,9 @@ stdenv.mkDerivation rec { libunity ]; - patches = [ ./plugs-path-env.patch ]; + patches = [ + ./plugs-path-env.patch + ]; postPatch = '' chmod +x meson/post_install.py diff --git a/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix b/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix index f02f79b15a8..756ae86bb19 100644 --- a/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix +++ b/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix @@ -1,4 +1,9 @@ -{ makeWrapper, symlinkJoin, switchboard, switchboardPlugs, plugs }: +{ makeWrapper +, symlinkJoin +, switchboard +, switchboardPlugs +, plugs +}: let selectedPlugs = if plugs == null then switchboardPlugs else plugs; diff --git a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix index e30252bb71c..fe9db999bb6 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix @@ -1,22 +1,27 @@ -{ stdenv, fetchFromGitHub, pantheon, meson, ninja }: +{ stdenv +, fetchFromGitHub +, pantheon +, meson +, ninja +}: stdenv.mkDerivation rec { - pname = "stylesheet"; + pname = "elementary-gtk-theme"; version = "5.2.5"; - name = "elementary-gtk-theme-${version}"; + repoName = "stylesheet"; src = fetchFromGitHub { owner = "elementary"; - repo = pname; + repo = repoName; rev = version; sha256 = "0934rfdwkn4315mhayzba8a3b6i1xczp66gl6n45hh5c81gb2p65"; }; passthru = { updateScript = pantheon.updateScript { - repoName = pname; - attrPath = "elementary-gtk-theme"; + inherit repoName; + attrPath = pname; }; }; diff --git a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix index d8fa143686e..bdf42b1c1ef 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix @@ -1,34 +1,43 @@ -{ stdenv, fetchFromGitHub, pantheon, meson, python3,ninja, hicolor-icon-theme, gtk3 }: +{ stdenv +, fetchFromGitHub +, pantheon +, meson +, python3 +, ninja +, hicolor-icon-theme +, gtk3 +}: stdenv.mkDerivation rec { - pname = "icons"; + pname = "elementary-icon-theme"; version = "5.0.4"; - name = "elementary-icon-theme-${version}"; + repoName = "icons"; src = fetchFromGitHub { owner = "elementary"; - repo = pname; + repo = repoName; rev = version; sha256 = "0ha7biqvmkv68x1gi9bfcn5z0ld067pa5czx0pyf053pa86lg3hx"; }; passthru = { updateScript = pantheon.updateScript { - repoName = pname; - attrPath = "elementary-icon-theme"; + inherit repoName; + attrPath = pname; }; }; nativeBuildInputs = [ + gtk3 meson ninja python3 ]; - buildInputs = [ gtk3 ]; - - propagatedBuildInputs = [ hicolor-icon-theme ]; + propagatedBuildInputs = [ + hicolor-icon-theme + ]; mesonFlags = [ "-Dvolume_icons=false" # Tries to install some icons to / diff --git a/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix b/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix index 061feb4b2d9..76bdcf643f8 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchFromGitHub, pantheon }: +{ stdenv +, fetchFromGitHub +, pantheon +}: stdenv.mkDerivation rec { pname = "elementary-redacted-script"; diff --git a/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix index 430acfd9ac1..aff830fda56 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix @@ -1,22 +1,28 @@ -{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig }: +{ stdenv +, fetchFromGitHub +, pantheon +, meson +, ninja +, pkgconfig +}: stdenv.mkDerivation rec { - pname = "sound-theme"; + pname = "elementary-sound-theme"; version = "1.0"; - name = "elementary-${pname}-${version}"; + repoName = "sound-theme"; src = fetchFromGitHub { owner = "elementary"; - repo = pname; + repo = repoName; rev = version; sha256 = "1dc583lq61c361arjl3s44d2k72c46bqvcqv1c3s69f2ndsnxjdz"; }; passthru = { updateScript = pantheon.updateScript { - repoName = pname; - attrPath = "elementary-${pname}"; + inherit repoName; + attrPath = pname; }; }; diff --git a/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix b/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix index 898d5f7b454..30145541750 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix @@ -1,26 +1,30 @@ -{ stdenv, fetchFromGitHub, pantheon }: +{ stdenv +, fetchFromGitHub +, pantheon +}: stdenv.mkDerivation rec { - pname = "wallpapers"; + pname = "elementary-wallpapers"; version = "5.3"; - name = "elementary-${pname}-${version}"; + repoName = "wallpapers"; src = fetchFromGitHub { owner = "elementary"; - repo = pname; + repo = repoName; rev = version; sha256 = "1i0zf9gzhwm8hgq5cp1xnxipqjvgzd9wfiicz612hgp6ivc0z0ag"; }; passthru = { updateScript = pantheon.updateScript { - repoName = pname; - attrPath = "elementary-${pname}"; + inherit repoName; + attrPath = pname; }; }; dontBuild = true; + dontConfigure = true; installPhase = '' mkdir -p $out/share/backgrounds/elementary diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix index e7aea3be91e..a1a69ee303f 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix @@ -1,22 +1,25 @@ -{ stdenv, fetchFromGitHub, pantheon }: +{ stdenv +, fetchFromGitHub +, pantheon +}: stdenv.mkDerivation rec { - pname = "default-settings"; + pname = "elementary-default-settings"; version = "5.1.0"; - name = "elementary-${pname}-${version}"; + repoName = "default-settings"; src = fetchFromGitHub { owner = "elementary"; - repo = pname; + repo = repoName; rev = version; sha256 = "0l73py4rr56i4dalb2wh1c6qiwmcjkm0l1j75jp5agcnxldh5wym"; }; passthru = { updateScript = pantheon.updateScript { - repoName = pname; - attrPath = "elementary-${pname}"; + inherit repoName; + attrPath = pname; }; }; @@ -25,6 +28,7 @@ stdenv.mkDerivation rec { ]; dontBuild = true; + dontConfigure = true; installPhase = '' mkdir -p $out/etc/gtk-3.0 diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix index a71736887bb..8ef85b90a3b 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix @@ -5,22 +5,22 @@ , clutter-gtk, libGL, dbus, wrapGAppsHook }: stdenv.mkDerivation rec { - pname = "greeter"; + pname = "elementary-greeter"; version = "3.3.1"; - name = "elementary-${pname}-${version}"; + repoName = "greeter"; src = fetchFromGitHub { owner = "elementary"; - repo = pname; + repo = repoName; rev = version; sha256 = "1vkq4z0hrmvzv4sh2qkxjajdxcycd1zj97a3pc8n4yb858pqfyzc"; }; passthru = { updateScript = pantheon.updateScript { - repoName = pname; - attrPath = "elementary-${pname}"; + inherit repoName; + attrPath = pname; }; }; diff --git a/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix b/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix index 2726ea2b936..dbcb992c425 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix @@ -1,4 +1,15 @@ -{ stdenv, runCommand, mutter, elementary-default-settings, nixos-artwork, glib, gala, epiphany, elementary-settings-daemon, gtk3, plank, gsettings-desktop-schemas +{ stdenv +, runCommand +, mutter +, elementary-default-settings +, nixos-artwork +, glib +, gala +, epiphany +, elementary-settings-daemon +, gtk3 +, plank +, gsettings-desktop-schemas , extraGSettingsOverrides ? "" , extraGSettingsOverridePackages ? [] }: diff --git a/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix b/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix index d8634b48570..0be2431d33d 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix @@ -1,22 +1,30 @@ -{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, vala, gtk3 }: +{ stdenv +, fetchFromGitHub +, pantheon +, meson +, ninja +, pkgconfig +, vala +, gtk3 +}: stdenv.mkDerivation rec { - pname = "print"; + pname = "elementary-print-shim"; version = "0.1.3"; - name = "elementary-print-shim-${version}"; + repoName = "print"; src = fetchFromGitHub { owner = "elementary"; - repo = pname; + repo = repoName; rev = version; sha256 = "1w3cfap7j42x14mqpfqdm46hk5xc0v5kv8r6wxcnknr3sfxi8qlp"; }; passthru = { updateScript = pantheon.updateScript { - repoName = pname; - attrPath = "elementary-${pname}-shim"; + inherit repoName; + attrPath = pname; }; }; diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix index 5fe22f0db81..c262fb37dbc 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix @@ -1,4 +1,18 @@ -{ stdenv, fetchFromGitHub, substituteAll, writeScript, pantheon, gnome-keyring, gnome-session, wingpanel, orca, at-spi2-core, elementary-default-settings, writeShellScriptBin, elementary-settings-daemon, runtimeShell }: +{ stdenv +, fetchFromGitHub +, substituteAll +, writeScript +, pantheon +, gnome-keyring +, gnome-session +, wingpanel +, orca +, at-spi2-core +, elementary-default-settings +, writeShellScriptBin +, elementary-settings-daemon +, runtimeShell +}: let @@ -7,7 +21,7 @@ let # # - # Upstream relies on /etc/skel to initiate a new users home directory with planks dockitems. + # Upstream relies on /etc/skel to initiate a new users home directory with plank's dockitems. # # That is not possible within nixos, but we can achieve this easily with a simple script that copies # them. We then use a xdg autostart and initalize it during the "EarlyInitialization" phase of a gnome session @@ -44,26 +58,27 @@ let in stdenv.mkDerivation rec { - pname = "session-settings"; + pname = "elementary-session-settings"; version = "5.0.3"; - name = "elementary-${pname}-${version}"; + repoName = "session-settings"; src = fetchFromGitHub { owner = "elementary"; - repo = pname; + repo = repoName; rev = version; sha256 = "1vrjm7bklkfv0dyafm312v4hxzy6lb7p1ny4ijkn48kr719gc71k"; }; passthru = { updateScript = pantheon.updateScript { - repoName = pname; - attrPath = "elementary-${pname}"; + inherit repoName; + attrPath = pname; }; }; dontBuild = true; + dontConfigure = true; installPhase = '' mkdir -p $out/share/applications diff --git a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix index ca0ab888f14..20b1ac7d353 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix @@ -1,23 +1,37 @@ -{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, vala, libxml2, desktop-file-utils -, gtk3, glib, granite, libgee, elementary-icon-theme, wrapGAppsHook }: +{ stdenv +, fetchFromGitHub +, pantheon +, pkgconfig +, meson +, ninja +, vala +, libxml2 +, desktop-file-utils +, gtk3 +, glib +, granite +, libgee +, elementary-icon-theme +, wrapGAppsHook +}: stdenv.mkDerivation rec { - pname = "shortcut-overlay"; + pname = "elementary-shortcut-overlay"; version = "1.0.1"; - name = "elementary-${pname}-${version}"; + repoName = "shortcut-overlay"; src = fetchFromGitHub { owner = "elementary"; - repo = pname; + repo = repoName; rev = version; sha256 = "1ph4rx2l5fn0zh4fjfjlgbgskmzc0lvzqgcv7v4kr5m4rij1p4y4"; }; passthru = { updateScript = pantheon.updateScript { - repoName = pname; - attrPath = "elementary-${pname}"; + inherit repoName; + attrPath = pname; }; }; diff --git a/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix b/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix index 4e19a65b58d..973040a8da6 100644 --- a/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix +++ b/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix @@ -1,11 +1,14 @@ -{ stdenv, substituteAll, fetchFromGitHub, file-roller, gnome-bluetooth }: +{ stdenv +, substituteAll +, fetchFromGitHub +, file-roller +, gnome-bluetooth +}: stdenv.mkDerivation rec { pname = "extra-elementary-contracts"; version = "2018-08-21"; - name = "${pname}-${version}"; - src = fetchFromGitHub { owner = "worldofpeace"; repo = pname; @@ -22,6 +25,7 @@ stdenv.mkDerivation rec { ]; dontBuild = true; + dontConfigure = true; installPhase = '' mkdir -p $out/share/contractor diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix index 440426c00df..b80e93279c8 100644 --- a/pkgs/desktops/pantheon/desktop/gala/default.nix +++ b/pkgs/desktops/pantheon/desktop/gala/default.nix @@ -1,7 +1,28 @@ -{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, python3, ninja, vala -, desktop-file-utils, gettext, libxml2, gtk3, granite, libgee, bamf, libcanberra -, libcanberra-gtk3, gnome-desktop, mutter, clutter, plank, elementary-icon-theme -, elementary-settings-daemon, wrapGAppsHook }: +{ stdenv +, fetchFromGitHub +, pantheon +, pkgconfig +, meson +, python3 +, ninja +, vala +, desktop-file-utils +, gettext +, libxml2 +, gtk3 +, granite +, libgee +, bamf +, libcanberra +, libcanberra-gtk3 +, gnome-desktop +, mutter +, clutter +, plank +, elementary-icon-theme +, elementary-settings-daemon +, wrapGAppsHook +}: stdenv.mkDerivation rec { pname = "gala"; @@ -48,7 +69,9 @@ stdenv.mkDerivation rec { plank ]; - patches = [ ./plugins-dir.patch ]; + patches = [ + ./plugins-dir.patch + ]; postPatch = '' chmod +x build-aux/meson/post_install.py diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix index 0d00ee2072d..9f40c0f9e58 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix @@ -1,25 +1,46 @@ -{ stdenv, fetchFromGitHub, pantheon, substituteAll, meson, ninja, python3 -, pkgconfig, vala, granite, libgee, gettext, gtk3, appstream, gnome-menus -, json-glib, plank, bamf, switchboard, libunity, libsoup, wingpanel, zeitgeist -, bc }: +{ stdenv +, fetchFromGitHub +, pantheon +, substituteAll +, meson +, ninja +, python3 +, pkgconfig +, vala +, granite +, libgee +, gettext +, gtk3 +, appstream +, gnome-menus +, json-glib +, plank +, bamf +, switchboard +, libunity +, libsoup +, wingpanel +, zeitgeist +, bc +}: stdenv.mkDerivation rec { - pname = "applications-menu"; + pname = "wingpanel-applications-menu"; version = "2.4.3"; - name = "wingpanel-${pname}-${version}"; + repoName = "applications-menu"; src = fetchFromGitHub { owner = "elementary"; - repo = pname; + repo = repoName; rev = version; sha256 = "15mwfynaa57jii43x77iaz5gqjlylh5zxc70am8zgp8vhgzflvyd"; }; passthru = { updateScript = pantheon.updateScript { - repoName = pname; - attrPath = "wingpanel-${pname}"; + inherit repoName; + attrPath = pname; }; }; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix index 4d7868a1d14..7e73adcd7e9 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix @@ -1,6 +1,20 @@ -{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, python3 -, ninja, vala, gtk3, granite, libnotify, wingpanel, libgee, libxml2 -, elementary-icon-theme, wrapGAppsHook }: +{ stdenv +, fetchFromGitHub +, pantheon +, pkgconfig +, meson +, python3 +, ninja +, vala +, gtk3 +, granite +, libnotify +, wingpanel +, libgee +, libxml2 +, elementary-icon-theme +, wrapGAppsHook +}: stdenv.mkDerivation rec { pname = "wingpanel-indicator-bluetooth"; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix index 70129690060..1ab3c579e14 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix @@ -1,6 +1,24 @@ -{ stdenv, fetchFromGitHub, fetchpatch, pantheon, pkgconfig, meson, python3 -, ninja, vala, gtk3, granite, wingpanel, evolution-data-server -, libical, libgee, libxml2, libsoup, elementary-calendar, elementary-icon-theme, wrapGAppsHook }: +{ stdenv +, fetchFromGitHub +, fetchpatch +, pantheon +, pkgconfig +, meson +, python3 +, ninja +, vala +, gtk3 +, granite +, wingpanel +, evolution-data-server +, libical +, libgee +, libxml2 +, libsoup +, elementary-calendar +, elementary-icon-theme +, wrapGAppsHook +}: stdenv.mkDerivation rec { pname = "wingpanel-indicator-datetime"; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix index aa63f82c965..00a57cb9943 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix @@ -1,6 +1,21 @@ -{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja -, substituteAll, vala, gtk3, granite, libxml2, wingpanel, libgee -, xorg, libgnomekbd, elementary-icon-theme, wrapGAppsHook }: +{ stdenv +, fetchFromGitHub +, pantheon +, pkgconfig +, meson +, ninja +, substituteAll +, vala +, gtk3 +, granite +, libxml2 +, wingpanel +, libgee +, xorg +, libgnomekbd +, elementary-icon-theme +, wrapGAppsHook +}: stdenv.mkDerivation rec { pname = "wingpanel-indicator-keyboard"; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix index a201d6864a6..d5ce97df509 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix @@ -1,6 +1,19 @@ -{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, vala -, gtk3, granite, networkmanager, networkmanagerapplet, wingpanel -, libgee, elementary-icon-theme, wrapGAppsHook }: +{ stdenv +, fetchFromGitHub +, pantheon +, pkgconfig +, meson +, ninja +, vala +, gtk3 +, granite +, networkmanager +, networkmanagerapplet +, wingpanel +, libgee +, elementary-icon-theme +, wrapGAppsHook +}: stdenv.mkDerivation rec { pname = "wingpanel-indicator-network"; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix index fd4e1cc7e17..0eab02bf8c8 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix @@ -1,5 +1,18 @@ -{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, vala -, gtk3, granite, wingpanel, libgee, libxml2, elementary-icon-theme, wrapGAppsHook }: +{ stdenv +, fetchFromGitHub +, pantheon +, pkgconfig +, meson +, ninja +, vala +, gtk3 +, granite +, wingpanel +, libgee +, libxml2 +, elementary-icon-theme +, wrapGAppsHook +}: stdenv.mkDerivation rec { pname = "wingpanel-indicator-nightlight"; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix index 03369c3ad42..78c901a2306 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix @@ -1,5 +1,18 @@ -{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, vala, gtk3, granite -, wingpanel, libgee, libwnck3, elementary-icon-theme, wrapGAppsHook }: +{ stdenv +, fetchFromGitHub +, pantheon +, pkgconfig +, meson +, ninja +, vala +, gtk3 +, granite +, wingpanel +, libgee +, libwnck3 +, elementary-icon-theme +, wrapGAppsHook +}: stdenv.mkDerivation rec { pname = "wingpanel-indicator-notifications"; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix index a9af53449c9..f63cca74a4d 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix @@ -1,6 +1,21 @@ -{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, python3 -, ninja, vala, gtk3, granite, bamf, libgtop, udev, wingpanel -, libgee, elementary-icon-theme, wrapGAppsHook }: +{ stdenv +, fetchFromGitHub +, pantheon +, pkgconfig +, meson +, python3 +, ninja +, vala +, gtk3 +, granite +, bamf +, libgtop +, udev +, wingpanel +, libgee +, elementary-icon-theme +, wrapGAppsHook +}: stdenv.mkDerivation rec { pname = "wingpanel-indicator-power"; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix index 61572f07e2e..b363cb5485a 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix @@ -1,6 +1,18 @@ -{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson -, ninja, vala, gtk3, granite, wingpanel, accountsservice -, libgee, elementary-icon-theme, wrapGAppsHook }: +{ stdenv +, fetchFromGitHub +, pantheon +, pkgconfig +, meson +, ninja +, vala +, gtk3 +, granite +, wingpanel +, accountsservice +, libgee +, elementary-icon-theme +, wrapGAppsHook +}: stdenv.mkDerivation rec { pname = "wingpanel-indicator-session"; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix index 3e17813fde2..6d0e791d1e4 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix @@ -1,7 +1,22 @@ -{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson -, python3, ninja, vala, gtk3, granite, wingpanel, libnotify -, pulseaudio, libcanberra-gtk3, libgee, libxml2, wrapGAppsHook -, elementary-icon-theme }: +{ stdenv +, fetchFromGitHub +, pantheon +, pkgconfig +, meson +, python3 +, ninja +, vala +, gtk3 +, granite +, wingpanel +, libnotify +, pulseaudio +, libcanberra-gtk3 +, libgee +, libxml2 +, wrapGAppsHook +, elementary-icon-theme +}: stdenv.mkDerivation rec { pname = "wingpanel-indicator-sound"; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix index be6c89f9c05..b98c205d491 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix @@ -1,5 +1,20 @@ -{ stdenv, fetchFromGitHub, pantheon, wrapGAppsHook, pkgconfig, meson, ninja -, vala, gala, gtk3, libgee, granite, gettext, mutter, json-glib, python3 }: +{ stdenv +, fetchFromGitHub +, pantheon +, wrapGAppsHook +, pkgconfig +, meson +, ninja +, vala +, gala +, gtk3 +, libgee +, granite +, gettext +, mutter +, json-glib +, python3 +}: stdenv.mkDerivation rec { pname = "wingpanel"; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix b/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix index cfae604d3a5..6b554d89caa 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix @@ -1,4 +1,11 @@ -{ lib, makeWrapper, symlinkJoin, wingpanel, wingpanelIndicators, switchboard-with-plugs, indicators ? null }: +{ lib +, makeWrapper +, symlinkJoin +, wingpanel +, wingpanelIndicators +, switchboard-with-plugs +, indicators ? null +}: let selectedIndicators = if indicators == null then wingpanelIndicators else indicators; diff --git a/pkgs/desktops/pantheon/granite/default.nix b/pkgs/desktops/pantheon/granite/default.nix index cc612407bf6..7fba9610db0 100644 --- a/pkgs/desktops/pantheon/granite/default.nix +++ b/pkgs/desktops/pantheon/granite/default.nix @@ -1,4 +1,20 @@ -{ stdenv, fetchFromGitHub, fetchpatch, python3, meson, ninja, vala, pkgconfig, libgee, pantheon, gtk3, glib, gettext, hicolor-icon-theme, gobject-introspection, wrapGAppsHook }: +{ stdenv +, fetchFromGitHub +, fetchpatch +, python3 +, meson +, ninja +, vala +, pkgconfig +, libgee +, pantheon +, gtk3 +, glib +, gettext +, hicolor-icon-theme +, gobject-introspection +, wrapGAppsHook +}: stdenv.mkDerivation rec { pname = "granite"; diff --git a/pkgs/desktops/pantheon/services/cerbere/default.nix b/pkgs/desktops/pantheon/services/cerbere/default.nix index 28e39464bfa..a8eaf766664 100644 --- a/pkgs/desktops/pantheon/services/cerbere/default.nix +++ b/pkgs/desktops/pantheon/services/cerbere/default.nix @@ -1,4 +1,15 @@ -{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, python3, ninja, glib, libgee, vala, wrapGAppsHook }: +{ stdenv +, fetchFromGitHub +, pantheon +, pkgconfig +, meson +, python3 +, ninja +, glib +, libgee +, vala +, wrapGAppsHook +}: stdenv.mkDerivation rec { pname = "cerbere"; diff --git a/pkgs/desktops/pantheon/services/contractor/default.nix b/pkgs/desktops/pantheon/services/contractor/default.nix index d7d3cdb0312..6401b96a2ea 100644 --- a/pkgs/desktops/pantheon/services/contractor/default.nix +++ b/pkgs/desktops/pantheon/services/contractor/default.nix @@ -1,4 +1,17 @@ -{ stdenv, fetchFromGitHub, pantheon, meson, python3, ninja, pkgconfig, vala, glib, libgee, dbus, glib-networking, wrapGAppsHook }: +{ stdenv +, fetchFromGitHub +, pantheon +, meson +, python3 +, ninja +, pkgconfig +, vala +, glib +, libgee +, dbus +, glib-networking +, wrapGAppsHook +}: stdenv.mkDerivation rec { pname = "contractor"; @@ -33,7 +46,7 @@ stdenv.mkDerivation rec { libgee ]; - PKG_CONFIG_DBUS_1_SESSION_BUS_SERVICES_DIR = "share/dbus-1/services"; + PKG_CONFIG_DBUS_1_SESSION_BUS_SERVICES_DIR = "${placeholder ''out''}/share/dbus-1/services"; meta = with stdenv.lib; { description = "A desktop-wide extension service used by elementary OS"; diff --git a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix index 055706b1521..6305c872b2f 100644 --- a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix @@ -1,23 +1,37 @@ -{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, python3, ninja, vala -, desktop-file-utils, gtk3, granite, libgee, gcr, webkitgtk, wrapGAppsHook }: +{ stdenv +, fetchFromGitHub +, pantheon +, pkgconfig +, meson +, python3 +, ninja +, vala +, desktop-file-utils +, gtk3 +, granite +, libgee +, gcr +, webkitgtk +, wrapGAppsHook +}: stdenv.mkDerivation rec { - pname = "capnet-assist"; + pname = "elementary-capnet-assist"; version = "2.2.3"; - name = "elementary-${pname}-${version}"; + repoName = "capnet-assist"; src = fetchFromGitHub { owner = "elementary"; - repo = pname; + repo = repoName; rev = version; sha256 = "15cnwimkmmsb4rwvgm8bizcsn1krsj6k3qc88izn79is75y6wwji"; }; passthru = { updateScript = pantheon.updateScript { - repoName = pname; - attrPath = "elementary-${pname}"; + inherit repoName; + attrPath = pname; }; }; @@ -40,7 +54,9 @@ stdenv.mkDerivation rec { ]; # Not useful here or in elementary - See: https://github.com/elementary/capnet-assist/issues/3 - patches = [ ./remove-capnet-test.patch ]; + patches = [ + ./remove-capnet-test.patch + ]; postPatch = '' chmod +x meson/post_install.py diff --git a/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix b/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix index 54f556e3a92..fb9d28eaf6b 100644 --- a/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix @@ -1,28 +1,37 @@ -{ stdenv, fetchFromGitHub, pantheon, makeWrapper, meson, ninja, desktop-file-utils, glib, coreutils, elementary-settings-daemon, wrapGAppsHook }: +{ stdenv +, fetchFromGitHub +, pantheon +, meson +, ninja +, desktop-file-utils +, glib +, coreutils +, elementary-settings-daemon +, wrapGAppsHook +}: stdenv.mkDerivation rec { - pname = "dpms-helper"; + pname = "elementary-dpms-helper"; version = "1.0"; - name = "elementary-${pname}-${version}"; + repoName = "dpms-helper"; src = fetchFromGitHub { owner = "elementary"; - repo = pname; + repo = repoName; rev = version; sha256 = "0svfp0qyb6nx4mjl3jx4aqmb4x24m25jpi75mdis3yfr3c1xz9nh"; }; passthru = { updateScript = pantheon.updateScript { - repoName = pname; - attrPath = "elementary-${pname}"; + inherit repoName; + attrPath = pname; }; }; nativeBuildInputs = [ desktop-file-utils - makeWrapper meson ninja wrapGAppsHook diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix index d8514c51f4f..8381796c456 100644 --- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix @@ -44,16 +44,16 @@ stdenv.mkDerivation rec { pname = "elementary-settings-daemon"; version = "3.30.2"; - projectName = "gnome-settings-daemon"; + repoName = "gnome-settings-daemon"; src = fetchurl { - url = "mirror://gnome/sources/${projectName}/${stdenv.lib.versions.majorMinor version}/${projectName}-${version}.tar.xz"; + url = "mirror://gnome/sources/${repoName}/${stdenv.lib.versions.majorMinor version}/${repoName}-${version}.tar.xz"; sha256 = "0c663csa3gnsr6wm0xfll6aani45snkdj7zjwjfzcwfh8w4a3z12"; }; # Source for ubuntu's patchset src2 = fetchgit { - url = "https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/${projectName}"; + url = "https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/${repoName}"; rev = "refs/tags/ubuntu/${version}-1ubuntu1"; sha256 = "02awkhw6jqm7yh812mw0nsdmsljfi8ksz8mvd2qpns5pcv002g2c"; }; @@ -152,7 +152,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { - packageName = projectName; + packageName = repoName; attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix b/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix index 79bc4bc6a01..8afbbbeed82 100644 --- a/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix +++ b/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix @@ -1,5 +1,17 @@ -{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, vala, glib -, gtk3, libgee, desktop-file-utils, geoclue2, wrapGAppsHook }: +{ stdenv +, fetchFromGitHub +, pantheon +, pkgconfig +, meson +, ninja +, vala +, glib +, gtk3 +, libgee +, desktop-file-utils +, geoclue2 +, wrapGAppsHook +}: stdenv.mkDerivation rec { pname = "pantheon-agent-geoclue2"; diff --git a/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix b/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix index d9e5512ce78..53a65ddb947 100644 --- a/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix +++ b/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix @@ -1,5 +1,15 @@ -{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja -, vala, gtk3, libgee, polkit, wrapGAppsHook }: +{ stdenv +, fetchFromGitHub +, pantheon +, pkgconfig +, meson +, ninja +, vala +, gtk3 +, libgee +, polkit +, wrapGAppsHook +}: stdenv.mkDerivation rec { pname = "pantheon-agent-polkit"; diff --git a/pkgs/desktops/pantheon/update.nix b/pkgs/desktops/pantheon/update.nix index 0162de7349a..7e9aacc0c2b 100644 --- a/pkgs/desktops/pantheon/update.nix +++ b/pkgs/desktops/pantheon/update.nix @@ -1,5 +1,21 @@ -{ runCommand, nix, bash, git, jq, nix-prefetch-scripts, coreutils, common-updater-scripts, gnugrep, gnused, curl }: -{ repoName, attrPath ? repoName, versionPolicy ? "release" }: +{ runCommand +, nix +, bash +, git +, jq +, nix-prefetch-scripts +, coreutils +, common-updater-scripts +, gnugrep +, gnused +, curl +}: + +{ repoName +, attrPath ? repoName +, versionPolicy ? "release" +}: + let script = ./update.sh; @@ -13,6 +29,8 @@ let chmod +x $out ''; - versionFlag = { "release" = "-r"; "master" = "-m"; }.${versionPolicy}; + throwFlag = throw "${versionPolicy} is not a valid versionPolicy - Options are either 'release' or 'master' (defaults to release)."; + + versionFlag = { "release" = "-r"; "master" = "-m"; }.${versionPolicy} or throwFlag; in [ updateScript versionFlag repoName attrPath ] diff --git a/pkgs/desktops/surf-display/default.nix b/pkgs/desktops/surf-display/default.nix new file mode 100644 index 00000000000..f3554fe0b40 --- /dev/null +++ b/pkgs/desktops/surf-display/default.nix @@ -0,0 +1,53 @@ +{ stdenv, fetchgit, makeWrapper +, surf, wmctrl, matchbox, xdotool, unclutter +, xorg, pulseaudio, xprintidle-ng }: + +stdenv.mkDerivation rec { + pname = "surf-display"; + version = "unstable-2019-04-15"; + + src = fetchgit { + url = "https://code.it-zukunft-schule.de/cgit/surf-display"; + rev = "972d6c4b7c4503dbb63fa6c92cdc24d1e32064a4"; + sha256 = "03c68gg4kfmkri1gn5b7m1g8vh9ciawhajb29c17kkc7mn388hjm"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + buildInputs = [ + surf + wmctrl + matchbox + pulseaudio + xprintidle-ng + xdotool + xorg.xmodmap + xorg.xkbutils + unclutter + ]; + + patches = [ ./pdf-makefile.patch ]; + + buildFlags = [ "man" ]; + + postFixup = '' + substituteInPlace $out/share/xsessions/surf-display.desktop \ + --replace surf-display $out/bin/surf-display + + substituteInPlace $out/bin/surf-display --replace /usr/share $out/share + + patchShebangs $out/bin/surf-display + wrapProgram $out/bin/surf-display \ + --prefix PATH ':' ${stdenv.lib.makeBinPath buildInputs} + ''; + + makeFlags = [ "PREFIX=${placeholder ''out''}" ]; + + meta = with stdenv.lib; { + description = "Kiosk browser session manager based on the surf browser"; + homepage = "https://code.it-zukunft-schule.de/cgit/surf-display/"; + maintainers = with maintainers; [ etu ]; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/surf-display/pdf-makefile.patch b/pkgs/desktops/surf-display/pdf-makefile.patch new file mode 100644 index 00000000000..9c2541052c0 --- /dev/null +++ b/pkgs/desktops/surf-display/pdf-makefile.patch @@ -0,0 +1,24 @@ +diff --git a/Makefile b/Makefile +index 1081d64..499160c 100644 +--- a/Makefile ++++ b/Makefile +@@ -13,19 +13,10 @@ man:: + gzip -9 -c -n data/surf-display.1 > data/surf-display.1.gz + + install: +- if [ ! -e data/surf-display.pdf.gz ]; then \ +- echo "Run 'make build' first, before running 'sudo make install'."; \ +- exit -1; \ +- fi +- + # script + mkdir -p $(DESTDIR)$(PREFIX)/bin/ + install -m 0755 bin/surf-display $(DESTDIR)$(PREFIX)/bin/ + +- # LaTeX Beamer PDF: Impressive HowTo +- mkdir -p $(DESTDIR)$(PREFIX)/share/doc/surf-display/ +- install -m 0644 data/*.pdf.gz $(DESTDIR)$(PREFIX)/share/doc/surf-display/ +- + # man page + mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1 + install -m 0644 data/*.1.gz $(DESTDIR)$(PREFIX)/share/man/man1/ diff --git a/pkgs/development/arduino/arduino-core/downloads.nix b/pkgs/development/arduino/arduino-core/downloads.nix index e71c898dd55..12cc7a6e52c 100644 --- a/pkgs/development/arduino/arduino-core/downloads.nix +++ b/pkgs/development/arduino/arduino-core/downloads.nix @@ -132,7 +132,7 @@ }; "build/macosx/avrdude-6.3.0-arduino9-i386-apple-darwin11.tar.bz2" = fetchurl { url = "https://downloads.arduino.cc/tools/avrdude-6.3.0-arduino9-i386-apple-darwin11.tar.bz2"; - sha256 = "0rc4x8mcsva4v6j7ssfj8rdyg14l2pd9ivgdm39m5wnz8b06p85z11703f0r82aq3mmkiy7vwa4jfjhs9826qpp724hbng9dx74kk86r"; + sha256 = "0rc4x8mcsva4v6j7ssfj8rdyg14l2pd9ivgdm39m5wnz8b06p85z"; }; "build/macosx/appbundler/appbundler-1.0ea-arduino4.jar.zip" = fetchurl { url = "https://downloads.arduino.cc/appbundler-1.0ea-arduino4.jar.zip"; diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix index 77f051156d1..52323b3de76 100644 --- a/pkgs/development/compilers/binaryen/default.nix +++ b/pkgs/development/compilers/binaryen/default.nix @@ -1,11 +1,11 @@ { stdenv, cmake, python, fetchFromGitHub, emscriptenRev ? null }: let - defaultVersion = "86"; + defaultVersion = "89"; # Map from git revs to SHA256 hashes sha256s = { - "version_86" = "12h5018rdwg7vjni0mz91vkpdwyqw0nfacig3vg9dvyn4fnfm76z"; + "version_89" = "0rh1dq33ilq54szfgi1ajaiaj7rbylai02rhp9zm9vpwp0rw8mij"; "1.38.28" = "172s7y5f38736ic8ri3mnbdqcrkadd40a26cxcfwbscc53phl11v"; }; in diff --git a/pkgs/development/compilers/chicken/5/chicken.nix b/pkgs/development/compilers/chicken/5/chicken.nix index a3b32ceee0c..74f71181190 100644 --- a/pkgs/development/compilers/chicken/5/chicken.nix +++ b/pkgs/development/compilers/chicken/5/chicken.nix @@ -13,7 +13,7 @@ in stdenv.mkDerivation { name = "chicken-${version}"; - binaryVersion = 9; + binaryVersion = 11; src = fetchurl { url = "https://code.call-cc.org/releases/${version}/chicken-${version}.tar.gz"; @@ -22,8 +22,8 @@ stdenv.mkDerivation { setupHook = lib.ifEnable (bootstrap-chicken != null) ./setup-hook.sh; - buildFlags = "PLATFORM=${platform} PREFIX=$(out) VARDIR=$(out)/var/lib"; - installFlags = "PLATFORM=${platform} PREFIX=$(out) VARDIR=$(out)/var/lib"; + buildFlags = "PLATFORM=${platform} PREFIX=$(out)"; + installFlags = "PLATFORM=${platform} PREFIX=$(out)"; buildInputs = [ makeWrapper @@ -37,10 +37,6 @@ stdenv.mkDerivation { wrapProgram $f \ --prefix PATH : ${stdenv.cc}/bin done - - mv $out/var/lib/chicken $out/lib - rmdir $out/var/lib - rmdir $out/var ''; # TODO: Assert csi -R files -p '(pathname-file (repository-path))' == binaryVersion diff --git a/pkgs/development/compilers/chicken/5/eggs.nix b/pkgs/development/compilers/chicken/5/eggs.nix index 2d3324ceaca..a8e3ee5976e 100644 --- a/pkgs/development/compilers/chicken/5/eggs.nix +++ b/pkgs/development/compilers/chicken/5/eggs.nix @@ -1,4 +1,4 @@ -{ pkgs }: +{ pkgs, stdenv }: rec { inherit (pkgs) eggDerivation fetchegg; @@ -33,12 +33,12 @@ rec { }; srfi-1 = eggDerivation { - name = "srfi-1-0.5"; + name = "srfi-1-0.5.1"; src = fetchegg { name = "srfi-1"; - version = "0.5"; - sha256 = "0gh1h406xbxwm5gvc5znc93nxp9xjbhyqf7zzga08k5y6igxrlvk"; + version = "0.5.1"; + sha256 = "15x0ajdkw5gb3vgs8flzh5g0pzl3wmcpf11iimlm67mw6fxc8p7j"; }; buildInputs = [ @@ -47,12 +47,12 @@ rec { }; srfi-13 = eggDerivation { - name = "srfi-13-0.2"; + name = "srfi-13-0.2.1"; src = fetchegg { name = "srfi-13"; - version = "0.2"; - sha256 = "0jazbdnn9bjm7wwxqq7xzqxc9zfvaapq565rf1czj6ayl96yvk3n"; + version = "0.2.1"; + sha256 = "0204i7fhc4dy0l89lbi2lv9cjndrvwyrk68z3wy7x445jb4ky1gq"; }; buildInputs = [ @@ -61,12 +61,12 @@ rec { }; srfi-14 = eggDerivation { - name = "srfi-14-0.2"; + name = "srfi-14-0.2.1"; src = fetchegg { name = "srfi-14"; - version = "0.2"; - sha256 = "13nm4nn1d52nkvhjizy26z3s6q41x1ml4zm847xzf86x1zwvymni"; + version = "0.2.1"; + sha256 = "0gc33cx4xll9vsf7fm8jvn3gc0604kn3bbi6jfn6xscqp86kqb9p"; }; buildInputs = [ diff --git a/pkgs/development/compilers/chicken/5/setup-hook.sh b/pkgs/development/compilers/chicken/5/setup-hook.sh index 2447aeb0cea..f5ebaaf638e 100644 --- a/pkgs/development/compilers/chicken/5/setup-hook.sh +++ b/pkgs/development/compilers/chicken/5/setup-hook.sh @@ -1,5 +1,5 @@ addChickenRepositoryPath() { - addToSearchPathWithCustomDelimiter : CHICKEN_REPOSITORY_PATH "$1/lib/chicken/9/" + addToSearchPathWithCustomDelimiter : CHICKEN_REPOSITORY_PATH "$1/lib/chicken/11/" addToSearchPathWithCustomDelimiter : CHICKEN_INCLUDE_PATH "$1/share/" } diff --git a/pkgs/development/compilers/dotnet/sdk/default.nix b/pkgs/development/compilers/dotnet/sdk/default.nix index 6c1fa37e81a..984ab39c91a 100644 --- a/pkgs/development/compilers/dotnet/sdk/default.nix +++ b/pkgs/development/compilers/dotnet/sdk/default.nix @@ -12,14 +12,14 @@ let rpath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc libunwind libuuid icu openssl zlib curl ]; in stdenv.mkDerivation rec { - version = "2.2.203"; - netCoreVersion = "2.2.4"; + version = "2.2.401"; + netCoreVersion = "2.2.6"; pname = "dotnet-sdk"; src = fetchurl { url = "https://dotnetcli.azureedge.net/dotnet/Sdk/${version}/${pname}-${version}-linux-x64.tar.gz"; # use sha512 from the download page - sha512 = "8DA955FA0AEEBB6513A6E8C4C23472286ED78BD5533AF37D79A4F2C42060E736FDA5FD48B61BF5AEC10BBA96EB2610FACC0F8A458823D374E1D437B26BA61A5C"; + sha512 = "05w3zk7bcd8sv3k4kplf20j906and2006g1fggq7y6kaxrlhdnpd6jhy6idm8v5bz48wfxga5b4yys9qx0fp3p8yl7wi67qljpzrq88"; }; sourceRoot = "."; diff --git a/pkgs/development/compilers/elm/packages/elm-format.nix b/pkgs/development/compilers/elm/packages/elm-format.nix index aaae9fa4ba9..3660e42e363 100644 --- a/pkgs/development/compilers/elm/packages/elm-format.nix +++ b/pkgs/development/compilers/elm/packages/elm-format.nix @@ -1,24 +1,28 @@ { mkDerivation, fetchgit, ansi-terminal, ansi-wl-pprint, base, binary -, bytestring, Cabal, cmark, containers, directory, filepath, free -, HUnit, indents, json, mtl, optparse-applicative, parsec, process +, bytestring, cmark, containers, directory, filepath, free, HUnit +, indents, json, mtl, optparse-applicative, parsec, process , QuickCheck, quickcheck-io, split, stdenv, tasty, tasty-golden , tasty-hunit, tasty-quickcheck, text }: mkDerivation { pname = "elm-format"; - version = "0.8.1"; + version = "0.8.2"; src = fetchgit { url = "https://github.com/avh4/elm-format"; - sha256 = "0p1dy1m6illsl7i04zsv5jqw7i4znv7pfpdfm53zy0k7mq0fk09j"; - rev = "89694e858664329e3cbdaeb71b15c4456fd739ff"; + sha256 = "0ly37fszrfviwqgrww57ikdcr7i8lcpczhqm8xqp5s7mrlpdxv7z"; + rev = "ab3627cce01e5556b3fe8c2b5e3d92b80bfc74af"; }; postPatch = '' - sed -i "s|desc <-.*||" ./Setup.hs - sed -i "s|gitDescribe = .*|gitDescribe = \\\\\"0.8.1\\\\\"\"|" ./Setup.hs + mkdir -p ./generated + cat <<EOHS > ./generated/Build_elm_format.hs + module Build_elm_format where + + gitDescribe :: String + gitDescribe = "0.8.2" + EOHS ''; - isLibrary = true; + isLibrary = false; isExecutable = true; - setupHaskellDepends = [ base Cabal directory filepath process ]; libraryHaskellDepends = [ ansi-terminal ansi-wl-pprint base binary bytestring containers directory filepath free indents json mtl optparse-applicative diff --git a/pkgs/development/compilers/fasm/bin.nix b/pkgs/development/compilers/fasm/bin.nix index c26ac151af4..98cc2804f60 100644 --- a/pkgs/development/compilers/fasm/bin.nix +++ b/pkgs/development/compilers/fasm/bin.nix @@ -3,11 +3,11 @@ stdenvNoCC.mkDerivation rec { name = "fasm-bin-${version}"; - version = "1.73.12"; + version = "1.73.15"; src = fetchurl { url = "https://flatassembler.net/fasm-${version}.tgz"; - sha256 = "19x5244bcg97mnx871daksj98fg4zxc8jmihl0napcd77xmiga8s"; + sha256 = "0yc30y4hkr226629347gcrzi153f10hcp5q7bm3q6ir3gx35xa39"; }; installPhase = '' diff --git a/pkgs/development/compilers/gambit/unstable.nix b/pkgs/development/compilers/gambit/unstable.nix index 5788f0df1da..d855b83f0af 100644 --- a/pkgs/development/compilers/gambit/unstable.nix +++ b/pkgs/development/compilers/gambit/unstable.nix @@ -1,13 +1,13 @@ { stdenv, callPackage, fetchFromGitHub }: callPackage ./build.nix { - version = "unstable-2019-02-05"; -# git-version = "4.9.3"; + version = "unstable-2019-07-21"; +# git-version = "4.9.3-109-g3b5f74fa"; src = fetchFromGitHub { owner = "feeley"; repo = "gambit"; - rev = "baf7de67f6d800821412fe83a8d9e9e09faeb490"; - sha256 = "0ygm5y8fvq6dbb8mwq52v8rc8pdnwm4qpmxlnx5m9hzzbm1kzxxv"; + rev = "3b5f74fae74b2159e3bf6923f29a18b31cc15dcc"; + sha256 = "07cb0d8754dqhxawkp5dp4y0bsa9kfald4dkj60j5yfnsp81y5mi"; }; inherit stdenv; } diff --git a/pkgs/development/compilers/gerbil/unstable.nix b/pkgs/development/compilers/gerbil/unstable.nix index 6e60ea6fea4..a9618a7e066 100644 --- a/pkgs/development/compilers/gerbil/unstable.nix +++ b/pkgs/development/compilers/gerbil/unstable.nix @@ -1,14 +1,14 @@ { stdenv, callPackage, fetchFromGitHub, gambit-unstable }: callPackage ./build.nix { - version = "unstable-2019-02-09"; - git-version = "0.16-DEV-15-gafc20fc2"; + version = "unstable-2019-08-11"; + git-version = "0.16-DEV-132-gcb58f9a3"; gambit = gambit-unstable; src = fetchFromGitHub { owner = "vyzo"; repo = "gerbil"; - rev = "afc20fc21030e8445b46b8267cc4c52cfd662aad"; - sha256 = "02v16zya9zryjs4wallibp1kvnpba60aw15y4k7zhddc71qjfbhw"; + rev = "cb58f9a30630a6f3e85a55f2c1dcc654f517ffed"; + sha256 = "18jh64v1gi6z3pks9zf19f2wcjpv21cs270dnaq617kgwp53vysh"; }; inherit stdenv; } diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix index ba4933363c1..a034e4ec8dd 100644 --- a/pkgs/development/compilers/ghc/8.2.2.nix +++ b/pkgs/development/compilers/ghc/8.2.2.nix @@ -166,7 +166,7 @@ stdenv.mkDerivation (rec { export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 - export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld.gold" + export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isLinux ".gold"}" export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" diff --git a/pkgs/development/compilers/ghc/8.4.4.nix b/pkgs/development/compilers/ghc/8.4.4.nix index a90af60de43..52fb926cdc6 100644 --- a/pkgs/development/compilers/ghc/8.4.4.nix +++ b/pkgs/development/compilers/ghc/8.4.4.nix @@ -126,7 +126,7 @@ stdenv.mkDerivation (rec { export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 - export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld.gold" + export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isLinux ".gold"}" export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" diff --git a/pkgs/development/compilers/ghc/8.6.4.nix b/pkgs/development/compilers/ghc/8.6.4.nix index 97ca95812d6..1534e6d1d08 100644 --- a/pkgs/development/compilers/ghc/8.6.4.nix +++ b/pkgs/development/compilers/ghc/8.6.4.nix @@ -125,7 +125,7 @@ stdenv.mkDerivation (rec { export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 - export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld.gold" + export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isLinux ".gold"}" export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" diff --git a/pkgs/development/compilers/ghc/8.6.5.nix b/pkgs/development/compilers/ghc/8.6.5.nix index d264cfda2a3..c859a34729d 100644 --- a/pkgs/development/compilers/ghc/8.6.5.nix +++ b/pkgs/development/compilers/ghc/8.6.5.nix @@ -125,7 +125,7 @@ stdenv.mkDerivation (rec { export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 - export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld.gold" + export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isLinux ".gold"}" export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" diff --git a/pkgs/development/compilers/ghc/8.8.1.nix b/pkgs/development/compilers/ghc/8.8.1.nix index 6899ad4fd48..423eaf02d8c 100644 --- a/pkgs/development/compilers/ghc/8.8.1.nix +++ b/pkgs/development/compilers/ghc/8.8.1.nix @@ -86,12 +86,12 @@ let in stdenv.mkDerivation (rec { - version = "8.8.0.20190613"; + version = "8.8.0.20190721"; name = "${targetPrefix}ghc-${version}"; src = fetchurl { - url = "https://downloads.haskell.org/~ghc/8.8.1-alpha2/ghc-${version}-src.tar.xz"; - sha256 = "17531jabkdmlhj57mkshjfwlri2g3jgal8fw9zpkl1kbplnrivyr"; + url = "https://downloads.haskell.org/ghc/8.8.1-rc1/ghc-${version}-src.tar.xz"; + sha256 = "1ih76zpxk8ay84xjyaflqc754002y8pdaainqfvb4cnhy6lpb1br"; }; enableParallelBuilding = true; @@ -110,7 +110,7 @@ stdenv.mkDerivation (rec { export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 - export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld.gold" + export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isLinux ".gold"}" export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 539d0408681..804edabba0c 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -120,7 +120,7 @@ stdenv.mkDerivation (rec { export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 # and more generally have a faster linker. - export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld.gold" + export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isLinux ".gold"}" export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" diff --git a/pkgs/development/compilers/icedtea-web/default.nix b/pkgs/development/compilers/icedtea-web/default.nix index 9390cbde637..73dd90ab4a1 100644 --- a/pkgs/development/compilers/icedtea-web/default.nix +++ b/pkgs/development/compilers/icedtea-web/default.nix @@ -1,30 +1,55 @@ -{ stdenv, fetchurl, jdk, gtk2, xulrunner, zip, pkgconfig, perl, npapi_sdk, bash, bc }: +{ stdenv, fetchFromGitHub, cargo, rustc, autoreconfHook, jdk, glib, xulrunner, zip, pkgconfig, npapi_sdk, bash, bc }: stdenv.mkDerivation rec { name = "icedtea-web-${version}"; - version = "1.7.1"; + version = "1.8.3"; - src = fetchurl { - url = "http://icedtea.wildebeest.org/download/source/${name}.tar.gz"; - sha256 = "1b9z0i9b1dsc2qpfdzbn2fi4vi3idrhm7ig45g1ny40ymvxcwwn9"; + src = fetchFromGitHub { + owner = "AdoptOpenJDK"; + repo = "IcedTea-Web"; + rev = name; + sha256 = "0bm5k11i2vgb54ch1bawsmjbwnqnp04saadwm2f2mggmmdc6b1qq"; }; - nativeBuildInputs = [ pkgconfig bc perl ]; - buildInputs = [ gtk2 xulrunner zip npapi_sdk ]; + nativeBuildInputs = [ autoreconfHook pkgconfig bc ]; + buildInputs = [ cargo rustc glib xulrunner zip npapi_sdk ]; preConfigure = '' - #patchShebangs javac.in configureFlagsArray+=("BIN_BASH=${bash}/bin/bash") ''; + patches = [ ./patches/0001-make-cargo-work-with-nix-build-on-linux.patch ]; + + doCheck = true; + preCheck = '' + # Needed for the below rust-launcher tests to pass + # dirs_paths_helper::tests::check_config_files_paths + # dirs_paths_helper::tests::check_legacy_config_files_paths + + mkdir -p $HOME/.icedtea + touch $HOME/.icedtea/deployment.properties + + mkdir -p $XDG_CONFIG_HOME/icedtea-web + touch $XDG_CONFIG_HOME/icedtea-web/deployment.properties + ''; + + HOME = "/build"; + XDG_CONFIG_HOME = "/build"; + configureFlags = [ + "--with-itw-libs=DISTRIBUTION" "--with-jdk-home=${jdk.home}" "--disable-docs" ]; mozillaPlugin = "/lib"; + postInstall = '' + mkdir -p $out/share/applications + cp javaws.desktop itweb-settings.desktop policyeditor.desktop $out/share/applications + ''; + meta = { description = "Java web browser plugin and an implementation of Java Web Start"; longDescription = '' @@ -32,7 +57,7 @@ stdenv.mkDerivation rec { programming language and an implementation of Java Web Start, originally based on the NetX project. ''; - homepage = http://icedtea.classpath.org/wiki/IcedTea-Web; + homepage = https://github.com/adoptopenjdk/icedtea-web; maintainers = with stdenv.lib.maintainers; [ wizeman ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/compilers/icedtea-web/patches/0001-make-cargo-work-with-nix-build-on-linux.patch b/pkgs/development/compilers/icedtea-web/patches/0001-make-cargo-work-with-nix-build-on-linux.patch new file mode 100644 index 00000000000..85cad6cf467 --- /dev/null +++ b/pkgs/development/compilers/icedtea-web/patches/0001-make-cargo-work-with-nix-build-on-linux.patch @@ -0,0 +1,46 @@ +Subject: [PATCH] make cargo work with nix-build on linux + +--- + .cargo/config | 2 ++ + rust-launcher/Cargo.lock | 4 ++++ + rust-launcher/Cargo.toml | 7 ++++--- + 3 files changed, 10 insertions(+), 3 deletions(-) + create mode 100644 .cargo/config + create mode 100644 rust-launcher/Cargo.lock + +diff --git a/.cargo/config b/.cargo/config +new file mode 100644 +index 0000000..03ec4a2 +--- /dev/null ++++ b/.cargo/config +@@ -0,0 +1,2 @@ ++[net] ++offline=true +diff --git a/rust-launcher/Cargo.lock b/rust-launcher/Cargo.lock +new file mode 100644 +index 0000000..6055cc0 +--- /dev/null ++++ b/rust-launcher/Cargo.lock +@@ -0,0 +1,4 @@ ++[[package]] ++name = "launcher" ++version = "1.8.0" ++ +diff --git a/rust-launcher/Cargo.toml b/rust-launcher/Cargo.toml +index 61ee308..5e6e91b 100644 +--- a/rust-launcher/Cargo.toml ++++ b/rust-launcher/Cargo.toml +@@ -3,6 +3,7 @@ name = "launcher" + version = "1.8.0" + authors = ["https://icedtea.classpath.org/wiki/IcedTea-Web"] + +-[dependencies] +-[target.'cfg(windows)'.dependencies] +-dunce = "0.1.1" ++[workspace] ++# We need this too or cargo will fail. Some files seem to be copied around and ++# cargo thinks we are in a workspace, so let's exclude everything. ++exclude = ["*"] +-- +2.19.2 + diff --git a/pkgs/development/compilers/llvm/8/clang/compiler-rt-baremetal.patch b/pkgs/development/compilers/llvm/8/clang/compiler-rt-baremetal.patch new file mode 100644 index 00000000000..a4a0f21b0fc --- /dev/null +++ b/pkgs/development/compilers/llvm/8/clang/compiler-rt-baremetal.patch @@ -0,0 +1,53 @@ +Index: lib/Driver/ToolChains/BareMetal.cpp +=================================================================== +--- a/lib/Driver/ToolChains/BareMetal.cpp ++++ b/lib/Driver/ToolChains/BareMetal.cpp +@@ -157,7 +157,7 @@ + void BareMetal::AddLinkRuntimeLib(const ArgList &Args, + ArgStringList &CmdArgs) const { + CmdArgs.push_back(Args.MakeArgString("-lclang_rt.builtins-" + +- getTriple().getArchName() + ".a")); ++ getTriple().getArchName())); + } + + void baremetal::Linker::ConstructJob(Compilation &C, const JobAction &JA, +Index: test/Driver/baremetal.cpp +=================================================================== +--- a/test/Driver/baremetal.cpp ++++ b/test/Driver/baremetal.cpp +@@ -13,7 +13,7 @@ + // CHECK-V6M-C-NEXT: "{{[^"]*}}ld{{(\.(lld|bfd|gold))?}}{{(\.exe)?}}" "{{.*}}.o" "-Bstatic" + // CHECK-V6M-C-SAME: "-L[[RESOURCE_DIR:[^"]+]]{{[/\\]+}}lib{{[/\\]+}}baremetal" + // CHECK-V6M-C-SAME: "-T" "semihosted.lds" "-Lsome{{[/\\]+}}directory{{[/\\]+}}user{{[/\\]+}}asked{{[/\\]+}}for" +-// CHECK-V6M-C-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m.a" ++// CHECK-V6M-C-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m" + // CHECK-V6M-C-SAME: "-o" "{{.*}}.o" + + // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ +@@ -35,7 +35,7 @@ + // CHECK-V6M-DEFAULTCXX: "{{[^"]*}}ld{{(\.(lld|bfd|gold))?}}{{(\.exe)?}}" "{{.*}}.o" "-Bstatic" + // CHECK-V6M-DEFAULTCXX-SAME: "-L{{[^"]*}}{{[/\\]+}}lib{{(64)?}}{{[/\\]+}}clang{{[/\\]+}}{{.*}}{{[/\\]+}}lib{{[/\\]+}}baremetal" + // CHECK-V6M-DEFAULTCXX-SAME: "-lc++" "-lc++abi" "-lunwind" +-// CHECK-V6M-DEFAULTCXX-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m.a" ++// CHECK-V6M-DEFAULTCXX-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m" + // CHECK-V6M-DEFAULTCXX-SAME: "-o" "{{.*}}.o" + + // RUN: %clangxx -no-canonical-prefixes %s -### -o %t.o 2>&1 \ +@@ -48,7 +48,7 @@ + // CHECK-V6M-LIBCXX: "{{[^"]*}}ld{{(\.(lld|bfd|gold))?}}{{(\.exe)?}}" "{{.*}}.o" "-Bstatic" + // CHECK-V6M-LIBCXX-SAME: "-L{{[^"]*}}{{[/\\]+}}lib{{(64)?}}{{[/\\]+}}clang{{[/\\]+}}{{.*}}{{[/\\]+}}lib{{[/\\]+}}baremetal" + // CHECK-V6M-LIBCXX-SAME: "-lc++" "-lc++abi" "-lunwind" +-// CHECK-V6M-LIBCXX-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m.a" ++// CHECK-V6M-LIBCXX-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m" + // CHECK-V6M-LIBCXX-SAME: "-o" "{{.*}}.o" + + // RUN: %clangxx -no-canonical-prefixes %s -### -o %t.o 2>&1 \ +@@ -61,7 +61,7 @@ + // CHECK-V6M-LIBSTDCXX: "{{[^"]*}}ld{{(\.(lld|bfd|gold))?}}{{(\.exe)?}}" "{{.*}}.o" "-Bstatic" + // CHECK-V6M-LIBSTDCXX-SAME: "-L{{[^"]*}}{{[/\\]+}}lib{{(64)?}}{{[/\\]+}}clang{{[/\\]+}}{{.*}}{{[/\\]+}}lib{{[/\\]+}}baremetal" + // CHECK-V6M-LIBSTDCXX-SAME: "-lstdc++" "-lsupc++" "-lunwind" +-// CHECK-V6M-LIBSTDCXX-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m.a" ++// CHECK-V6M-LIBSTDCXX-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m" + // CHECK-V6M-LIBSTDCXX-SAME: "-o" "{{.*}}.o" + + // RUN: %clangxx -no-canonical-prefixes %s -### -o %t.o 2>&1 \ diff --git a/pkgs/development/compilers/llvm/8/clang/default.nix b/pkgs/development/compilers/llvm/8/clang/default.nix index 0b38660c4c4..6911089250e 100644 --- a/pkgs/development/compilers/llvm/8/clang/default.nix +++ b/pkgs/development/compilers/llvm/8/clang/default.nix @@ -8,7 +8,7 @@ let self = stdenv.mkDerivation ({ name = "clang-${version}"; - src = fetch "cfe" "0svk1f70hvpwrjp6x5i9kqwrqwxnmcrw5s7f4cxyd100mdd12k08"; + src = fetch "cfe" "0ihnbdl058gvl2wdy45p5am55bq8ifx8m9mhcsgj9ax8yxlzvvvh"; unpackPhase = '' unpackFile $src @@ -47,6 +47,8 @@ let # Backport for the `--unwindlib=[libgcc|compiler-rt]` flag, which is # needed for our bootstrapping to not interfere with C. ./unwindlib.patch + # https://reviews.llvm.org/D51899 + ./compiler-rt-baremetal.patch ]; postPatch = '' diff --git a/pkgs/development/compilers/llvm/8/compiler-rt.nix b/pkgs/development/compilers/llvm/8/compiler-rt.nix index a8bbb1f719b..5959b99316d 100644 --- a/pkgs/development/compilers/llvm/8/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/8/compiler-rt.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "compiler-rt-${version}"; inherit version; - src = fetch "compiler-rt" "1c919wsm17xnv7lr8bhpq2wkq8113lzlw6hzhfr737j59x3wfddl"; + src = fetch "compiler-rt" "0dqqf8f930l8gag4d9qjgn1n0pj0nbv2anviqqhdi1rkhas8z0hi"; nativeBuildInputs = [ cmake python llvm ]; buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi; @@ -27,6 +27,9 @@ stdenv.mkDerivation rec { "-DCOMPILER_RT_BUILD_XRAY=OFF" "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF" "-DCOMPILER_RT_BUILD_PROFILE=OFF" + ] ++ stdenv.lib.optionals (stdenv.hostPlatform.parsed.kernel.name == "none") [ + "-DCOMPILER_RT_BAREMETAL_BUILD=ON" + "-DCOMPILER_RT_OS_DIR=baremetal" ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/compilers/llvm/8/default.nix b/pkgs/development/compilers/llvm/8/default.nix index 48cf9e5e589..f864e24acfe 100644 --- a/pkgs/development/compilers/llvm/8/default.nix +++ b/pkgs/development/compilers/llvm/8/default.nix @@ -5,15 +5,15 @@ }: let - release_version = "8.0.0"; + release_version = "8.0.1"; version = release_version; # differentiating these is important for rc's fetch = name: sha256: fetchurl { - url = "https://releases.llvm.org/${release_version}/${name}-${version}.src.tar.xz"; + url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-${release_version}/${name}-${version}.src.tar.xz"; inherit sha256; }; - clang-tools-extra_src = fetch "clang-tools-extra" "0jwx6nnshp92pd5852y7ip7qhaqdf8az5g0440pli9q8whmi402g"; + clang-tools-extra_src = fetch "clang-tools-extra" "1qf3097bc5ia8p6cpmbx985rjr3yaah5s8fc0nv7pw742yv7jw8q"; tools = stdenv.lib.makeExtensible (tools: let callPackage = newScope (tools // { inherit stdenv cmake libxml2 python isl release_version version fetch; }); diff --git a/pkgs/development/compilers/llvm/8/libc++/default.nix b/pkgs/development/compilers/llvm/8/libc++/default.nix index 3d67c37dcdd..f8a07de0722 100644 --- a/pkgs/development/compilers/llvm/8/libc++/default.nix +++ b/pkgs/development/compilers/llvm/8/libc++/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libc++-${version}"; - src = fetch "libcxx" "1qlx3wlxrnc5cwc1fcfc2vhfsl7j4294hi8y5kxj8hy8wxsjd462"; + src = fetch "libcxx" "0y4vc9z36c1zlq15cnibdzxnc1xi5glbc6klnm8a41q3db4541kz"; postUnpack = '' unpackFile ${libcxxabi.src} diff --git a/pkgs/development/compilers/llvm/8/libc++abi.nix b/pkgs/development/compilers/llvm/8/libc++abi.nix index bb5b368267f..1ee6d069f4b 100644 --- a/pkgs/development/compilers/llvm/8/libc++abi.nix +++ b/pkgs/development/compilers/llvm/8/libc++abi.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "libc++abi-${version}"; - src = fetch "libcxxabi" "1k875f977ybdkpdnr9105wa6hccy9qvpd9xd42n75h7p56bdxmn2"; + src = fetch "libcxxabi" "1vznz8n1z1h8af0ga451m98lc2hjnv4fyzl71napsvjhvk4g6nxp"; nativeBuildInputs = [ cmake ]; buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind; diff --git a/pkgs/development/compilers/llvm/8/libunwind.nix b/pkgs/development/compilers/llvm/8/libunwind.nix index a4ceb9102ef..75edd1fff54 100644 --- a/pkgs/development/compilers/llvm/8/libunwind.nix +++ b/pkgs/development/compilers/llvm/8/libunwind.nix @@ -1,9 +1,9 @@ -{ stdenv, version, fetch, cmake, fetchpatch }: +{ stdenv, version, fetch, cmake, fetchpatch, enableShared ? true }: stdenv.mkDerivation { name = "libunwind-${version}"; - src = fetch "libunwind" "0q7ndlldid9wchnny0a936llwxj7zgb9gxp46wjjxvwwkik3l97z"; + src = fetch "libunwind" "0vhgcgzsb33l83qaikrkj87ypqb48mi607rccczccwiiv8ficw0q"; nativeBuildInputs = [ cmake ]; @@ -19,4 +19,6 @@ stdenv.mkDerivation { ]; enableParallelBuilding = true; + + cmakeFlags = stdenv.lib.optional (!enableShared) "-DLIBUNWIND_ENABLE_SHARED=OFF"; } diff --git a/pkgs/development/compilers/llvm/8/lld.nix b/pkgs/development/compilers/llvm/8/lld.nix index 7fff6843c5f..aec1b14b994 100644 --- a/pkgs/development/compilers/llvm/8/lld.nix +++ b/pkgs/development/compilers/llvm/8/lld.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { name = "lld-${version}"; - src = fetch "lld" "0dvf38pbm7jy88g66mz7ikkdfhm2qpj0iyzh62hzycifjbnciblw"; + src = fetch "lld" "121xhxrlvwy3k5nf6p1wv31whxlb635ssfkci8z93mwv4ja1xflz"; nativeBuildInputs = [ cmake ]; buildInputs = [ llvm libxml2 ]; diff --git a/pkgs/development/compilers/llvm/8/lldb.nix b/pkgs/development/compilers/llvm/8/lldb.nix index 861ef1f3510..f31da000bb8 100644 --- a/pkgs/development/compilers/llvm/8/lldb.nix +++ b/pkgs/development/compilers/llvm/8/lldb.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { name = "lldb-${version}"; - src = fetch "lldb" "0wq3mi76fk86g2g2bcsr0yhagh1dlf2myk641ai58rc116gqp4a9"; + src = fetch "lldb" "1mriw4adrwm6kzabrjr7yqmdiylxd6glf6samd80dp8idnm9p9z8"; postPatch = '' # Fix up various paths that assume llvm and clang are installed in the same place diff --git a/pkgs/development/compilers/llvm/8/llvm.nix b/pkgs/development/compilers/llvm/8/llvm.nix index 1827273d57e..6799a3f935f 100644 --- a/pkgs/development/compilers/llvm/8/llvm.nix +++ b/pkgs/development/compilers/llvm/8/llvm.nix @@ -30,8 +30,8 @@ let in stdenv.mkDerivation (rec { name = "llvm-${version}"; - src = fetch "llvm" "0k124sxkfhfi1rca6kzkdraf4axhx99x3cw2rk55056628dvwwl8"; - polly_src = fetch "polly" "1x4xv3j226rqdddp7b61d71wsx2b8vmmri02ycx27y2fg7ba7xg3"; + src = fetch "llvm" "1rvm5gqp5v8hfn17kqws3zhk94w4kxndal12bqa0y57p09nply24"; + polly_src = fetch "polly" "1lfjdz3ilj5xmjxvicd8f5ykybks67ry2pdb777352r3mzlgg8g8"; unpackPhase = '' unpackFile $src diff --git a/pkgs/development/compilers/llvm/8/openmp.nix b/pkgs/development/compilers/llvm/8/openmp.nix index bf85cae5abe..8cf55173561 100644 --- a/pkgs/development/compilers/llvm/8/openmp.nix +++ b/pkgs/development/compilers/llvm/8/openmp.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { name = "openmp-${version}"; - src = fetch "openmp" "1mf9cpgvix34xlpv0inkgl3qmdvgvp96f7sksqizri0n5xfp1cgp"; + src = fetch "openmp" "0b3jlxhqbpyd1nqkpxjfggm5d9va5qpyf7d4i5y7n4a1mlydv19y"; nativeBuildInputs = [ cmake perl ]; buildInputs = [ llvm ]; diff --git a/pkgs/development/compilers/nextpnr/default.nix b/pkgs/development/compilers/nextpnr/default.nix index d1c0db25351..d32d3fa67f1 100644 --- a/pkgs/development/compilers/nextpnr/default.nix +++ b/pkgs/development/compilers/nextpnr/default.nix @@ -26,14 +26,14 @@ let }); in stdenv.mkDerivation rec { - name = "nextpnr-${version}"; - version = "2019.04.19"; + pname = "nextpnr"; + version = "2019.08.10"; src = fetchFromGitHub { owner = "yosyshq"; repo = "nextpnr"; - rev = "5344bc3b65f4e06f983db781e9a82d30b3f1512b"; - sha256 = "1y14jpa948cwk0i19bsfqh7yxsxkgskm4xym4z179sjcvcdvrn3a"; + rev = "3f26cf50767143e48d29ae691b2a0052c359eb15"; + sha256 = "1gv84svw56ass9idbzh17h3yxkk9ydr40ijf9w72gf72rbixszdr"; }; nativeBuildInputs @@ -49,6 +49,10 @@ stdenv.mkDerivation rec { "-DICEBOX_ROOT=${icestorm}/share/icebox" "-DTRELLIS_ROOT=${trellisRoot}/trellis" "-DUSE_OPENMP=ON" + # warning: high RAM usage + "-DSERIALIZE_CHIPDB=OFF" + # use PyPy for icestorm if enabled + "-DPYTHON_EXECUTABLE=${icestorm.pythonInterp}" ] ++ (stdenv.lib.optional (!enableGui) "-DBUILD_GUI=OFF"); # Fix the version number. This is a bit stupid (and fragile) in practice diff --git a/pkgs/development/compilers/ocaml/4.08.nix b/pkgs/development/compilers/ocaml/4.08.nix index 4f9b8ebd294..11c22e636ef 100644 --- a/pkgs/development/compilers/ocaml/4.08.nix +++ b/pkgs/development/compilers/ocaml/4.08.nix @@ -1,8 +1,8 @@ import ./generic.nix { major_version = "4"; minor_version = "08"; - patch_version = "0"; - sha256 = "0si976y8snbmhm96671di65z0rrdyldxd55wjxn2mkn6654nryna"; + patch_version = "1"; + sha256 = "18sycl3zmgb8ghpxymriy5d72gvw7m5ra65v51hcrmzzac21hkyd"; # If the executable is stripped it does not work dontStrip = true; diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix index 3f593dbcd6d..7ccbfb6351d 100644 --- a/pkgs/development/compilers/openjdk/11.nix +++ b/pkgs/development/compilers/openjdk/11.nix @@ -44,6 +44,7 @@ let ./fix-java-home-jdk10.patch ./read-truststore-from-env-jdk10.patch ./currency-date-range-jdk10.patch + ./increase-javadoc-heap.patch ] ++ lib.optionals (!minimal && enableGnome2) [ ./swing-use-gtk-jdk10.patch ]; diff --git a/pkgs/development/compilers/openjdk/darwin/default.nix b/pkgs/development/compilers/openjdk/darwin/default.nix index 54239e58002..b4e19c32e26 100644 --- a/pkgs/development/compilers/openjdk/darwin/default.nix +++ b/pkgs/development/compilers/openjdk/darwin/default.nix @@ -1,18 +1,28 @@ { stdenv, fetchurl, unzip, setJavaClassPath, freetype }: let - jdk = stdenv.mkDerivation { - name = "openjdk-7u60b30"; + jce-policies = fetchurl { + # Ugh, unversioned URLs... I hope this doesn't change often enough to cause pain before we move to a Darwin source build of OpenJDK! + url = "http://cdn.azul.com/zcek/bin/ZuluJCEPolicies.zip"; + sha256 = "0nk7m0lgcbsvldq2wbfni2pzq8h818523z912i7v8hdcij5s48c0"; + }; + + jdk = stdenv.mkDerivation rec { + name = "zulu12.1.3-ca-jdk12"; - # From https://github.com/alexkasko/openjdk-unofficial-builds src = fetchurl { - url = https://bitbucket.org/alexkasko/openjdk-unofficial-builds/downloads/openjdk-1.7.0-u60-unofficial-macosx-x86_64-bundle.zip; - sha256 = "af510a4d566712d82c17054bb39f91d98c69a85586e244c6123669a0bd4b7401"; + url = "https://cdn.azul.com/zulu/bin/${name}-macosx_x64.tar.gz"; + sha256 = "05q3v4vwjd7xhqr21bzlip5x4xhq5rpdshfpb8i86n4zvn7l0mxy"; + curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/"; }; buildInputs = [ unzip freetype ]; installPhase = '' - mv */Contents/Home $out + mkdir -p $out + mv * $out + + unzip ${jce-policies} + mv -f ZuluJCEPolicies/*.jar $out/lib/security/ # jni.h expects jni_md.h to be in the header search path. ln -s $out/include/darwin/*_md.h $out/include/ @@ -24,13 +34,13 @@ let ''; preFixup = '' - # Propagate the setJavaClassPath setup hook from the JRE so that - # any package that depends on the JRE has $CLASSPATH set up + # Propagate the setJavaClassPath setup hook from the JDK so that + # any package that depends on the JDK has $CLASSPATH set up # properly. mkdir -p $out/nix-support printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs - install_name_tool -change /usr/X11/lib/libfreetype.6.dylib ${freetype}/lib/libfreetype.6.dylib $out/jre/lib/libfontmanager.dylib + install_name_tool -change /usr/X11/lib/libfreetype.6.dylib ${freetype}/lib/libfreetype.6.dylib $out/lib/libfontmanager.dylib # Set JAVA_HOME automatically. cat <<EOF >> $out/nix-support/setup-hook @@ -39,7 +49,6 @@ let ''; passthru = { - jre = jdk; home = jdk; }; diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix new file mode 100644 index 00000000000..65c85d055cb --- /dev/null +++ b/pkgs/development/compilers/openjdk/default.nix @@ -0,0 +1,171 @@ +{ stdenv, lib, fetchurl, bash, cpio, autoconf, pkgconfig, file, which, unzip, zip, cups, freetype +, alsaLib, bootjdk, perl, liberation_ttf, fontconfig, zlib, lndir +, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor, libXrandr +, libjpeg, giflib +, setJavaClassPath +, minimal ? false +, enableJavaFX ? true, openjfx +, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf +}: + +let + + /** + * The JDK libraries are in directories that depend on the CPU. + */ + architecture = + if stdenv.hostPlatform.system == "i686-linux" then + "i386" + else "amd64"; + + major = "12"; + update = ".0.2"; + build = "ga"; + repover = "jdk-${major}${update}-${build}"; + + openjdk = stdenv.mkDerivation { + name = "openjdk-${major}${update}-${build}"; + + src = fetchurl { + url = "http://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/${repover}.tar.gz"; + sha256 = "1ndlxmikyy298z7lqpr1bd0zxq7yx6xidj8y3c8mw9m9fy64h9c7"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ + autoconf cpio file which unzip zip perl bootjdk zlib cups freetype alsaLib + libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst + libXi libXinerama libXcursor libXrandr lndir fontconfig + ] ++ lib.optionals (!minimal && enableGnome2) [ + gtk3 gnome_vfs GConf glib + ]; + + patches = [ + ./fix-java-home-jdk10.patch + ./read-truststore-from-env-jdk10.patch + ./currency-date-range-jdk10.patch + ./increase-javadoc-heap.patch + # -Wformat etc. are stricter in newer gccs, per + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79677 + # so grab the work-around from + # https://src.fedoraproject.org/rpms/java-openjdk/pull-request/24 + (fetchurl { + url = https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch; + sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r"; + }) + ] ++ lib.optionals (!minimal && enableGnome2) [ + ./swing-use-gtk-jdk10.patch + ]; + + preConfigure = '' + chmod +x configure + substituteInPlace configure --replace /bin/bash "${bash}/bin/bash" + + configureFlagsArray=( + "--with-boot-jdk=${bootjdk.home}" + "--enable-unlimited-crypto" + "--with-zlib=system" + "--with-giflib=system" + "--with-stdc++lib=dynamic" + + # glibc 2.24 deprecated readdir_r so we need this + # See https://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg49006.html + "--with-extra-cflags=-Wno-error=deprecated-declarations -Wno-error=unused-result" + '' + + lib.optionalString (architecture == "amd64") " \"--with-jvm-features=zgc\"" + + lib.optionalString minimal " \"--enable-headless-only\"" + + lib.optionalString (!minimal && enableJavaFX) " \"--with-import-modules=${openjfx}\"" + + ");" + # https://bugzilla.redhat.com/show_bug.cgi?id=1306558 + # https://github.com/JetBrains/jdk8u/commit/eaa5e0711a43d64874111254d74893fa299d5716 + + stdenv.lib.optionalString stdenv.cc.isGNU '' + NIX_CFLAGS_COMPILE+=" -fno-lifetime-dse -fno-delete-null-pointer-checks -std=gnu++98 -Wno-error" + ''; + + NIX_LDFLAGS= lib.optionals (!minimal) [ + "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" + ] ++ lib.optionals (!minimal && enableGnome2) [ + "-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2" + ]; + + buildFlags = [ "all" ]; + + installPhase = '' + mkdir -p $out/lib/openjdk $out/share + + cp -av build/*/images/jdk/* $out/lib/openjdk + + # Remove some broken manpages. + rm -rf $out/lib/openjdk/man/ja* + + # Mirror some stuff in top-level. + mkdir $out/include $out/share/man + ln -s $out/lib/openjdk/include/* $out/include/ + ln -s $out/lib/openjdk/man/* $out/share/man/ + + # jni.h expects jni_md.h to be in the header search path. + ln -s $out/include/linux/*_md.h $out/include/ + + # Remove crap from the installation. + rm -rf $out/lib/openjdk/demo + ${lib.optionalString minimal '' + rm $out/lib/openjdk/lib/{libjsound,libfontmanager}.so + ''} + + ln -s $out/lib/openjdk/bin $out/bin + ''; + + preFixup = '' + # Propagate the setJavaClassPath setup hook so that any package + # that depends on the JDK has $CLASSPATH set up properly. + mkdir -p $out/nix-support + #TODO or printWords? cf https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040 + echo -n "${setJavaClassPath}" > $out/nix-support/propagated-build-inputs + + # Set JAVA_HOME automatically. + mkdir -p $out/nix-support + cat <<EOF > $out/nix-support/setup-hook + if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out/lib/openjdk; fi + EOF + ''; + + postFixup = '' + # Build the set of output library directories to rpath against + LIBDIRS="" + for output in $outputs; do + LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS" + done + + # Add the local library paths to remove dependencies on the bootstrap + for output in $outputs; do + OUTPUTDIR=$(eval echo \$$output) + BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*) + echo "$BINLIBS" | while read i; do + patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true + patchelf --shrink-rpath "$i" || true + done + done + + # Test to make sure that we don't depend on the bootstrap + for output in $outputs; do + if grep -q -r '${bootjdk}' $(eval echo \$$output); then + echo "Extraneous references to ${bootjdk} detected" + exit 1 + fi + done + ''; + + meta = with stdenv.lib; { + homepage = http://openjdk.java.net/; + license = licenses.gpl2; + description = "The open-source Java Development Kit"; + maintainers = with maintainers; [ edwtjo ]; + platforms = ["i686-linux" "x86_64-linux"]; + }; + + passthru = { + inherit architecture; + home = "${openjdk}/lib/openjdk"; + }; + }; +in openjdk diff --git a/pkgs/development/compilers/openjdk/increase-javadoc-heap.patch b/pkgs/development/compilers/openjdk/increase-javadoc-heap.patch new file mode 100644 index 00000000000..6a1b253f913 --- /dev/null +++ b/pkgs/development/compilers/openjdk/increase-javadoc-heap.patch @@ -0,0 +1,12 @@ +--- a/make/Docs.gmk 2019-07-24 13:07:37.013405090 -0400 ++++ b/make/Docs.gmk 2019-07-24 13:07:28.406550535 -0400 +@@ -274,7 +274,7 @@ + $1_INDIRECT_EXPORTS := $$(call FindTransitiveIndirectDepsForModules, $$($1_MODULES)) + $1_ALL_MODULES := $$(sort $$($1_MODULES) $$($1_INDIRECT_EXPORTS)) + +- $1_JAVA_ARGS := -Dextlink.spec.version=$$(VERSION_SPECIFICATION) ++ $1_JAVA_ARGS := -Dextlink.spec.version=$$(VERSION_SPECIFICATION) -Xmx1G + + ifeq ($$(ENABLE_FULL_DOCS), true) + # Tell the ModuleGraph taglet to generate html links to soon-to-be-created + diff --git a/pkgs/development/compilers/openjdk/openjfx/11.nix b/pkgs/development/compilers/openjdk/openjfx/11.nix index 4ee007281e2..223feb1e2a1 100644 --- a/pkgs/development/compilers/openjdk/openjfx/11.nix +++ b/pkgs/development/compilers/openjdk/openjfx/11.nix @@ -7,7 +7,7 @@ let build = "1"; repover = "${major}${update}+${build}"; gradle_ = (gradleGen.override { - jdk = bootjdk; + java = bootjdk; }).gradle_4_10; makePackage = args: stdenv.mkDerivation ({ @@ -48,7 +48,7 @@ let # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) installPhase = '' - find $GRADLE_USER_HOME -type f -regex '.*\.\(jar\|pom\)' \ + find $GRADLE_USER_HOME -type f -regex '.*/modules.*\.\(jar\|pom\)' \ | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ | sh rm -rf $out/tmp diff --git a/pkgs/development/compilers/openjdk/openjfx/12.nix b/pkgs/development/compilers/openjdk/openjfx/12.nix new file mode 100644 index 00000000000..266dd7f334e --- /dev/null +++ b/pkgs/development/compilers/openjdk/openjfx/12.nix @@ -0,0 +1,110 @@ +{ stdenv, fetchurl, writeText, openjdk, bootjdk, gradleGen, pkgconfig, perl, cmake, gperf +, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib, ffmpeg, python, ruby }: + +let + major = "12"; + update = ""; + build = "14"; + repover = "${major}${update}+${build}"; + gradle_ = (gradleGen.override { + java = bootjdk; + }).gradle_4_10; + + makePackage = args: stdenv.mkDerivation ({ + version = "${major}${update}-${repover}"; + + src = fetchurl { + url = "http://hg.openjdk.java.net/openjfx/${major}-dev/rt/archive/${repover}.tar.gz"; + sha256 = "16jjfjkrg57wsj9mmm52i2kl3byz3ba1f9f8wwc8zwqm4cpjzliz"; + }; + + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsaLib ffmpeg ]; + nativeBuildInputs = [ gradle_ perl pkgconfig cmake gperf python ruby ]; + + dontUseCmakeConfigure = true; + + config = writeText "gradle.properties" ('' + CONF = Release + JDK_HOME = ${bootjdk}/lib/openjdk + '' + args.gradleProperties or ""); + + buildPhase = '' + runHook preBuild + + export GRADLE_USER_HOME=$(mktemp -d) + ln -s $config gradle.properties + export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE" + gradle --no-daemon $gradleFlags sdk + + runHook postBuild + ''; + } // args); + + # Fake build to pre-download deps into fixed-output derivation. + # We run nearly full build because I see no other way to download everything that's needed. + # Anyone who knows a better way? + deps = makePackage { + pname = "openjfx-deps"; + + # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) + installPhase = '' + find $GRADLE_USER_HOME -type f -regex '.*/modules.*\.\(jar\|pom\)' \ + | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ + | sh + rm -rf $out/tmp + ''; + + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = + # Downloaded AWT jars differ by platform. + if stdenv.system == "x86_64-linux" then "1z5qar5l28ja4pkf5l5m48xbv3x1yrnilsv9lpf2j3vkdk9h1nci" + else if stdenv.system == "i686-linux" then "0rbygvjc7w197fi5nxldqdrm6mpiyd3n45042g3gd4s5qk08spjd" + else throw "Unsupported platform"; + }; + +in makePackage { + pname = "openjfx-modular-sdk"; + + gradleProperties = '' + COMPILE_MEDIA = true + COMPILE_WEBKIT = true + ''; + + preBuild = '' + swtJar="$(find ${deps} -name org.eclipse.swt\*.jar)" + substituteInPlace build.gradle \ + --replace 'mavenCentral()' 'mavenLocal(); maven { url uri("${deps}") }' \ + --replace 'name: SWT_FILE_NAME' "files('$swtJar')" + ''; + + installPhase = '' + cp -r build/modular-sdk $out + ''; + + stripDebugList = [ "." ]; + + postFixup = '' + # Remove references to bootstrap. + find "$out" -name \*.so | while read lib; do + new_refs="$(patchelf --print-rpath "$lib" | sed -E 's,:?${bootjdk}[^:]*,,')" + patchelf --set-rpath "$new_refs" "$lib" + done + + # Test to make sure that we don't depend on the bootstrap + if grep -q -r '${bootjdk}' "$out"; then + echo "Extraneous references to ${bootjdk} detected" >&2 + exit 1 + fi + ''; + + passthru.deps = deps; + + meta = with stdenv.lib; { + homepage = http://openjdk.java.net/projects/openjfx/; + license = openjdk.meta.license; + description = "The next-generation Java client toolkit."; + maintainers = with maintainers; [ abbradar ]; + platforms = openjdk.meta.platforms; + }; +} diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index e16e2c514a8..85641c351d4 100644 --- a/pkgs/development/compilers/ponyc/default.nix +++ b/pkgs/development/compilers/ponyc/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation ( rec { pname = "ponyc"; - version = "0.28.1"; + version = "0.30.0"; src = fetchFromGitHub { owner = "ponylang"; repo = pname; rev = version; - sha256 = "1yi41a03039yz9rf34l9iq8haf5vb6gwzplr04rahfhd8xsd38gq"; + sha256 = "1gs9x4rw4mfv499j3k1brm8gbz7pjl8dyr7v68pa2f563cbzwaq9"; }; buildInputs = [ llvm makeWrapper which ]; @@ -25,6 +25,10 @@ stdenv.mkDerivation ( rec { substituteInPlace packages/process/_test.pony \ --replace '=/bin' "${coreutils}/bin" + # Disabling the stdlib tests + substituteInPlace Makefile-ponyc \ + --replace 'test-ci: all check-version test-core test-stdlib-debug test-stdlib' 'test-ci: all check-version test-core' + # Remove impure system refs substituteInPlace src/libponyc/pkg/package.c \ --replace "/usr/local/lib" "" \ diff --git a/pkgs/development/compilers/ponyc/pony-stable.nix b/pkgs/development/compilers/ponyc/pony-stable.nix index 821a9b8125c..2aab6a99a1c 100644 --- a/pkgs/development/compilers/ponyc/pony-stable.nix +++ b/pkgs/development/compilers/ponyc/pony-stable.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pony-stable-${version}"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "ponylang"; repo = "pony-stable"; rev = version; - sha256 = "0zzcq0vsl6kcrsxwqzd3s9mq7aq5sg8si5c83rxyi9n6a06gnbh7"; + sha256 = "1wiinw35bp3zpq9kx61x2zvid7ln00jrw052ah8801s0d9dbwrdr"; }; buildInputs = [ ponyc ]; diff --git a/pkgs/development/compilers/qbe/default.nix b/pkgs/development/compilers/qbe/default.nix index d7315b73c9b..8926fced482 100644 --- a/pkgs/development/compilers/qbe/default.nix +++ b/pkgs/development/compilers/qbe/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "qbe"; - version = "unstable-2019-05-15"; + version = "unstable-2019-07-11"; src = fetchgit { url = "git://c9x.me/qbe.git"; - rev = "acc3af47330fd6610cf0fbdb28e9fbd05160888f"; - sha256 = "1c8ynqbakgz3hfdcyhwdmz7i1hnyd9m25f9y47sc21bvxwfrbzpi"; + rev = "7bf08ff50729037c8820b26d085905175b5593c8"; + sha256 = "0w1yack5ky6x6lbw8vn6swsy8s90n6ny0jpkw0866ja677z7qz34"; }; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index 9f576042787..e000edad49b 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -26,13 +26,6 @@ rustPlatform.buildRustPackage rec { # fixes: the cargo feature `edition` requires a nightly version of Cargo, but this is the `stable` channel RUSTC_BOOTSTRAP = 1; - # FIXME: Use impure version of CoreFoundation because of missing symbols. - # CFURLSetResourcePropertyForKey is defined in the headers but there's no - # corresponding implementation in the sources from opensource.apple.com. - preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' - export NIX_CFLAGS_COMPILE="-F${CoreFoundation}/Library/Frameworks $NIX_CFLAGS_COMPILE" - ''; - postInstall = '' # NOTE: We override the `http.cainfo` option usually specified in # `.cargo/config`. This is an issue when users want to specify diff --git a/pkgs/development/compilers/rust/clippy.nix b/pkgs/development/compilers/rust/clippy.nix new file mode 100644 index 00000000000..2b8fcbe0ba4 --- /dev/null +++ b/pkgs/development/compilers/rust/clippy.nix @@ -0,0 +1,35 @@ +{ stdenv, lib, rustPlatform, rustc, Security, patchelf }: +rustPlatform.buildRustPackage rec { + name = "clippy-${rustc.version}"; + inherit (rustc) version src; + + # the rust source tarball already has all the dependencies vendored, no need to fetch them again + cargoVendorDir = "vendor"; + preBuild = "pushd src/tools/clippy"; + postBuild = "popd"; + + # changes hash of vendor directory otherwise + dontUpdateAutotoolsGnuConfigScripts = true; + + buildInputs = [ rustc ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + # fixes: error: the option `Z` is only accepted on the nightly compiler + RUSTC_BOOTSTRAP = 1; + + # Without disabling the test the build fails with: + # error: failed to run custom build command for `rustc_llvm v0.0.0 + # (/private/tmp/nix-build-clippy-1.36.0.drv-0/rustc-1.36.0-src/src/librustc_llvm) + doCheck = false; + + preFixup = stdenv.lib.optionalString stdenv.isDarwin '' + install_name_tool -add_rpath "${rustc}/lib" $out/bin/clippy-driver + ''; + + meta = with stdenv.lib; { + homepage = https://rust-lang.github.io/rust-clippy/; + description = "A bunch of lints to catch common mistakes and improve your Rust code"; + maintainers = with maintainers; [ basvandijk ]; + license = with licenses; [ mit asl20 ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 0e3de0c4ab9..fb04239dbd4 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -64,6 +64,7 @@ rustPlatform = bootRustPlatform; inherit CoreFoundation Security; }; + clippy = self.callPackage ./clippy.nix { inherit Security; }; }); }; } diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 66da4d33251..d7776958390 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -45,12 +45,6 @@ in stdenv.mkDerivation rec { ++ optional (stdenv.isDarwin && !withBundledLLVM) "-lc++" ++ optional stdenv.isDarwin "-rpath ${llvmSharedForHost}/lib"; - # Enable nightly features in stable compiles (used for - # bootstrapping, see https://github.com/rust-lang/rust/pull/37265). - # This loosens the hard restrictions on bootstrapping-compiler - # versions. - RUSTC_BOOTSTRAP = "1"; - # Increase codegen units to introduce parallelism within the compiler. RUSTFLAGS = "-Ccodegen-units=10"; @@ -92,6 +86,8 @@ in stdenv.mkDerivation rec { "${setBuild}.llvm-config=${llvmSharedForBuild}/bin/llvm-config" "${setHost}.llvm-config=${llvmSharedForHost}/bin/llvm-config" "${setTarget}.llvm-config=${llvmSharedForTarget}/bin/llvm-config" + ] ++ optional stdenv.isLinux [ + "--enable-profiler" # build libprofiler_builtins ]; # The bootstrap.py will generated a Makefile that then executes the build. diff --git a/pkgs/development/compilers/sagittarius-scheme/default.nix b/pkgs/development/compilers/sagittarius-scheme/default.nix new file mode 100644 index 00000000000..4b1358b7247 --- /dev/null +++ b/pkgs/development/compilers/sagittarius-scheme/default.nix @@ -0,0 +1,58 @@ +{ stdenv +, fetchurl +, cmake +, pkgconfig +, libffi +, boehmgc +, openssl +, zlib +, odbcSupport ? true +, libiodbc +}: + +let platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH" + else if (stdenv.isLinux or stdenv.isBSD) then "LD_LIBRARY_PATH" + else throw "unsupported platform"; +in +stdenv.mkDerivation rec { + pname = "sagittarius-scheme"; + version = "0.9.6"; + src = fetchurl { + url = "https://bitbucket.org/ktakashi/${pname}/downloads/sagittarius-${version}.tar.gz"; + sha256 = "03nvvvfd4gdlvq244zpnikxxajp6w8jj3ymw4bcq83x7zilb2imr"; + }; + preBuild = '' + # since we lack rpath during build, need to explicitly add build path + # to LD_LIBRARY_PATH so we can load libsagittarius.so as required to + # build extensions + export ${platformLdLibraryPath}="$(pwd)/build" + ''; + nativeBuildInputs = [ pkgconfig cmake ]; + + buildInputs = [ libffi boehmgc openssl zlib ] ++ stdenv.lib.optional odbcSupport libiodbc; + + meta = with stdenv.lib; { + description = "An R6RS/R7RS Scheme system"; + longDescription = '' + Sagittarius Scheme is a free Scheme implementation supporting + R6RS/R7RS specification. + + Features: + + - Builtin CLOS. + - Common Lisp like reader macro. + - Cryptographic libraries. + - Customisable cipher and hash algorithm. + - Custom codec mechanism. + - CL like keyword lambda syntax (taken from Gauche). + - Constant definition form. (define-constant form). + - Builtin regular expression + - mostly works O(n) + - Replaceable reader + ''; + homepage = "https://bitbucket.org/ktakashi/sagittarius-scheme"; + license = licenses.bsd2; + platforms = platforms.all; + maintainers = with maintainers; [ abbe ]; + }; +} diff --git a/pkgs/development/compilers/scala/2.12.nix b/pkgs/development/compilers/scala/2.12.nix index ce863ef9c91..0e4207dccac 100644 --- a/pkgs/development/compilers/scala/2.12.nix +++ b/pkgs/development/compilers/scala/2.12.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }: stdenv.mkDerivation rec { - name = "scala-2.12.8"; + name = "scala-2.12.9"; src = fetchurl { url = "https://www.scala-lang.org/files/archive/${name}.tgz"; - sha256 = "18w0vdbsp0q5rxglgalwlgkggld926bqi1fxc598rn4gh46a03j4"; + sha256 = "0wpnxrhnhhscfk0k8yxk86akpvxbr5w1i8jb2igj2q4vax7h97sy"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/compilers/shaderc/default.nix b/pkgs/development/compilers/shaderc/default.nix index 7f4c895d85a..75717b5ba09 100644 --- a/pkgs/development/compilers/shaderc/default.nix +++ b/pkgs/development/compilers/shaderc/default.nix @@ -48,10 +48,6 @@ in stdenv.mkDerivation rec { moveToOutput "lib/*.a" $static ''; - preConfigure = ''cmakeFlags="$cmakeFlags -DCMAKE_INSTALL_BINDIR=$bin/bin"''; - - enableParallelBuilding = true; - cmakeFlags = [ "-DSHADERC_SKIP_TESTS=ON" ]; meta = with stdenv.lib; { diff --git a/pkgs/development/compilers/souffle/default.nix b/pkgs/development/compilers/souffle/default.nix index 87eac541862..219d5307790 100644 --- a/pkgs/development/compilers/souffle/default.nix +++ b/pkgs/development/compilers/souffle/default.nix @@ -10,13 +10,13 @@ let in stdenv.mkDerivation rec { name = "souffle-${version}"; - version = "1.5.1"; + version = "1.6.1"; src = fetchFromGitHub { owner = "souffle-lang"; repo = "souffle"; rev = version; - sha256 = "06sa250z3v8hs91p6cqdzlwwaq96j6zmfrrld1fzd1b620aa5iys"; + sha256 = "004c5iicjnlzn1yz1k7a28s4xdqx00016rr870drdq2z30mxfgz8"; }; nativeBuildInputs = [ autoreconfHook bison flex mcpp doxygen graphviz makeWrapper perl ]; diff --git a/pkgs/development/compilers/unison/default.nix b/pkgs/development/compilers/unison/default.nix new file mode 100644 index 00000000000..3bdf234f915 --- /dev/null +++ b/pkgs/development/compilers/unison/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, autoPatchelfHook +, ncurses5, zlib, gmp +}: + +stdenv.mkDerivation rec { + pname = "unison-code-manager"; + milestone_id = "M1c"; + version = "1.0.${milestone_id}-alpha"; + + src = if (stdenv.isDarwin) then + fetchurl { + url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/unison-osx.tar.gz"; + sha256 = "03q02r7qc7ybqz16kmpk2d8l9vx28kaj9x59mlxzi8a4mr0j3vzb"; + } + else + fetchurl { + url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/unison-linux64.tar.gz"; + sha256 = "1iwynqnp1i39pyq9wc01x7y22y1qa0rrjlx40jjdgnj23y1r6jk4"; + }; + + # The tarball is just the prebuilt binary, in the archive root. + sourceRoot = "."; + dontBuild = true; + dontConfigure = true; + + nativeBuildInputs = stdenv.lib.optional (!stdenv.isDarwin) autoPatchelfHook; + buildInputs = stdenv.lib.optionals (!stdenv.isDarwin) [ ncurses5 zlib gmp ]; + + installPhase = '' + mkdir -p $out/bin + mv ucm $out/bin + ''; + + meta = with stdenv.lib; { + description = "Modern, statically-typed purely functional language"; + homepage = http://unisonweb.org/posts/; + license = licenses.free; + maintainers = [ maintainers.virusdave ]; + platforms = [ "x86_64-darwin" "x86_64-linux" ]; + }; +} diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index afb1bcd5a0b..aaa8628efbe 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -1,21 +1,21 @@ { stdenv, fetchFromGitHub , pkgconfig, bison, flex , tcl, readline, libffi, python3 -, protobuf +, protobuf, zlib }: with builtins; stdenv.mkDerivation rec { - name = "yosys-${version}"; - version = "2019.04.23"; + pname = "yosys"; + version = "2019.08.13"; srcs = [ (fetchFromGitHub { owner = "yosyshq"; repo = "yosys"; - rev = "d9daf09cf3aab202b6da058c5e959f6375a4541e"; - sha256 = "0l27r9l3fvkqhmbqqpjz1f3ny4wdh5mdc7jlnbgy6nxx6vqcmkh0"; + rev = "19d6b8846f55b4c7be705619f753bec86deadac8"; + sha256 = "185sbkxajx3k9j03n0cxq2qvzwfwdbcxp19h8vnk7ghd5y9gp602"; name = "yosys"; }) @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { (fetchFromGitHub { owner = "berkeley-abc"; repo = "abc"; - rev = "3709744c60696c5e3f4cc123939921ce8107fe04"; - sha256 = "18a9cjng3qfalq8m9az5ck1y5h4l2pf9ycrvkzs9hn82b1j7vrax"; + rev = "5776ad07e7247993976bffed4802a5737c456782"; + sha256 = "1la4idmssg44rp6hd63sd5vybvs3vr14yzvwcg03ls37p39cslnl"; name = "yosys-abc"; }) ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ tcl readline libffi python3 bison flex protobuf ]; + buildInputs = [ tcl readline libffi python3 bison flex protobuf zlib ]; makeFlags = [ "ENABLE_PROTOBUF=1" ]; diff --git a/pkgs/development/coq-modules/coq-elpi/default.nix b/pkgs/development/coq-modules/coq-elpi/default.nix new file mode 100644 index 00000000000..04fc428b409 --- /dev/null +++ b/pkgs/development/coq-modules/coq-elpi/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, which, coq }: + +let params = { + "8.10" = { + version = "master"; + rev = "bc7134deba1aacc7ecd2f5d1032bdf05b125c568"; + sha256 = "188avk9irwjsbs5ya4ka01mpk3vw4397kv2rmsncqrrrsa1pdddk"; + }; +}; + param = params."${coq.coq-version}"; +in + +stdenv.mkDerivation rec { + name = "coq${coq.coq-version}-elpi-${param.version}"; + + src = fetchFromGitHub { + owner = "LPCIC"; + repo = "coq-elpi"; + inherit (param) rev sha256; + }; + + nativeBuildInputs = [ which ]; + buildInputs = [ coq coq.ocaml ] ++ (with coq.ocamlPackages; [ findlib elpi ]); + + installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + + meta = { + description = "Coq plugin embedding ELPI."; + maintainers = [ stdenv.lib.maintainers.cohencyril ]; + license = stdenv.lib.licenses.lgpl21; + inherit (coq.meta) platforms; + inherit (src.meta) homepage; + }; + + passthru = { + compatibleCoqVersions = stdenv.lib.flip builtins.hasAttr params; + }; +} diff --git a/pkgs/development/coq-modules/interval/default.nix b/pkgs/development/coq-modules/interval/default.nix index 0b97358d863..73a0a07f704 100644 --- a/pkgs/development/coq-modules/interval/default.nix +++ b/pkgs/development/coq-modules/interval/default.nix @@ -3,9 +3,9 @@ let params = if stdenv.lib.versionAtLeast coq.coq-version "8.7" then { - version = "3.4.0"; - uid = "37524"; - sha256 = "023j9sd64brqvjdidqkn5m8d7a93zd9r86ggh573z9nkjm2m7vvg"; + version = "3.4.1"; + uid = "38104"; + sha256 = "1zklv2w34k866fpwmw8q692mid5n6s75d2mmhhigrzpx5l3d4z6y"; } else { version = "3.3.0"; uid = "37077"; @@ -23,7 +23,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ which ]; buildInputs = [ coq ]; - propagatedBuildInputs = [ bignums coquelicot flocq mathcomp ]; + propagatedBuildInputs = [ bignums coquelicot flocq ]; configurePhase = "./configure --libdir=$out/lib/coq/${coq.coq-version}/user-contrib/Interval"; buildPhase = "./remake"; @@ -38,7 +38,7 @@ stdenv.mkDerivation { }; passthru = { - compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" ]; + compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" "8.9" "8.10" ]; }; diff --git a/pkgs/development/guile-modules/guile-sdl2/default.nix b/pkgs/development/guile-modules/guile-sdl2/default.nix index e4a548ae376..be885d990ec 100644 --- a/pkgs/development/guile-modules/guile-sdl2/default.nix +++ b/pkgs/development/guile-modules/guile-sdl2/default.nix @@ -5,13 +5,13 @@ let name = "${pname}-${version}"; pname = "guile-sdl2"; - version = "0.3.1"; + version = "0.4.0"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "https://files.dthompson.us/${pname}/${name}.tar.gz"; - sha256 = "0bw7x2lx90k4banc5k7yfkn3as93y25gr1xdr225ll7lmij21k64"; + sha256 = "0zcxwgyadwpbhq6h5mv2569c3kalgra26zc186y9fqiyyzmh1v9s"; }; nativeBuildInputs = [ libtool pkgconfig ]; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 524dba0e4c4..c9c81824620 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -159,22 +159,14 @@ self: super: { then super.double-conversion else addExtraLibrary super.double-conversion pkgs.libcxx; - inline-c-cpp = if !pkgs.stdenv.isDarwin - then super.inline-c-cpp - else - let drv = addExtraLibrary (overrideCabal super.inline-c-cpp (drv: { - postPatch = '' - substituteInPlace inline-c-cpp.cabal --replace stdc++ c++ - ''; - })) pkgs.libcxx; - in # https://github.com/fpco/inline-c/issues/75 - dontCheck drv; + inline-c-cpp = overrideCabal super.inline-c-cpp (drv: { + postPatch = (drv.postPatch or "") + '' + substituteInPlace inline-c-cpp.cabal --replace "-optc-std=c++11" "" + ''; + }); inline-java = addBuildDepend super.inline-java pkgs.jdk; - # https://github.com/mvoidex/hsdev/issues/11 - hsdev = dontHaddock super.hsdev; - # Upstream notified by e-mail. permutation = dontCheck super.permutation; @@ -222,15 +214,19 @@ self: super: { # base bound digit = doJailbreak super.digit; + # Needs older version of QuickCheck. + these_0_7_6 = doJailbreak super.these_0_7_6; + # dontCheck: Can be removed once https://github.com/haskell-nix/hnix/commit/471712f is in (5.2 probably) # This is due to GenList having been removed from generic-random in 1.2.0.0 # doJailbreak: Can be removed once https://github.com/haskell-nix/hnix/pull/329 is in (5.2 probably) # This is due to hnix currently having an upper bound of <0.5 on deriving-compat, works just fine with our current version 0.5.1 though + # Does not support recent versions of "these". + # https://github.com/haskell-nix/hnix/issues/514 hnix = generateOptparseApplicativeCompletion "hnix" ( - dontCheck (doJailbreak (overrideCabal super.hnix (old: { - testHaskellDepends = old.testHaskellDepends or [] ++ [ pkgs.nix ]; - })))); + dontCheck (doJailbreak (super.hnix.override { these = self.these_0_7_6; })) + ); # Fails for non-obvious reasons while attempting to use doctest. search = dontCheck super.search; @@ -862,7 +858,7 @@ self: super: { # Wrap the generated binaries to include their run-time dependencies in # $PATH. Also, cryptol needs a version of sbl that's newer than what we have # in LTS-13.x. - cryptol = overrideCabal (super.cryptol.override { sbv = self.sbv_8_3; }) (drv: { + cryptol = overrideCabal super.cryptol (drv: { buildTools = drv.buildTools or [] ++ [ pkgs.makeWrapper ]; postInstall = drv.postInstall or "" + '' for b in $out/bin/cryptol $out/bin/cryptol-html; do @@ -1040,8 +1036,6 @@ self: super: { # https://github.com/dmwit/encoding/pull/3 encoding = appendPatch super.encoding ./patches/encoding-Cabal-2.0.patch; - clock = dontCheck (appendPatch super.clock ./patches/clock-0.7.2.patch); - # Work around overspecified constraint on github ==0.18. github-backup = doJailbreak super.github-backup; @@ -1099,10 +1093,6 @@ self: super: { # haskell-names-0.9.4: Break out of “tasty >=0.12 && <1.2” haskell-names = doJailbreak super.haskell-names; - haskell-names_0_9_6 = super.haskell-names_0_9_6.overrideScope (self: super: { - haskell-src-exts = self.haskell-src-exts_1_21_0; - }); - # hdocs-0.5.3.1: Break out of “haddock-api ==2.21.*” # cannot use doJailbreak due to https://github.com/peti/jailbreak-cabal/issues/7 hdocs = overrideCabal super.hdocs (drv: { @@ -1111,11 +1101,6 @@ self: super: { ''; }); - hsdev_0_3_3_2 = super.hsdev_0_3_3_2.overrideScope (self: super: { - haskell-names = self.haskell-names_0_9_6; - network = self.network_3_0_1_1; - }); - # Break out of tasty >=0.10 && <1.2. aeson-compat = doJailbreak super.aeson-compat; @@ -1125,14 +1110,6 @@ self: super: { # Generate shell completion. cabal2nix = generateOptparseApplicativeCompletion "cabal2nix" super.cabal2nix; stack = generateOptparseApplicativeCompletion "stack" (super.stack.overrideScope (self: super: { - ansi-terminal = self.ansi-terminal_0_9_1; - concurrent-output = self.concurrent-output_1_10_10; # needed for new ansi-terminal version - hi-file-parser = dontCheck (unmarkBroken super.hi-file-parser); # Avoid depending on newer hspec versions. - http-download = dontCheck (unmarkBroken super.http-download); - pantry = dontCheck (unmarkBroken super.pantry); - rio = self.rio_0_1_11_0; - rio-prettyprint = unmarkBroken super.rio-prettyprint; - unliftio = self.unliftio_0_2_12; })); # musl fixes @@ -1208,10 +1185,6 @@ self: super: { # https://github.com/mgajda/json-autotype/issues/25 json-autotype = dontCheck super.json-autotype; - # The LTS-13.x versions doesn't suffice to build these packages. - hlint = super.hlint.overrideScope (self: super: { haskell-src-exts = self.haskell-src-exts_1_21_0; }); - hoogle = super.hoogle.overrideScope (self: super: { haskell-src-exts = self.haskell-src-exts_1_21_0; }); - # Jailbreak tasty < 1.2: https://github.com/phadej/tdigest/issues/30 tdigest = doJailbreak super.tdigest; # until tdigest > 0.2.1 these = doJailbreak super.these; # until these >= 0.7.6 @@ -1249,29 +1222,20 @@ self: super: { ''; }); - # Use latest pandoc despite what LTS says. - # Test suite fails in both 2.5 and 2.6: https://github.com/jgm/pandoc/issues/5309. - cmark-gfm = self.cmark-gfm_0_2_0; - pandoc = dontCheck (doDistribute super.pandoc_2_7_3); # test suite failure: https://github.com/jgm/pandoc/issues/5582 - pandoc-citeproc = doDistribute super.pandoc-citeproc_0_16_2; - skylighting = self.skylighting_0_8_2; - skylighting-core = self.skylighting-core_0_8_2; - - # Current versions of tasty-hedgehog need hedgehog 1.x, which - # we don't have in LTS-13.x. - tasty-hedgehog = super.tasty-hedgehog.override { hedgehog = self.hedgehog_1_0; }; + # test suite failure: https://github.com/jgm/pandoc/issues/5582 + pandoc = dontCheck super.pandoc; # The latest release version is ancient. You really need this tool from git. haskell-ci = generateOptparseApplicativeCompletion "haskell-ci" (addBuildDepend (overrideSrc (dontCheck super.haskell-ci) { - version = "20190625-git"; + version = "20190814-git"; src = pkgs.fetchFromGitHub { owner = "haskell-CI"; repo = "haskell-ci"; - rev = "260f967c6973dfb22ecc8061a1811a2ea4b79e01"; - sha256 = "1mvn6pqa6wfcm4jxhlhm4l54pwrlgnz7vdrmkwabliwz4q0bzgqk"; + rev = "70918d80b6fd43aca7e4d00ba0d2ea116b666556"; + sha256 = "0bzp959qy74zmqq75f60rcixpjbvvyrb5a8zp2nyql3nm9vxzy5k"; }; - }) (with self; [base-compat generic-lens microlens optparse-applicative ShellCheck exceptions temporary])); + }) (with self; [temporary lattices Cabal_3_0_0_0])); # Fix build with attr-2.4.48 (see #53716) xattr = appendPatch super.xattr ./patches/xattr-fix-build.patch; @@ -1280,10 +1244,10 @@ self: super: { yesod-markdown = doJailbreak super.yesod-markdown; # These packages needs network 3.x, which is not in LTS-13.x. - network-bsd = super.network-bsd.override { network = self.network_3_0_1_1; }; + network-bsd_2_8_1_0 = super.network-bsd_2_8_1_0.override { network = self.network_3_0_1_1; }; lambdabot-core = super.lambdabot-core.overrideScope (self: super: { network = self.network_3_0_1_1; hslogger = self.hslogger_1_3_0_0; }); lambdabot-reference-plugins = super.lambdabot-reference-plugins.overrideScope (self: super: { network = self.network_3_0_1_1; hslogger = self.hslogger_1_3_0_0; }); - lambdabot-haskell-plugins = super.lambdabot-haskell-plugins.overrideScope (self: super: { network = self.network_3_0_1_1; socks = self.socks_0_6_0; connection = self.connection_0_3_0; haskell-src-exts = self.haskell-src-exts_1_21_0; }); + lambdabot-haskell-plugins = super.lambdabot-haskell-plugins.overrideScope (self: super: { network = self.network_3_0_1_1; }); # Some tests depend on a postgresql instance # Haddock failure: https://github.com/haskell/haddock/issues/979 @@ -1313,10 +1277,13 @@ self: super: { # Test suite won't link for no apparent reason. constraints-deriving = dontCheck super.constraints-deriving; - # The old LTS-13.x version does not compile. - ip = self.ip_1_5_1; + # need newer version of ghc-libparser + hlint = super.hlint.override { ghc-lib-parser = self.ghc-lib-parser_8_8_0_20190723; }; + + # https://github.com/sol/hpack/issues/366 + hpack = dontCheck super.hpack; - # Needs deque >= 0.3, but latest version on stackage is 2.7 - butcher = super.butcher.override { deque = self.deque_0_4_2_3; }; + # QuickCheck >=2.3 && <2.13, hspec >=2.1 && <2.7 + graphviz = dontCheck super.graphviz; } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix index de01fe4cd12..76aabb91561 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix @@ -39,9 +39,9 @@ self: super: { # These are now core libraries in GHC 8.4.x. mtl = self.mtl_2_2_2; - parsec = self.parsec_3_1_13_0; + parsec = self.parsec_3_1_14_0; stm = self.stm_2_5_0_0; - text = self.text_1_2_3_1; + text = self.text_1_2_4_0; # Build with the latest Cabal version, which works best albeit not perfectly. jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_2_2_0_1; }; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 6eeade90a07..b317e313c20 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -43,7 +43,7 @@ core-packages: - ghcjs-base-0 default-package-overrides: - # LTS Haskell 13.30 + # LTS Haskell 14.1 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -55,29 +55,27 @@ default-package-overrides: - adjunctions ==4.4 - adler32 ==0.1.2.0 - advent-of-code-api ==0.1.2.3 - - aern2-mp ==0.1.3.1 - - aeson ==1.4.2.0 + - aeson ==1.4.4.0 - aeson-attoparsec ==0.0.0 - aeson-better-errors ==0.9.1.0 - - aeson-casing ==0.1.1.0 + - aeson-casing ==0.2.0.0 - aeson-compat ==0.3.9 - aeson-diff ==1.1.0.7 - - aeson-extra ==0.4.1.1 + - aeson-extra ==0.4.1.2 - aeson-generic-compat ==0.0.1.3 - aeson-iproute ==0.2 - aeson-picker ==0.1.0.4 - aeson-pretty ==0.8.7 - aeson-qq ==0.8.2 - - aeson-typescript ==0.1.3.0 - aeson-utils ==0.3.0.2 - aeson-yak ==0.1.1.3 - al ==0.1.4.2 - - alarmclock ==0.6.0.2 + - alarmclock ==0.7.0.1 - alerts ==0.1.2.0 - alex ==3.2.4 - alg ==0.2.10.0 - - algebraic-graphs ==0.3 - - Allure ==0.8.3.0 + - algebraic-graphs ==0.4 + - Allure ==0.9.5.0 - almost-fix ==0.0.2 - alsa-core ==0.5.0.1 - alsa-mixer ==0.3.0 @@ -86,112 +84,15 @@ default-package-overrides: - alternative-vector ==0.0.0 - alternators ==1.0.0.0 - ALUT ==2.4.0.3 - - amazonka ==1.6.1 - - amazonka-apigateway ==1.6.1 - - amazonka-application-autoscaling ==1.6.1 - - amazonka-appstream ==1.6.1 - - amazonka-athena ==1.6.1 - - amazonka-autoscaling ==1.6.1 - - amazonka-budgets ==1.6.1 - - amazonka-certificatemanager ==1.6.1 - - amazonka-cloudformation ==1.6.1 - - amazonka-cloudfront ==1.6.1 - - amazonka-cloudhsm ==1.6.1 - - amazonka-cloudsearch ==1.6.1 - - amazonka-cloudsearch-domains ==1.6.1 - - amazonka-cloudtrail ==1.6.1 - - amazonka-cloudwatch ==1.6.1 - - amazonka-cloudwatch-events ==1.6.1 - - amazonka-cloudwatch-logs ==1.6.1 - - amazonka-codebuild ==1.6.1 - - amazonka-codecommit ==1.6.1 - - amazonka-codedeploy ==1.6.1 - - amazonka-codepipeline ==1.6.1 - - amazonka-cognito-identity ==1.6.1 - - amazonka-cognito-idp ==1.6.1 - - amazonka-cognito-sync ==1.6.1 - - amazonka-config ==1.6.1 - - amazonka-core ==1.6.1 - - amazonka-datapipeline ==1.6.1 - - amazonka-devicefarm ==1.6.1 - - amazonka-directconnect ==1.6.1 - - amazonka-discovery ==1.6.1 - - amazonka-dms ==1.6.1 - - amazonka-ds ==1.6.1 - - amazonka-dynamodb ==1.6.1 - - amazonka-dynamodb-streams ==1.6.1 - - amazonka-ec2 ==1.6.1 - - amazonka-ecr ==1.6.1 - - amazonka-ecs ==1.6.1 - - amazonka-efs ==1.6.1 - - amazonka-elasticache ==1.6.1 - - amazonka-elasticbeanstalk ==1.6.1 - - amazonka-elasticsearch ==1.6.1 - - amazonka-elastictranscoder ==1.6.1 - - amazonka-elb ==1.6.1 - - amazonka-elbv2 ==1.6.1 - - amazonka-emr ==1.6.1 - - amazonka-gamelift ==1.6.1 - - amazonka-glacier ==1.6.1 - - amazonka-health ==1.6.1 - - amazonka-iam ==1.6.1 - - amazonka-importexport ==1.6.1 - - amazonka-inspector ==1.6.1 - - amazonka-iot ==1.6.1 - - amazonka-iot-dataplane ==1.6.1 - - amazonka-kinesis ==1.6.1 - - amazonka-kinesis-analytics ==1.6.1 - - amazonka-kinesis-firehose ==1.6.1 - - amazonka-kms ==1.6.1 - - amazonka-lambda ==1.6.1 - - amazonka-lightsail ==1.6.1 - - amazonka-marketplace-analytics ==1.6.1 - - amazonka-marketplace-metering ==1.6.1 - - amazonka-ml ==1.6.1 - - amazonka-opsworks ==1.6.1 - - amazonka-opsworks-cm ==1.6.1 - - amazonka-pinpoint ==1.6.1 - - amazonka-polly ==1.6.1 - - amazonka-rds ==1.6.1 - - amazonka-redshift ==1.6.1 - - amazonka-rekognition ==1.6.1 - - amazonka-route53 ==1.6.1 - - amazonka-route53-domains ==1.6.1 - - amazonka-s3 ==1.6.1 - - amazonka-sdb ==1.6.1 - - amazonka-servicecatalog ==1.6.1 - - amazonka-ses ==1.6.1 - - amazonka-shield ==1.6.1 - - amazonka-sms ==1.6.1 - - amazonka-snowball ==1.6.1 - - amazonka-sns ==1.6.1 - - amazonka-sqs ==1.6.1 - - amazonka-ssm ==1.6.1 - - amazonka-stepfunctions ==1.6.1 - - amazonka-storagegateway ==1.6.1 - - amazonka-sts ==1.6.1 - - amazonka-support ==1.6.1 - - amazonka-swf ==1.6.1 - - amazonka-test ==1.6.1 - - amazonka-waf ==1.6.1 - - amazonka-workspaces ==1.6.1 - - amazonka-xray ==1.6.1 - - amqp ==0.18.2 + - amqp ==0.18.3 - annotated-wl-pprint ==0.7.0 - - ansi-terminal ==0.8.2 - - ansi-wl-pprint ==0.6.8.2 - - antiope-athena ==6.2.0 - - antiope-core ==6.2.0 - - antiope-dynamodb ==6.2.0 - - antiope-messages ==6.2.0 - - antiope-s3 ==6.2.0 - - antiope-sns ==6.2.0 - - antiope-sqs ==6.2.0 + - ansi-terminal ==0.9.1 + - ansi-wl-pprint ==0.6.9 - ANum ==0.2.0.2 - aos-signature ==0.1.1 - - apecs ==0.7.3 - - apecs-gloss ==0.2.0 - - apecs-physics ==0.3.2 + - apecs ==0.8.1 + - apecs-gloss ==0.2.2 + - apecs-physics ==0.4.2 - api-field-json-th ==0.1.0.2 - appar ==0.1.8 - appendmap ==0.1.5 @@ -200,16 +101,17 @@ default-package-overrides: - approximate ==0.3.1 - app-settings ==0.2.0.12 - arbor-lru-cache ==0.1.1.0 - - arithmoi ==0.8.0.0 + - arithmoi ==0.9.0.0 - array-memoize ==0.6.0 - arrow-extras ==0.1.0.1 - asciidiagram ==1.3.3.3 - ascii-progress ==0.3.3.0 - - asif ==3.2.0 + - asif ==6.0.1 - asn1-encoding ==0.9.5 - asn1-parse ==0.9.4 - asn1-types ==0.3.3 - assert-failure ==0.1.2.2 + - assoc ==1 - astro ==0.4.2.1 - async ==2.2.2 - async-extra ==0.2.0.0 @@ -228,21 +130,22 @@ default-package-overrides: - attoparsec-path ==0.0.0.1 - attoparsec-uri ==0.0.7 - audacity ==0.0.2 + - aur ==6.2.0.1 - authenticate ==1.3.4 - authenticate-oauth ==1.6 - auto ==0.4.3.1 - - autoexporter ==1.1.13 - - auto-update ==0.1.5 + - autoexporter ==1.1.14 + - auto-update ==0.1.6 - avers ==0.0.17.1 - avers-api ==0.1.0 - avers-server ==0.1.0.1 - - avro ==0.4.4.3 + - avro ==0.4.5.2 - avwx ==0.3.0.2 + - aws-cloudfront-signed-cookies ==0.2.0.1 - aws-lambda-haskell-runtime ==2.0.1 - - axel ==0.0.9 - backprop ==0.2.6.2 - - bank-holidays-england ==0.1.0.8 - - barbies ==1.1.2.1 + - bank-holidays-england ==0.2.0.1 + - barbies ==1.1.3.0 - barrier ==0.1.1 - base16-bytestring ==0.1.1.6 - base32string ==0.9.1 @@ -252,7 +155,7 @@ default-package-overrides: - base64-string ==0.2 - base-compat ==0.10.5 - base-compat-batteries ==0.10.5 - - basement ==0.0.10 + - basement ==0.0.11 - base-noprelude ==4.12.0.0 - base-orphans ==0.8.1 - base-prelude ==1.3 @@ -262,25 +165,31 @@ default-package-overrides: - bbdb ==0.8 - bcrypt ==0.0.11 - beam-core ==0.8.0.0 + - beam-migrate ==0.4.0.1 + - beam-mysql ==0.2.0.0 + - beam-postgres ==0.4.0.0 + - beam-sqlite ==0.4.0.0 - bench ==1.0.12 - benchpress ==0.2.2.12 + - bench-show ==0.3.0 - bencode ==0.6.0.0 + - bencoding ==0.4.5.1 - between ==0.11.0.0 - bibtex ==0.1.0.6 - bifunctors ==5.5.4 - - bimap ==0.3.3 + - bimap ==0.4.0 - bimap-server ==0.1.0.1 - binary-bits ==0.5 - binary-conduit ==1.3.1 - binary-ext ==2.0.4 - binary-ieee754 ==0.1.0.0 - binary-list ==1.1.1.2 - - binary-orphans ==0.1.8.0 + - binary-orphans ==1.0.1 - binary-parser ==0.5.5 - binary-parsers ==0.2.4.0 - binary-search ==1.0.0.3 - binary-shared ==0.8.3 - - binary-tagged ==0.1.5.2 + - binary-tagged ==0.2 - bindings-DSL ==1.0.25 - bindings-GLFW ==3.2.1.1 - bindings-libzip ==1.0.1 @@ -294,9 +203,11 @@ default-package-overrides: - bits ==0.5.2 - bitset-word8 ==0.1.1.1 - bits-extra ==0.0.1.3 - - bit-stream ==0.1.0.2 + - bitvec ==1.0.0.1 - bitx-bitcoin ==0.12.0.0 - - blake2 ==0.2.0 + - blake2 ==0.3.0 + - blas-carray ==0.1.0.1 + - blas-comfort-array ==0.0.0.2 - blas-ffi ==0.1 - blas-hs ==0.1.1.0 - blaze-bootstrap ==0.1.0.1 @@ -307,20 +218,24 @@ default-package-overrides: - blaze-svg ==0.3.6.1 - blaze-textual ==0.2.1.0 - bmp ==1.2.6.3 - - bno055-haskell ==0.1.0 + - board-games ==0.3 - boltzmann-samplers ==0.1.1.0 - Boolean ==0.2.4 - boolean-like ==0.1.1.0 - boolean-normal-forms ==0.0.1 - boolsimplifier ==0.1.8 + - boots ==0.0.3 - bordacount ==0.1.0.0 - boring ==0.1.2 - both ==0.1.1.0 - bound ==2.0.1 - BoundedChan ==1.0.3.0 + - bounded-queue ==1.0.0 - boundingboxes ==0.2.3 - bower-json ==1.0.0.1 - boxes ==0.1.5 + - brick ==0.47.1 + - brittany ==0.12.0.0 - bsb-http-chunked ==0.0.0.4 - bson ==0.3.2.8 - bson-lens ==0.1.1 @@ -329,9 +244,10 @@ default-package-overrides: - buffer-pipe ==0.0 - bugsnag-haskell ==0.0.3.0 - bulletproofs ==0.4.0 + - butcher ==1.3.2.3 - butter ==0.1.0.6 - bv ==0.5 - - bv-little ==0.1.2 + - bv-little ==1.1.0 - byteable ==0.1.1 - bytedump ==1.0 - byteorder ==1.0.4 @@ -341,20 +257,20 @@ default-package-overrides: - bytestring-conversion ==0.3.1 - bytestring-lexing ==0.5.0.2 - bytestring-strict-builder ==0.4.5.3 + - bytestring-to-vector ==0.3.0.1 - bytestring-tree-builder ==0.2.7.3 - bzlib ==0.5.0.5 - - bzlib-conduit ==0.3.0.1 + - bzlib-conduit ==0.3.0.2 - c2hs ==0.28.6 - Cabal ==2.4.1.0 - cabal2spec ==2.2.2.1 - cabal-doctest ==1.0.6 - - cabal-rpm ==0.12.6 + - cabal-file-th ==0.2.6 - cache ==0.1.1.2 - - cachix ==0.2.0 - - cachix-api ==0.2.0 - cacophony ==0.10.1 - calendar-recycling ==0.0.0.1 - call-stack ==0.1.0 + - ca-province-codes ==1.0.0.0 - carray ==0.1.6.8 - cased ==0.1.0.0 - case-insensitive ==1.2.0.11 @@ -365,9 +281,10 @@ default-package-overrides: - cassava-megaparsec ==2.0.0 - cassava-records ==0.1.0.4 - cast ==0.1.0.2 - - category ==0.2.4.0 + - caster ==0.0.3.0 + - category ==0.2.4.1 - cayley-client ==0.4.9 - - cborg ==0.2.1.0 + - cborg ==0.2.2.0 - cborg-json ==0.2.1.0 - cereal ==0.5.8.1 - cereal-conduit ==0.8.0 @@ -375,7 +292,7 @@ default-package-overrides: - cereal-time ==0.1.0.0 - cereal-vector ==0.2.0.1 - cfenv ==0.1.0.0 - - cgi ==3001.3.0.3 + - cgi ==3001.4.0.0 - chan ==0.0.4.1 - ChannelT ==0.0.0.7 - charset ==0.3.7.1 @@ -387,10 +304,13 @@ default-package-overrides: - cheapskate-highlight ==0.1.0.0 - cheapskate-lucid ==0.1.0.0 - check-email ==1.0.2 - - checkers ==0.4.14 + - checkers ==0.5.0 - checksum ==0.0 + - chimera ==0.2.0.0 - choice ==0.2.2 - chronologique ==0.3.1.1 + - chronos ==1.0.6 + - chronos-bench ==0.2.0.2 - chunked-data ==0.3.1 - cipher-aes ==0.2.11 - cipher-aes128 ==0.7.0.4 @@ -407,13 +327,14 @@ default-package-overrides: - clay ==0.13.1 - clientsession ==0.9.1.2 - Clipboard ==2.3.2.0 - - clock ==0.7.2 + - clock ==0.8 - clock-extras ==0.1.0.2 + - closed ==0.2.0.1 - clr-host ==0.2.1.0 - clr-marshal ==0.2.0.0 - clumpiness ==0.17.0.2 - - cmark ==0.5.6.3 - - cmark-gfm ==0.1.8 + - cmark ==0.6 + - cmark-gfm ==0.2.0 - cmdargs ==0.10.20 - codec ==0.2.1 - codec-beam ==0.2.0 @@ -421,16 +342,19 @@ default-package-overrides: - code-page ==0.2 - codo-notation ==0.5.2 - coercible-utils ==0.0.0 - - co-log ==0.2.0 - - co-log-core ==0.1.1 + - co-log ==0.3.0.0 + - co-log-core ==0.2.0.0 - colonnade ==1.2.0.2 - colorful-monoids ==0.2.1.2 - colorize-haskell ==1.0.1 - colour ==2.3.5 + - columnar ==1.0.0.0 - combinatorial ==0.1.0.1 + - comfort-array ==0.4 - comfort-graph ==0.0.3.1 - commutative ==0.0.2 - comonad ==5.0.5 + - compact ==0.1.0.1 - compactmap ==0.1.4.2.1 - compensated ==0.7.2 - compiler-warnings ==0.1.0 @@ -439,9 +363,9 @@ default-package-overrides: - composition ==1.0.2.1 - composition-extra ==2.0.0 - concise ==0.1.0.1 - - concurrency ==1.6.2.0 + - concurrency ==1.7.0.0 - concurrent-extra ==0.7.0.12 - - concurrent-output ==1.10.9 + - concurrent-output ==1.10.10 - concurrent-split ==0.0.1.1 - concurrent-supply ==0.1.8 - cond ==0.4.1.1 @@ -449,17 +373,17 @@ default-package-overrides: - conduit-algorithms ==0.0.10.1 - conduit-combinators ==1.3.0 - conduit-concurrent-map ==0.1.1 - - conduit-connection ==0.1.0.5 - - conduit-extra ==1.3.3 + - conduit-extra ==1.3.4 - conduit-iconv ==0.1.1.3 - conduit-parse ==0.2.1.0 - conduit-throttle ==0.3.1.0 - conduit-zstd ==0.0.1.1 - - confcrypt ==0.1.0.4 + - config-ini ==0.2.4.0 - configuration-tools ==0.4.1 - configurator ==0.3.0.0 - configurator-export ==0.1.0.1 - - connection ==0.2.8 + - configurator-pg ==0.1.0.3 + - connection ==0.3.0 - connection-pool ==0.2.2 - console-style ==0.0.2.1 - constraint ==0.1.3.0 @@ -472,6 +396,9 @@ default-package-overrides: - control-monad-omega ==0.3.1 - convertible ==1.1.1.0 - cookie ==0.4.4 + - core-data ==0.2.0.0 + - core-program ==0.2.0.0 + - core-text ==0.2.0.0 - countable ==1.0 - country ==0.1.6 - courier ==0.1.1.5 @@ -481,11 +408,12 @@ default-package-overrides: - cpu ==0.1.2 - cpuinfo ==0.1.0.1 - cql ==4.0.1 - - cql-io ==1.0.1.1 + - cql-io ==1.1.1 - crackNum ==2.3 + - crc32c ==0.0.0 - credential-store ==0.1.2 - criterion ==1.5.5.0 - - criterion-measurement ==0.1.1.0 + - criterion-measurement ==0.1.2.0 - cron ==0.6.1 - crypto-api ==0.13.3 - crypto-api-tests ==0.3 @@ -503,6 +431,8 @@ default-package-overrides: - cryptonite ==0.25 - cryptonite-conduit ==0.2.2 - cryptonite-openssl ==0.7 + - crypto-numbers ==0.2.7 + - crypto-pubkey ==0.2.8 - crypto-pubkey-openssh ==0.2.7 - crypto-pubkey-types ==0.4.3 - crypto-random ==0.0.9 @@ -513,7 +443,7 @@ default-package-overrides: - css-text ==0.1.3.0 - csv ==0.1.2 - ctrie ==0.2 - - cubicbezier ==0.6.0.5 + - cubicbezier ==0.6.0.6 - cubicspline ==0.1.2 - cublas ==0.5.0.0 - cuckoo-filter ==0.2.0.2 @@ -534,6 +464,7 @@ default-package-overrides: - data-binary-ieee754 ==0.4.4 - data-bword ==0.1.0.1 - data-checked ==0.3 + - data-clist ==0.1.2.3 - data-default ==0.7.1.1 - data-default-class ==0.1.2.0 - data-default-instances-containers ==0.0.1 @@ -556,6 +487,7 @@ default-package-overrides: - data-ref ==0.0.2 - data-reify ==0.6.1 - data-serializer ==0.3.4 + - datasets ==0.4.0 - data-textual ==0.3.0.2 - data-tree-print ==0.1.0.2 - dataurl ==0.1.0.0 @@ -572,20 +504,19 @@ default-package-overrides: - declarative ==0.5.2 - deepseq-generics ==0.2.0.0 - deferred-folds ==0.9.10.1 - - dejafu ==1.11.0.5 + - dejafu ==2.1.0.0 - dense-linear-algebra ==0.1.0.0 - dependent-map ==0.2.4.0 - dependent-sum ==0.4 - dependent-sum-template ==0.0.0.6 - - deque ==0.2.7 + - deque ==0.4.2.3 - deriveJsonNoPrefix ==0.1.0.1 - deriving-compat ==0.5.6 - derulo ==1.0.5 - detour-via-sci ==1.0.0 - - dhall ==1.19.1 - - dhall-bash ==1.0.18 - - dhall-json ==1.2.6 - - dhall-text ==1.0.18 + - dhall ==1.24.0 + - dhall-bash ==1.0.21 + - dhall-json ==1.3.0 - diagrams ==1.4 - diagrams-contrib ==1.4.3 - diagrams-core ==1.4.1.1 @@ -599,6 +530,7 @@ default-package-overrides: - Diff ==0.3.4 - digest ==0.0.1.2 - digits ==0.3.1 + - dimensional ==1.3 - di-monad ==1.3 - directory-tree ==0.12.1 - direct-sqlite ==2.3.24 @@ -607,19 +539,22 @@ default-package-overrides: - distributed-closure ==0.4.1.1 - distribution-opensuse ==1.1.1 - distributive ==0.6 - - dlist ==0.8.0.6 + - dl-fedora ==0.5 + - dlist ==0.8.0.7 - dlist-instances ==0.1.1.1 - dlist-nonempty ==0.1.1 - - dns ==3.0.4 + - dns ==4.0.0 - dockerfile ==0.2.0 - docopt ==0.7.0.5 - doctemplates ==0.2.2.1 - - doctest ==0.16.0.1 + - doctest ==0.16.1 - doctest-discover ==0.2.0.0 - doctest-driver-gen ==0.3.0.1 + - doldol ==0.4.1.2 - do-list ==1.0.1 - dom-parser ==3.1.0 - - dotenv ==0.8.0.0 + - do-notation ==0.1.0.2 + - dotenv ==0.8.0.2 - dotgen ==0.4.2 - dotnet-timespan ==0.0.1.0 - double-conversion ==2.0.2.0 @@ -634,38 +569,44 @@ default-package-overrides: - dvorak ==0.1.0.0 - dynamic-state ==0.3.1 - dyre ==0.8.12 + - eap ==0.9.0.2 - Earley ==0.13.0.1 - easy-file ==0.2.2 - easytest ==0.2.1 - Ebnf2ps ==1.0.15 - echo ==0.1.3 + - ecstasy ==0.2.1.0 - ed25519 ==0.0.5.0 - edit-distance ==0.2.2.1 - edit-distance-vector ==1.0.0.4 - editor-open ==0.6.0.0 - either ==5.0.1.1 - - either-both ==0.1.0.0 + - either-both ==0.1.1.1 - ekg ==0.4.0.15 - ekg-core ==0.1.1.6 - ekg-json ==0.1.0.6 - ekg-statsd ==0.2.4.0 - elerea ==2.9.0 - - elf ==0.29 + - elf ==0.30 - eliminators ==0.5.1 - elm2nix ==0.1.1 + - elm-bridge ==0.5.2 - elm-core-sources ==1.0.0 - elm-export ==0.6.0.1 + - elm-street ==0.0.1 - emacs-module ==0.1.1 - email-validate ==2.3.2.11 - emd ==0.1.4.0 - enclosed-exceptions ==1.0.3 + - ENIG ==0.0.1.0 - entropy ==0.4.1.4 - - enummapset ==0.6.0.1 + - enummapset ==0.6.0.2 - enumset ==0.0.4.1 - enum-subset-generate ==0.1.0.0 - - enum-text ==0.5.0.0 + - enum-text ==0.5.1.0 + - enum-text-rio ==1.2.0.0 - envelope ==0.2.2.0 - - envy ==1.5.1.0 + - envy ==2.0.0.0 - epub-metadata ==4.5 - eq ==4.2 - equal-files ==0.0.5.3 @@ -674,7 +615,7 @@ default-package-overrides: - errors-ext ==0.4.2 - error-util ==0.0.1.2 - ersatz ==0.4.7 - - esqueleto ==2.6.0 + - esqueleto ==3.0.0 - etc ==0.4.1.0 - eventful-core ==0.2.0 - eventful-memory ==0.2.0 @@ -682,7 +623,7 @@ default-package-overrides: - eventful-sqlite ==0.2.0 - eventful-test-helpers ==0.2.0 - event-list ==0.1.2 - - eventstore ==1.2.4 + - eventstore ==1.3.0 - every ==0.0.1 - exact-combinatorics ==0.2.0.9 - exact-pi ==0.5.0.1 @@ -702,19 +643,22 @@ default-package-overrides: - extractable-singleton ==0.0.1 - extrapolate ==0.3.3 - fail ==4.9.0.0 + - failable ==1.2.2.0 + - fakedata ==0.2.2 - farmhash ==0.1.0.5 + - fast-builder ==0.1.0.1 - fast-digits ==0.2.1.0 - fast-logger ==2.4.16 - fast-math ==1.0.2 - - fb ==1.2.1 + - fb ==2.0.0 - fclabels ==2.0.3.3 - feature-flags ==0.1.0.1 - fedora-dists ==1.0.1 - - fedora-haskell-tools ==0.6 - - feed ==1.0.1.0 + - feed ==1.2.0.0 - FenwickTree ==0.1.2.1 - fft ==0.1.8.6 - fgl ==5.7.0.1 + - fib ==0.1 - filecache ==0.4.1 - file-embed ==0.0.11 - file-embed-lzma ==0 @@ -724,28 +668,30 @@ default-package-overrides: - filepattern ==0.1.1 - fileplow ==0.1.0.0 - filter-logger ==0.6.0.0 - - filtrable ==0.1.1.0 - - fin ==0.0.3 + - filtrable ==0.1.2.0 + - fin ==0.1 - FindBin ==0.0.5 - fingertree ==0.1.4.2 - finite-typelits ==0.1.4.2 - - first-class-families ==0.3.0.1 + - first-class-families ==0.5.0.0 - first-class-patterns ==0.3.2.4 - fitspec ==0.4.7 - - fixed ==0.2.1.1 + - fixed ==0.3 - fixed-length ==0.2.1 - fixed-vector ==1.2.0.0 - fixed-vector-hetero ==0.5.0.0 - - flac ==0.1.2 + - flac ==0.2.0 - flac-picture ==0.1.2 + - flags-applicative ==0.1.0.1 - flat-mcmc ==1.5.0 - flay ==0.4 - flexible-defaults ==0.0.2 - FloatingHex ==0.4 - floatshow ==0.2.4 - flow ==1.0.18 - - fmlist ==0.9.2 + - fmlist ==0.9.3 - fmt ==0.6.1.2 + - fmt-for-rio ==1.0.0.0 - fn ==0.3.0.2 - focus ==1.0.1.3 - focuslist ==0.1.0.2 @@ -754,6 +700,7 @@ default-package-overrides: - fold-debounce-conduit ==0.2.0.3 - foldl ==1.4.5 - folds ==0.7.4 + - follow-file ==0.0.3 - FontyFruity ==0.5.3.4 - force-layout ==0.4.0.6 - foreign-store ==0.2 @@ -761,7 +708,7 @@ default-package-overrides: - forma ==1.1.2 - format-numbers ==0.1.0.0 - formatting ==6.3.7 - - foundation ==0.0.23 + - foundation ==0.0.24 - free ==5.1.1 - freenect ==1.2.1 - freer-simple ==1.2.1.0 @@ -773,54 +720,60 @@ default-package-overrides: - frontmatter ==0.1.0.2 - fsnotify ==0.3.0.1 - fsnotify-conduit ==0.1.1.1 - - ftp-client ==0.5.1.1 - - ftp-client-conduit ==0.5.0.4 - funcmp ==1.9 + - function-builder ==0.3.0.1 - functor-classes-compat ==1 - - fused-effects ==0.1.2.1 + - functor-combinators ==0.1.1.1 + - fused-effects ==0.5.0.0 - fuzzcheck ==0.1.1 - fuzzy-dates ==0.1.1.1 - - fuzzyset ==0.1.0.8 + - fuzzyset ==0.1.1 + - galois-field ==0.3.0 - gauge ==0.2.4 - gc ==0.0.3 - gd ==3000.7.3 - gdp ==0.0.0.2 - general-games ==1.1.1 - generic-arbitrary ==0.1.0 - - generic-data ==0.3.0.0 + - generic-data ==0.7.0.0 + - generic-data-surgery ==0.2.0.0 - generic-deriving ==1.12.4 - generic-lens ==1.1.0.0 - GenericPretty ==1.2.2 - generic-random ==1.2.0.0 - generics-eot ==0.4.0.1 - - generics-mrsop ==1.2.2 + - generics-mrsop ==2.1.0 - generics-sop ==0.4.0.1 - - generics-sop-lens ==0.1.3 - - genvalidity ==0.7.0.2 - - genvalidity-aeson ==0.2.0.2 - - genvalidity-bytestring ==0.3.0.1 - - genvalidity-containers ==0.5.1.1 - - genvalidity-hspec ==0.6.2.3 - - genvalidity-hspec-aeson ==0.3.0.1 + - generics-sop-lens ==0.2 + - genvalidity ==0.8.0.0 + - genvalidity-aeson ==0.3.0.0 + - genvalidity-bytestring ==0.5.0.0 + - genvalidity-containers ==0.6.0.0 + - genvalidity-hspec ==0.7.0.0 + - genvalidity-hspec-aeson ==0.3.1.0 - genvalidity-hspec-binary ==0.2.0.3 - genvalidity-hspec-cereal ==0.2.0.3 - genvalidity-hspec-hashable ==0.2.0.4 - genvalidity-hspec-optics ==0.1.1.1 - genvalidity-path ==0.3.0.2 - - genvalidity-property ==0.3.0.0 + - genvalidity-property ==0.4.0.0 - genvalidity-scientific ==0.2.1.0 - - genvalidity-text ==0.5.1.0 + - genvalidity-text ==0.6.0.0 - genvalidity-time ==0.2.1.1 - - genvalidity-unordered-containers ==0.2.0.4 + - genvalidity-unordered-containers ==0.3.0.0 - genvalidity-uuid ==0.1.0.2 - - genvalidity-vector ==0.2.0.3 - - geojson ==3.0.4 + - genvalidity-vector ==0.3.0.0 + - geojson ==4.0.1 - getopt-generics ==0.13.0.3 + - ghc-compact ==0.1.0.0 - ghc-core ==0.5.6 - - ghc-exactprint ==0.5.8.2 - - ghcid ==0.7.4 - - ghci-hexcalc ==0.1.0.2 + - ghc-exactprint ==0.6.1 + - ghcid ==0.7.5 + - ghci-hexcalc ==0.1.1.0 - ghcjs-codemirror ==0.0.0.2 + - ghc-lib ==8.8.0.20190424 + - ghc-lib-parser ==8.8.0.20190424 + - ghc-parser ==0.2.0.3 - ghc-paths ==0.1.0.9 - ghc-prof ==1.4.1.5 - ghc-syntax-highlighter ==0.0.4.0 @@ -829,32 +782,32 @@ default-package-overrides: - ghc-typelits-knownnat ==0.6 - ghc-typelits-natnormalise ==0.6.2 - ghost-buster ==0.1.1.0 - - gi-atk ==2.0.18 - - gi-cairo ==1.0.17 - - gi-gdk ==3.0.16 - - gi-gdkpixbuf ==2.0.20 - - gi-gio ==2.0.19 - - gi-glib ==2.0.17 - - gi-gobject ==2.0.19 - - gi-gtk ==3.0.27 - - gi-gtk-hs ==0.3.6.3 - - gi-gtksource ==3.0.16 - - gi-javascriptcore ==4.0.16 + - gi-atk ==2.0.21 + - gi-cairo ==1.0.23 + - gi-gdk ==3.0.22 + - gi-gdkpixbuf ==2.0.23 + - gi-gio ==2.0.25 + - gi-glib ==2.0.23 + - gi-gobject ==2.0.22 + - gi-gtk ==3.0.32 + - gi-gtk-hs ==0.3.8.0 + - gi-gtksource ==3.0.22 + - gi-javascriptcore ==4.0.21 + - ginger ==0.9.0.0 - gingersnap ==0.3.1.0 - - gi-pango ==1.0.19 - - giphy-api ==0.6.0.1 + - gi-pango ==1.0.22 - githash ==0.1.3.1 - github-release ==1.2.4 - github-types ==0.2.1 - github-webhooks ==0.10.1 - gitrev ==1.3.1 - - gi-vte ==2.91.19 - - gl ==0.8.0 - - glabrous ==1.0.1 + - gi-vte ==2.91.25 + - gl ==0.9 + - glabrous ==2.0.0 - glaze ==0.3.0.1 - glazier ==1.0.0.0 - GLFW-b ==3.2.1.0 - - Glob ==0.9.3 + - Glob ==0.10.0 - gloss ==1.13.0.1 - gloss-algorithms ==1.13.0.1 - gloss-examples ==1.13.0.2 @@ -863,12 +816,13 @@ default-package-overrides: - GLURaw ==2.0.0.4 - GLUT ==2.7.0.15 - gnuplot ==0.5.6 - - goggles ==0.3.2 - google-isbn ==1.0.3 - google-oauth2-jwt ==0.3.1 - gpolyline ==0.1.0.1 - graph-core ==0.3.0.0 + - graphite ==0.10.0.1 - graphs ==0.7.1 + - graphviz ==2999.20.0.3 - graph-wrapper ==0.2.6.0 - gravatar ==0.8.0 - graylog ==0.1.0.1 @@ -882,48 +836,51 @@ default-package-overrides: - groundhog-postgresql ==0.10 - groundhog-sqlite ==0.10.0 - groundhog-th ==0.10.2 + - group-by-date ==0.1.0.3 + - grouped-list ==0.2.2.1 - groups ==0.4.1.0 - guarded-allocation ==0.0.1 - gym-http-api ==0.1.0.1 - - h2c ==1.0.0 + - H ==0.9.0.1 - hackage-db ==2.0.1 - hackage-security ==0.5.3.0 - haddock-library ==1.7.0 - - hailgun ==0.4.2 + - hadolint ==1.17.1 - half ==0.3 - hamilton ==0.1.0.3 - hamtsolo ==1.0.3 - HandsomeSoup ==0.4.2 - - hapistrano ==0.3.9.2 + - hapistrano ==0.3.9.3 - happy ==1.19.11 - - hasbolt ==0.1.3.3 + - hasbolt ==0.1.3.4 - hashable ==1.2.7.0 - hashable-time ==0.2.0.2 - hashids ==1.0.2.4 - hashmap ==1.3.3 - - hashtables ==1.2.3.3 + - hashtables ==1.2.3.4 - haskeline ==0.7.5.0 - - haskell-gi ==0.21.5 - - haskell-gi-base ==0.21.5 + - haskell-gi ==0.23.0 + - haskell-gi-base ==0.23.0 - haskell-gi-overloading ==1.0 - haskell-lexer ==1.0.2 - - haskell-lsp ==0.8.2.0 - - haskell-lsp-types ==0.8.2.0 - - haskell-names ==0.9.4 - - HaskellNet ==0.5.1 + - haskell-lsp ==0.15.0.0 + - haskell-lsp-types ==0.15.0.0 + - haskell-names ==0.9.6 - haskell-spacegoo ==0.2.0.1 - haskell-src ==1.0.3.0 - - haskell-src-exts ==1.20.3 + - haskell-src-exts ==1.21.0 - haskell-src-exts-util ==0.2.5 - haskell-src-meta ==0.8.2 - haskey-btree ==0.3.0.1 - - haskoin-core ==0.8.4 - - hasql ==1.3.0.6 - - hasql-optparse-applicative ==0.3.0.4 + - haskintex ==0.8.0.0 + - haskoin-core ==0.9.0 + - hasql ==1.4 + - hasql-optparse-applicative ==0.3.0.5 - hasql-pool ==0.5.1 - - hasql-transaction ==0.7.1 + - hasql-transaction ==0.7.2 - hasty-hamiltonian ==1.3.2 - - haxl ==2.0.1.1 + - HaTeX ==3.21.0.0 + - haxl ==2.1.2.0 - hbeanstalk ==0.2.4 - HCodecs ==0.5.1 - hdaemonize ==0.5.5 @@ -933,9 +890,10 @@ default-package-overrides: - heap ==1.0.4 - heaps ==0.3.6.1 - hebrew-time ==0.1.2 - - hedgehog ==0.6.1 + - hedgehog ==1.0 - hedgehog-corpus ==0.1.0 - - hedis ==0.10.10 + - hedgehog-fn ==1.0 + - hedis ==0.12.7 - hedn ==0.2.0.1 - here ==1.2.13 - heredoc ==0.2.0.0 @@ -947,27 +905,30 @@ default-package-overrides: - hexstring ==0.11.1 - hformat ==0.3.3.1 - hfsevents ==0.1.6 - - hgmp ==0.1.1 - hidapi ==0.1.5 - hidden-char ==0.1.0.2 + - hi-file-parser ==0.1.0.0 - higher-leveldb ==0.5.0.2 - highlighting-kate ==0.6.4 - hinfo ==0.0.3.0 - hinotify ==0.4 - - hint ==0.9.0 + - hint ==0.9.0.1 - hjsmin ==0.2.0.2 + - hkgr ==0.2.2 - hlibgit2 ==0.18.0.16 - hlibsass ==0.1.8.0 - - hmatrix ==0.19.0.0 + - hmatrix ==0.20.0.0 - hmatrix-backprop ==0.1.2.5 - hmatrix-gsl ==0.19.0.1 - hmatrix-gsl-stats ==0.4.1.8 - hmatrix-morpheus ==0.1.1.2 - hmatrix-vector-sized ==0.1.1.3 + - hmm-lapack ==0.4 - hmpfr ==0.4.4 - - hoauth2 ==1.8.7 + - hoauth2 ==1.8.8 - Hoed ==0.5.1 - - hOpenPGP ==2.7.4.1 + - hOpenPGP ==2.8 + - hopenpgp-tools ==0.21.3 - hopfli ==0.2.2.1 - hosc ==0.17 - hostname ==1.0 @@ -977,20 +938,22 @@ default-package-overrides: - hp2pretty ==0.9 - hpack ==0.31.2 - hpack-dhall ==0.5.2 + - hquantlib-time ==0.0.4.1 - hreader ==1.1.0 - hreader-lens ==0.1.3.0 - hruby ==0.3.8 - hsass ==0.8.0 - hs-bibutils ==6.7.0.0 + - hsc2hs ==0.68.4 - hschema ==0.0.1.1 - hschema-aeson ==0.0.1.1 - hschema-prettyprinter ==0.0.1.1 - hschema-quickcheck ==0.0.1.1 - hscolour ==1.24.4 - hsdev ==0.3.2.3 - - hsdns ==1.7.1 + - hsdns ==1.8 - hsebaysdk ==0.4.0.0 - - hsemail ==2 + - hsemail ==2.2.0 - HSet ==0.0.1 - hset ==2.2.0 - hsexif ==0.6.1.6 @@ -1002,22 +965,23 @@ default-package-overrides: - hslogger ==1.2.12 - hslua ==1.0.3.1 - hslua-aeson ==1.0.0 + - hslua-module-system ==0.2.1 - hslua-module-text ==0.2.1 - HsOpenSSL ==0.11.4.16 - HsOpenSSL-x509-system ==0.1.0.3 - hsp ==0.10.0 - - hspec ==2.6.1 + - hspec ==2.7.1 - hspec-attoparsec ==0.1.0.2 - hspec-checkers ==0.1.0.2 - hspec-contrib ==0.5.1 - - hspec-core ==2.6.1 - - hspec-discover ==2.6.1 + - hspec-core ==2.7.1 + - hspec-discover ==2.7.1 - hspec-expectations ==0.8.2 - hspec-expectations-lifted ==0.10.0 - hspec-expectations-pretty-diff ==0.7.2.4 - hspec-golden-aeson ==0.7.0.0 - hspec-leancheck ==0.0.3 - - hspec-megaparsec ==2.0.0 + - hspec-megaparsec ==2.0.1 - hspec-meta ==2.6.0 - hspec-need-env ==0.1.0.3 - hspec-pg-transact ==0.1.0.2 @@ -1025,6 +989,7 @@ default-package-overrides: - hspec-wai ==0.9.2 - hspec-wai-json ==0.9.2 - hs-php-session ==0.0.9.3 + - hsshellscript ==3.4.5 - hstatsd ==0.1 - HStringTemplate ==0.8.7 - HSvm ==0.1.1.3.22 @@ -1040,49 +1005,55 @@ default-package-overrides: - htoml ==1.0.0.3 - http2 ==1.6.5 - HTTP ==4000.3.14 - - http-api-data ==0.4 - - http-client ==0.5.14 + - http-api-data ==0.4.1 + - http-client ==0.6.4 - http-client-tls ==0.3.5.3 - http-common ==0.8.2.0 - http-conduit ==2.3.7.1 - http-date ==0.0.8 - http-directory ==0.1.5 - - httpd-shed ==0.4.0.3 + - http-download ==0.1.0.0 + - httpd-shed ==0.4.1.1 - http-link-header ==1.0.3.1 - - http-media ==0.7.1.3 + - http-media ==0.8.0.0 - http-reverse-proxy ==0.6.0 - http-streams ==0.8.6.1 - http-types ==0.12.3 - human-readable-duration ==0.2.1.4 - HUnit ==1.6.0.0 - HUnit-approx ==1.1.1.1 - - hunit-dejafu ==1.2.1.0 + - hunit-dejafu ==2.0.0.1 - hvect ==0.4.0.0 - - hvega ==0.1.0.3 + - hvega ==0.3.0.1 - hw-balancedparens ==0.2.0.4 - hw-bits ==0.7.0.6 - hw-conduit ==0.2.0.5 - hw-conduit-merges ==0.2.0.0 - hw-diagnostics ==0.0.0.7 + - hw-dsv ==0.3.5 - hweblib ==0.6.3 - - hw-eliasfano ==0.1.0.1 + - hw-eliasfano ==0.1.1.0 - hw-excess ==0.2.2.0 + - hw-fingertree ==0.1.1.0 - hw-fingertree-strict ==0.1.1.1 - - hw-hspec-hedgehog ==0.1.0.4 + - hw-hedgehog ==0.1.0.3 + - hw-hspec-hedgehog ==0.1.0.7 - hw-int ==0.0.0.3 - - hw-ip ==2.0.1.0 - - hw-json ==0.9.0.1 - - hw-mquery ==0.1.0.3 - - hw-packed-vector ==0.0.0.1 + - hw-ip ==2.3.1.2 + - hw-json ==1.0.0.2 + - hw-json-simd ==0.1.0.2 + - hw-mquery ==0.2.0.1 + - hw-packed-vector ==0.0.0.3 - hw-parser ==0.1.0.1 - - hw-prim ==0.6.2.28 - - hw-rankselect ==0.12.0.4 + - hw-prim ==0.6.2.31 + - hw-rankselect ==0.13.0.0 - hw-rankselect-base ==0.3.2.1 + - hw-simd ==0.1.1.4 - hw-streams ==0.0.0.10 - hw-string-parse ==0.0.0.4 - hw-succinct ==0.1.0.1 - hxt ==9.3.1.18 - - hxt-charproperties ==9.2.0.1 + - hxt-charproperties ==9.4.0.0 - hxt-css ==0.1.0.3 - hxt-curl ==9.1.1.1 - hxt-expat ==9.1.1 @@ -1091,14 +1062,16 @@ default-package-overrides: - hxt-tagsoup ==9.1.4 - hxt-unicode ==9.0.2.4 - hybrid-vectors ==0.2.2 + - hyper ==0.1.0.3 - hyperloglog ==0.4.2 - - hyphenation ==0.7.1 + - hyphenation ==0.8 - hyraxAbif ==0.2.3.15 - iconv ==0.4.1.3 - identicon ==0.2.2 - ieee754 ==0.8.0 - if ==0.1.0.0 - iff ==0.0.6 + - ihaskell ==0.10.0.0 - ihs ==0.1.0.3 - ilist ==0.3.1.0 - imagesize-conduit ==1.1 @@ -1109,29 +1082,36 @@ default-package-overrides: - indentation-core ==0.0.0.2 - indentation-parsec ==0.0.0.2 - indents ==0.5.0.0 + - indexed ==0.1.3 - indexed-list-literals ==0.2.1.2 - infer-license ==0.2.0 - inflections ==0.4.0.4 - - influxdb ==1.6.1.3 - - ini ==0.3.6 + - influxdb ==1.7.1 + - ini ==0.4.1 + - inj ==1.0 - inline-c ==0.7.0.1 - inline-c-cpp ==0.3.0.2 + - inline-r ==0.10.2 - inliterate ==0.1.0 - insert-ordered-containers ==0.2.2 - inspection-testing ==0.4.2.1 - instance-control ==0.1.2.0 + - int-cast ==0.2.0.0 - integer-logarithms ==1.0.3 - integration ==0.2.1 - intern ==0.9.2 - interpolate ==0.2.0 - interpolatedstring-perl6 ==1.0.1 + - interpolatedstring-qq2 ==0.1.0.0 - interpolation ==0.1.1.1 - - interpolator ==0.1.2 + - interpolator ==1.0.0 - IntervalMap ==0.6.1.1 - intervals ==0.8.1 + - intro ==0.5.2.1 - intset-imperative ==0.1.0.0 - invariant ==0.5.3 - invertible ==0.2.0.5 + - invertible-grammar ==0.1.2 - io-choice ==0.0.7 - io-machine ==0.2.0.0 - io-manager ==0.1.0.2 @@ -1140,13 +1120,14 @@ default-package-overrides: - io-storage ==0.3 - io-streams ==1.5.1.0 - io-streams-haproxy ==1.0.1.0 - - ip ==1.4.2.1 + - ip ==1.5.1 - ip6addr ==1.0.0 - iproute ==1.7.7 - IPv6Addr ==1.1.2 - - ipython-kernel ==0.9.1.0 + - ipynb ==0.1 + - ipython-kernel ==0.10.0.0 - irc ==0.6.1.0 - - irc-client ==1.1.0.7 + - irc-client ==1.1.1.0 - irc-conduit ==0.3.0.3 - irc-ctcp ==0.1.3.0 - islink ==0.1.0.0 @@ -1157,7 +1138,7 @@ default-package-overrides: - ixset-typed ==0.4.0.1 - ix-shapable ==0.1.0 - jack ==0.7.1.4 - - jose ==0.8.0.0 + - jose ==0.8.1.0 - jose-jwt ==0.8.0 - js-dgtable ==0.5.2 - js-flot ==0.8.3 @@ -1165,6 +1146,7 @@ default-package-overrides: - json ==0.9.3 - json-alt ==1.0.0 - json-feed ==1.0.6 + - jsonpath ==0.1.0.1 - json-rpc ==1.0.0 - json-rpc-client ==0.2.5.0 - json-rpc-generic ==0.2.1.5 @@ -1173,9 +1155,10 @@ default-package-overrides: - JuicyPixels-extra ==0.4.1 - JuicyPixels-scale-dct ==0.1.2 - justified-containers ==0.3.0.0 + - jwt ==0.10.0 - kan-extensions ==5.2 - kanji ==3.4.0.2 - - katip ==0.7.0.0 + - katip ==0.8.3.0 - kawhi ==0.3.0 - kazura-queue ==0.1.0.4 - kdt ==0.2.4 @@ -1184,15 +1167,15 @@ default-package-overrides: - kind-apply ==0.3.1.0 - kind-generics ==0.3.0.0 - kind-generics-th ==0.1.1.0 - - kleene ==0 + - kleene ==0.1 - kmeans ==0.1.3 - koofr-client ==1.0.0.3 - kraken ==0.1.0 - l10n ==0.1.0.1 - labels ==0.3.3 - lackey ==1.0.9 - - LambdaHack ==0.8.3.0 - - lame ==0.1.1 + - LambdaHack ==0.9.5.0 + - lame ==0.2.0 - language-c ==0.8.2 - language-c-quote ==0.12.2 - language-docker ==8.0.2 @@ -1201,15 +1184,19 @@ default-package-overrides: - language-java ==0.2.9 - language-javascript ==0.6.0.13 - language-puppet ==1.4.5 + - lapack ==0.3.1 + - lapack-carray ==0.0.3 + - lapack-comfort-array ==0.0.0.1 - lapack-ffi ==0.0.2 - - lapack-ffi-tools ==0.1.2 + - lapack-ffi-tools ==0.1.2.1 - largeword ==1.2.5 - latex ==0.1.0.4 - - lattices ==1.7.1.1 + - lattices ==2.0.1 - lawful ==0.1.0.0 + - lazy-csv ==0.5.1 - lazyio ==0.1.0.4 - lca ==0.3.1 - - leancheck ==0.8.0 + - leancheck ==0.9.1 - leancheck-instances ==0.0.3 - leapseconds-announced ==2017.1.0.1 - learn-physics ==0.6.4 @@ -1220,10 +1207,11 @@ default-package-overrides: - lens-family ==1.2.3 - lens-family-core ==1.2.3 - lens-family-th ==0.5.0.2 - - lens-labels ==0.3.0.1 - lens-misc ==0.0.2.0 + - lens-process ==0.3.0.0 - lens-properties ==4.11.1 - lens-regex ==0.1.1 + - lens-regex-pcre ==0.3.1.0 - lens-simple ==0.1.0.9 - lens-typelevel ==0.1.1.0 - lenz ==0.3.0.0 @@ -1232,7 +1220,8 @@ default-package-overrides: - libgit ==0.3.1 - libgraph ==1.14 - libmpd ==0.9.0.9 - - libraft ==0.1.1.0 + - liboath-hs ==0.0.1.1 + - libraft ==0.5.0.0 - libyaml ==0.1.1.0 - LibZip ==1.0.1 - lifted-async ==0.10.0.4 @@ -1240,6 +1229,7 @@ default-package-overrides: - lift-generics ==0.1.2 - line ==4.0.1 - linear ==1.20.9 + - linear-circuit ==0.1.0.2 - linux-file-extents ==0.2.0.0 - linux-namespaces ==0.1.3.0 - List ==0.6.2 @@ -1247,27 +1237,30 @@ default-package-overrides: - listsafe ==0.1.0.1 - list-t ==1.0.3.1 - ListTree ==0.2.3 - - llvm-hs-pure ==7.0.0 + - list-witnesses ==0.1.1.1 + - llvm-hs ==8.0.0 + - llvm-hs-pure ==8.0.0 - lmdb ==0.2.5 - load-env ==0.2.1.0 - loc ==0.1.3.4 - locators ==0.2.4.4 - loch-th ==0.2.2 - lockfree-queue ==0.2.3.1 - - log-base ==0.7.4.0 + - log-base ==0.8.0.0 - log-domain ==0.12 - logfloat ==0.13.3.3 - logger-thread ==0.1.0.2 - logging-effect ==1.3.4 - logging-facade ==0.3.0 - logging-facade-syslog ==1 - - logict ==0.6.0.3 - - long-double ==0.1 + - logict ==0.7.0.2 - loop ==0.3.0 + - loopbreaker ==0.1.1.0 + - lrucache ==1.2.0.1 - lrucaching ==0.3.3 - - lsp-test ==0.5.1.2 + - lsp-test ==0.6.0.0 - lucid ==2.9.11 - - lucid-extras ==0.1.0.1 + - lucid-extras ==0.2.2 - lxd-client-config ==0.1.0.1 - lzma ==0.0.0.3 - lzma-conduit ==1.2.1 @@ -1275,40 +1268,41 @@ default-package-overrides: - machines-binary ==0.3.0.3 - machines-directory ==0.2.1.0 - machines-io ==0.2.0.13 + - magico ==0.0.2.1 - mainland-pretty ==0.7 - main-tester ==0.2.0.1 - makefile ==1.1.0.0 - managed ==1.0.6 - - mapquest-api ==0.3.1 - markdown ==0.1.17.4 - markdown-unlit ==0.5.0 - markov-chain ==0.0.3.4 - - massiv ==0.2.8.1 + - massiv ==0.4.0.0 - massiv-io ==0.1.6.0 + - massiv-test ==0.1.0 - mathexpr ==0.3.0.0 - math-functions ==0.3.1.0 - - matrices ==0.4.5 + - matplotlib ==0.7.4 + - matrices ==0.5.0 - matrix ==0.3.6.1 - matrix-market-attoparsec ==0.1.0.8 - matrix-static ==0.2 - maximal-cliques ==0.1.1 - mbox ==0.3.4 - - mbox-utility ==0.0.1 - mbtiles ==0.6.0.0 - - mbug ==1.3.2 - mcmc-types ==1.0.3 - median-stream ==0.7.0.0 - megaparsec ==7.0.5 - - mega-sdist ==0.3.3.2 + - megaparsec-tests ==7.0.5 + - mega-sdist ==0.4.0.1 - memory ==0.14.18 - MemoTrie ==0.6.9 - menshen ==0.0.3 - mercury-api ==0.1.0.2 - merkle-tree ==0.1.1 - mersenne-random-pure64 ==0.2.2.0 + - messagepack ==0.5.4 - metrics ==0.4.1.1 - mfsolve ==0.3.2.0 - - microbench ==0.1 - microformats2-parser ==1.0.1.9 - microlens ==0.4.10 - microlens-aeson ==2.3.0.4 @@ -1316,33 +1310,35 @@ default-package-overrides: - microlens-ghc ==0.4.10 - microlens-mtl ==0.1.11.1 - microlens-platform ==0.3.11 + - microlens-process ==0.2.0.0 - microlens-th ==0.4.2.3 - microspec ==0.2.1.3 - microstache ==1.0.1.1 - midair ==0.2.0.1 - midi ==0.2.2.2 + - midi-music-box ==0.0.1.1 - mighty-metropolis ==1.2.0 - - mime-mail ==0.4.14 + - mime-mail ==0.5.0 - mime-mail-ses ==0.4.1 - mime-types ==0.1.0.9 - minimorph ==0.2.1.0 - - minio-hs ==1.2.0 + - minio-hs ==1.5.0 - miniutter ==0.5.0.0 - mintty ==0.1.2 - - miso ==0.21.2.0 + - miso ==1.2.0.0 - missing-foreign ==0.1.1 - MissingH ==1.4.1.0 - - mixed-types-num ==0.3.1.5 - - mixpanel-client ==0.1.1 + - mixed-types-num ==0.4.0.1 - mltool ==0.2.0.1 - mmap ==0.5.9 - - mmark ==0.0.7.0 + - mmark ==0.0.7.1 - mmark-cli ==0.0.5.0 - mmark-ext ==0.2.1.2 - mmorph ==1.1.3 + - mmtf ==0.1.3.1 - mnist-idx ==0.1.2.8 - mockery ==0.3.5 - - modern-uri ==0.3.0.1 + - modern-uri ==0.3.1.0 - modular ==0.1.0.8 - monad-control ==1.0.2.3 - monad-control-aligned ==0.0.1.1 @@ -1356,6 +1352,7 @@ default-package-overrides: - monad-logger-syslog ==0.1.4.0 - monad-loops ==0.4.3 - monad-memo ==0.5.1 + - monad-metrics ==0.2.1.4 - monad-par ==0.3.4.8 - monad-parallel ==0.7.2.3 - monad-par-extras ==0.3.3 @@ -1369,14 +1366,19 @@ default-package-overrides: - monad-time ==0.3.1.0 - monad-unlift ==0.2.0 - monad-unlift-ref ==0.2.1 - - mongoDB ==2.4.0.1 + - mongoDB ==2.5.0.0 - monoidal-containers ==0.4.0.0 - monoid-extras ==0.5 - monoid-subclasses ==0.4.6.1 - monoid-transformer ==0.0.4 - mono-traversable ==1.0.11.0 - mono-traversable-instances ==0.1.0.0 + - mono-traversable-keys ==0.1.0 + - more-containers ==0.2.1.2 - mountpoints ==1.0.2 + - mpi-hs ==0.5.1.2 + - msgpack ==1.0.1.0 + - msgpack-aeson ==0.1.0.0 - mtl ==2.2.2 - mtl-compat ==0.2.2 - mtl-prelude ==2.0.3.1 @@ -1384,12 +1386,13 @@ default-package-overrides: - multimap ==1.2.1 - multipart ==0.1.3 - multiset ==0.3.4.1 + - multistate ==0.8.0.2 - murmur3 ==1.0.3 - murmur-hash ==0.1.0.9 - MusicBrainz ==0.4.1 - mustache ==2.3.0 - mutable-containers ==0.3.4 - - mwc-probability ==2.0.4 + - mwc-probability ==2.1.0 - mwc-probability-transition ==0.4 - mwc-random ==0.14.0.0 - mysql ==0.1.7 @@ -1398,7 +1401,7 @@ default-package-overrides: - mysql-simple ==0.4.5 - n2o ==0.11.1 - nagios-check ==0.3.2 - - named ==0.2.0.0 + - named ==0.3.0.0 - names-th ==0.3.0.0 - nano-erl ==0.1.0.1 - nanospec ==0.2.2 @@ -1408,25 +1411,25 @@ default-package-overrides: - natural-transformation ==0.4 - ndjson-conduit ==0.1.0.5 - neat-interpolation ==0.3.2.4 + - netlib-carray ==0.1 + - netlib-comfort-array ==0.0.0.1 - netlib-ffi ==0.1.1 - netpbm ==1.0.3 - - netrc ==0.2.0.0 - nettle ==0.3.0 - netwire ==5.0.3 - netwire-input ==0.0.7 - netwire-input-glfw ==0.0.10 - network ==2.8.0.1 - network-anonymous-i2p ==0.10.0 - - network-anonymous-tor ==0.11.0 - network-attoparsec ==0.12.2 - network-bsd ==2.8.0.0 - - network-byte-order ==0.0.0.0 + - network-byte-order ==0.1.1.0 - network-conduit-tls ==1.3.2 - network-house ==0.1.0.2 - network-info ==0.2.0.10 - network-ip ==0.3.0.2 - network-messagepack-rpc ==0.1.1.1 - - network-multicast ==0.2.0 + - network-multicast ==0.3.2 - network-simple ==0.4.5 - network-simple-tls ==0.3.2 - network-transport ==0.5.4 @@ -1441,20 +1444,24 @@ default-package-overrides: - nonce ==1.0.7 - nondeterminism ==1.4 - non-empty ==0.3.2 - - nonempty-containers ==0.1.1.0 + - nonempty-containers ==0.3.1.0 - nonemptymap ==0.0.6.0 - non-empty-sequence ==0.2.0.2 - non-negative ==0.1.2 - not-gloss ==0.7.7.0 + - no-value ==1.0.0.0 - nowdoc ==0.1.1.0 - nqe ==0.6.1 - nsis ==0.3.3 - numbers ==3000.2.0.2 - numeric-extras ==0.1 - numeric-prelude ==0.4.3.1 + - numhask ==0.3.0.0 - NumInstances ==1.4 - numtype-dk ==0.5.0.2 - nuxeo ==0.3.2 + - nvim-hs ==2.1.0.2 + - nvim-hs-contrib ==2.0.0.0 - nvvm ==0.9.0.0 - oauthenticated ==0.2.1.0 - ObjectName ==1.1.0.1 @@ -1483,36 +1490,45 @@ default-package-overrides: - open-witness ==0.4.0.1 - operational ==0.2.3.5 - operational-class ==0.3.0.0 - - opml-conduit ==0.6.0.4 - optional-args ==1.0.2 - options ==1.2.1.1 - optparse-applicative ==0.14.3.0 + - optparse-enum ==1.0.0.0 - optparse-generic ==1.3.0 - optparse-simple ==0.1.1.2 - optparse-text ==0.1.1.0 + - ordered-containers ==0.2.2 + - oset ==0.4.0.1 - overhang ==1.0.0 - packcheck ==0.4.2 - pager ==0.1.1.0 - pagination ==0.2.1 - - pairing ==0.1.4 - - pandoc ==2.5 - - pandoc-citeproc ==0.15.0.1 - - pandoc-pyplot ==1.0.3.0 + - pairing ==0.4.1 + - palette ==0.3.0.2 + - pandoc ==2.7.3 + - pandoc-citeproc ==0.16.2 + - pandoc-csv2table ==1.0.7 + - pandoc-markdown-ghci-filter ==0.1.0.0 + - pandoc-pyplot ==2.1.5.1 - pandoc-types ==1.17.5.4 + - pantry ==0.1.1.1 - parallel ==3.2.2.0 - parallel-io ==0.3.3 - paripari ==0.6.0.0 - parseargs ==0.2.0.9 - - parsec ==3.1.13.0 + - parsec ==3.1.14.0 - parsec-class ==1.0.0.0 - parsec-numbers ==0.1.0 - parsec-numeric ==0.1.0.0 - ParsecTools ==0.0.2.0 - - parser-combinators ==1.0.3 + - parser-combinators ==1.1.0 + - parser-combinators-tests ==1.1.0 - parsers ==0.12.10 - partial-handler ==1.0.3 - partial-isomorphisms ==0.2.2.1 - partial-semigroup ==0.5.1.1 + - password ==0.1.0.0 + - password-instances ==0.3.0.0 - path ==0.6.1 - path-extra ==0.2.0 - path-io ==1.4.2 @@ -1531,7 +1547,9 @@ default-package-overrides: - peano ==0.1.0.1 - pedersen-commitment ==0.2.0 - pem ==0.2.4 + - pencil ==1.0.1 - percent-format ==0.0.1 + - peregrin ==0.3.0 - perfect-hash-generator ==0.2.0.6 - persist ==0.1.1.3 - persistable-record ==0.6.0.4 @@ -1540,14 +1558,20 @@ default-package-overrides: - persistent-iproute ==0.2.3 - persistent-mysql ==2.9.0 - persistent-mysql-haskell ==0.5.2 + - persistent-pagination ==0.1.1.0 - persistent-postgresql ==2.9.1 + - persistent-qq ==2.9.1 - persistent-sqlite ==2.9.3 - - persistent-template ==2.5.4 + - persistent-template ==2.6.0 + - persistent-typed-db ==0.0.1.1 + - pg-harness-client ==0.6.0 + - pg-harness-server ==0.6.2 - pgp-wordlist ==0.1.0.3 - pg-transact ==0.1.0.1 - phantom-state ==0.2.1.2 - pid1 ==0.1.2.0 - - pipes ==4.3.10 + - pinboard ==0.10.1.4 + - pipes ==4.3.11 - pipes-aeson ==0.4.1.8 - pipes-attoparsec ==0.5.1.5 - pipes-binary ==0.4.2 @@ -1564,30 +1588,38 @@ default-package-overrides: - pipes-network ==0.6.5 - pipes-network-tls ==0.3 - pipes-parse ==3.0.8 + - pipes-random ==1.0.0.5 - pipes-safe ==2.3.1 - pipes-wai ==3.2.0 - pkcs10 ==0.2.0.0 - placeholders ==0.1 + - planb-token-introspection ==0.1.4.0 - plotlyhs ==0.2.1 - pointed ==5.0.1 - pointedlist ==0.6.1 - pointless-fun ==1.1.0.6 - poll ==0.0.0.1 + - poly ==0.3.1.0 - poly-arity ==0.1.0 - polynomials-bernstein ==1.1.2 - polyparse ==1.12.1 + - polysemy ==1.0.0.0 + - polysemy-plugin ==0.2.2.0 + - polysemy-zoo ==0.5.0.1 - pooled-io ==0.0.2.2 - port-utils ==0.2.1.0 - posix-paths ==0.2.1.6 - possibly ==1.0.0.0 - - postgresql-binary ==0.12.1.2 + - postgresql-binary ==0.12.1.3 - postgresql-libpq ==0.9.4.2 + - postgresql-orm ==0.5.1 - postgresql-schema ==0.1.14 - postgresql-simple ==0.6.2 - postgresql-simple-migration ==0.1.14.0 - postgresql-simple-queue ==1.0.1 - postgresql-simple-url ==0.2.1.0 - postgresql-transactional ==1.1.1 + - postgresql-typed ==0.6.0.1 - post-mess-age ==0.2.1.0 - pptable ==0.3.0.0 - pqueue ==1.4.1.2 @@ -1598,17 +1630,19 @@ default-package-overrides: - prettyclass ==1.0.0.0 - pretty-class ==1.0.1.1 - pretty-hex ==1.0 - - prettyprinter ==1.2.1 + - prettyprinter ==1.2.1.1 - prettyprinter-ansi-terminal ==1.1.1.2 - prettyprinter-compat-annotated-wl-pprint ==1 - prettyprinter-compat-ansi-wl-pprint ==1.0.1 - prettyprinter-compat-wl-pprint ==1.0.0.1 + - prettyprinter-convert-ansi-wl-pprint ==1.1 - pretty-show ==1.9.5 - pretty-simple ==2.2.0.1 - pretty-sop ==0.2.0.3 - - pretty-types ==0.2.3.1 + - pretty-types ==0.3.0.1 - primes ==0.2.1.0 - primitive ==0.6.4.0 + - primitive-extras ==0.7.1.1 - prim-uniq ==0.1.0.1 - probability ==0.2.5.2 - process-extras ==0.7.4 @@ -1621,19 +1655,19 @@ default-package-overrides: - prometheus-client ==1.0.0 - promises ==0.3 - prompt ==0.1.1.2 + - prospect ==0.1.0.0 - protobuf ==0.2.1.2 - protobuf-simple ==0.1.1.0 - protocol-buffers ==2.4.12 - protocol-buffers-descriptor ==2.4.12 - protocol-radius ==0.0.1.1 - - protocol-radius-test ==0.0.1.0 - - proto-lens ==0.4.0.1 + - protocol-radius-test ==0.1.0.0 + - proto-lens ==0.5.1.0 - proto-lens-arbitrary ==0.1.2.7 - - proto-lens-combinators ==0.4.0.1 - proto-lens-optparse ==0.1.1.5 - - proto-lens-protobuf-types ==0.4.0.1 - - proto-lens-protoc ==0.4.0.2 - - proto-lens-runtime ==0.4.0.2 + - proto-lens-protobuf-types ==0.5.0.0 + - proto-lens-protoc ==0.5.0.0 + - proto-lens-runtime ==0.5.0.0 - proto-lens-setup ==0.4.0.2 - protolude ==0.2.3 - proxied ==0.3.1 @@ -1646,21 +1680,25 @@ default-package-overrides: - pusher-http-haskell ==1.5.1.9 - qchas ==1.1.0.1 - qm-interpolated-string ==0.3.0.0 - - qnap-decrypt ==0.3.4 - - quadratic-irrational ==0.0.6 + - qnap-decrypt ==0.3.5 + - qrcode-core ==0.9.1 + - qrcode-juicypixels ==0.8.0 + - quadratic-irrational ==0.1.0 - QuasiText ==0.1.2.6 - quickbench ==1.0 - - QuickCheck ==2.12.6.1 + - QuickCheck ==2.13.2 - quickcheck-arbitrary-adt ==0.3.1.0 - quickcheck-assertions ==0.3.0 - - quickcheck-classes ==0.6.0.0 - - quickcheck-instances ==0.3.19 + - quickcheck-classes ==0.6.1.0 + - quickcheck-instances ==0.3.22 - quickcheck-io ==0.2.0 - - quickcheck-simple ==0.1.1.0 + - quickcheck-simple ==0.1.1.1 - quickcheck-special ==0.1.0.6 - - quickcheck-state-machine ==0.4.3 + - quickcheck-state-machine ==0.6.0 - quickcheck-text ==0.1.2.1 + - quickcheck-transformer ==0.3.1 - quickcheck-unicode ==1.0.1.0 + - radius ==0.6.0.3 - rainbow ==0.30.0.2 - rainbox ==0.20.0.0 - ramus ==0.1.2 @@ -1672,24 +1710,30 @@ default-package-overrides: - random-source ==0.3.0.6 - random-tree ==0.6.0.5 - range ==0.2.1.1 - - range-set-list ==0.1.3 + - Ranged-sets ==0.4.0 + - range-set-list ==0.1.3.1 - rank1dynamic ==0.4.0 - - rank2classes ==1.2.1 + - rank2classes ==1.3 - Rasterific ==0.7.4.4 - rasterific-svg ==0.3.3.2 - ratel ==1.0.8 - - ratel-wai ==1.0.5 - - rattletrap ==6.0.2 + - ratel-wai ==1.1.0 + - rattle ==0.1 + - rattletrap ==9.0.1 - rawfilepath ==0.2.4 - rawstring-qm ==0.2.3.0 - raw-strings-qq ==1.1 - rcu ==0.2.4 + - rdf ==0.1.0.3 - re2 ==0.3 - readable ==0.3.1 - read-editor ==0.1.0.2 - read-env-var ==1.0.0.0 + - reanimate ==0.1.5.0 + - reanimate-svg ==0.9.0.0 - rebase ==1.3.1.1 - - record-dot-preprocessor ==0.1.5 + - record-dot-preprocessor ==0.2 + - record-hasfield ==1.0 - records-sop ==0.1.0.3 - recursion-schemes ==5.1.3 - reducers ==3.12.3 @@ -1710,42 +1754,46 @@ default-package-overrides: - regex-tdfa ==1.2.3.2 - regex-tdfa-text ==1.0.0.3 - regex-with-pcre ==1.0.2.0 - - registry ==0.1.6.2 + - registry ==0.1.7.0 - reinterpret-cast ==0.1.0 - relapse ==1.0.0.0 - - relational-query ==0.12.2.1 + - relational-query ==0.12.2.2 - relational-query-HDBC ==0.7.2.0 - relational-record ==0.2.2.0 - relational-schemas ==0.1.7.0 - - relude ==0.4.0 + - relude ==0.5.0 - renderable ==0.2.0.1 - repa ==3.4.1.4 - repa-algorithms ==3.4.1.3 - repa-io ==3.4.1.1 - repline ==0.2.1.0 - - req ==1.2.1 + - req ==2.1.0 - req-conduit ==1.0.0 - - req-url-extra ==0.1.0.0 + - require ==0.4.2 - rerebase ==1.3.1.1 + - resistor-cube ==0.0.1.2 - resource-pool ==0.2.3.2 - resourcet ==1.2.2 - result ==0.2.6.0 - rethinkdb-client-driver ==0.0.25 - - retry ==0.7.7.0 + - retry ==0.8.0.1 - rev-state ==0.1.2 - rfc1751 ==0.1.2 - rfc5051 ==0.1.0.4 - rg ==1.4.0.0 - - rio ==0.1.8.0 + - rhine ==0.5.1.0 + - rhine-gloss ==0.5.1.0 + - rigel-viz ==0.2.0.0 + - rio ==0.1.11.0 - rio-orphans ==0.1.1.0 - - rng-utils ==0.3.0 + - rio-prettyprint ==0.1.0.0 - roc-id ==0.1.0.0 - rocksdb-haskell ==1.0.1 - rocksdb-query ==0.2.0 - roles ==0.2.0.0 + - rope-utf16-splay ==0.3.1.0 - rosezipper ==0.2 - rot13 ==0.2.0.1 - - rounded ==0.1.0.1 - rpmbuild-order ==0.2.1 - RSA ==2.3.1 - runmemo ==1.0.0.1 @@ -1757,8 +1805,12 @@ default-package-overrides: - safe-exceptions-checked ==0.1.0 - safe-foldable ==0.1.0.0 - safeio ==0.0.5.0 + - safe-json ==0.1.0 + - safe-money ==0.9 - SafeSemaphore ==0.10.1 - - salak ==0.1.11 + - salak ==0.3.3.1 + - salak-toml ==0.3.3 + - salak-yaml ==0.3.3 - saltine ==0.1.0.2 - salve ==1.0.6 - sample-frame ==0.0.3 @@ -1766,102 +1818,116 @@ default-package-overrides: - sampling ==0.3.3 - sandman ==0.2.0.1 - say ==0.1.0.1 - - sbp ==2.4.7 - - sbv ==7.13 - - scalpel ==0.5.1 - - scalpel-core ==0.5.1 + - sbp ==2.6.3 + - sbv ==8.3 + - scalpel ==0.6.0 + - scalpel-core ==0.6.0 - scanf ==0.1.0.0 - scanner ==0.3 + - scheduler ==1.4.1 - scientific ==0.3.6.2 - scotty ==0.11.4 - scrypt ==0.5.0 - - sdl2 ==2.4.1.0 + - sdl2 ==2.5.0.0 - sdl2-gfx ==0.2 - sdl2-image ==2.0.0 - sdl2-mixer ==1.1.0 - sdl2-ttf ==2.1.0 - secp256k1-haskell ==0.1.4 - securemem ==0.1.10 - - selda ==0.3.4.0 - - selda-postgresql ==0.1.7.3 - - selda-sqlite ==0.1.6.1 + - selda ==0.4.0.0 + - selda-json ==0.1.0.0 + - selda-postgresql ==0.1.8.0 + - selda-sqlite ==0.1.7.0 + - selective ==0.3 + - semialign ==1 - semigroupoid-extras ==5 - semigroupoids ==5.3.2 - semigroups ==0.18.5 - - semirings ==0.2.1.1 + - semirings ==0.4.2 - semiring-simple ==1.0.0.1 - semver ==0.3.4 - sendfile ==0.7.11.1 - seqalign ==0.2.0.4 - serf ==0.1.1.0 - serialise ==0.2.1.0 - - servant ==0.15 + - servant ==0.16.2 - servant-auth ==0.3.2.0 - - servant-auth-client ==0.3.3.0 + - servant-auth-client ==0.4.0.0 - servant-auth-docs ==0.2.10.0 - servant-auth-server ==0.4.4.0 - servant-auth-swagger ==0.2.10.0 - - servant-blaze ==0.8 + - servant-auth-wordpress ==1.0.0.1 + - servant-blaze ==0.9 - servant-cassava ==0.10 - - servant-checked-exceptions ==2.0.0.0 - - servant-checked-exceptions-core ==2.0.0.0 - - servant-client ==0.15 - - servant-client-core ==0.15 + - servant-checked-exceptions ==2.2.0.0 + - servant-checked-exceptions-core ==2.2.0.0 + - servant-cli ==0.1.0.1 + - servant-client ==0.16 + - servant-client-core ==0.16 - servant-conduit ==0.15 - servant-docs ==0.11.3 - - servant-elm ==0.5.0.0 - - servant-exceptions ==0.1.1 + - servant-elm ==0.6.0.2 - servant-foreign ==0.15 + - servant-http-streams ==0.16 - servant-js ==0.9.4 - servant-JuicyPixels ==0.3.0.4 - servant-kotlin ==0.1.1.8 - - servant-lucid ==0.8.1 + - servant-lucid ==0.9 + - servant-machines ==0.15 - servant-mock ==0.8.5 - - servant-pandoc ==0.5.0.0 - - servant-rawm ==0.3.0.0 + - servant-multipart ==0.11.4 + - servant-pipes ==0.15 - servant-ruby ==0.9.0.0 - - servant-server ==0.15 + - servant-server ==0.16.2 - servant-static-th ==0.2.2.0 - - servant-streaming ==0.3.0.0 - servant-swagger ==1.1.7.1 - servant-swagger-ui ==0.3.4.3.22.2 - servant-swagger-ui-core ==0.3.3 - servant-swagger-ui-redoc ==0.3.3.1.22.2 - servant-tracing ==0.1.0.2 - - servant-websockets ==1.1.0 + - servant-xml ==1.0.1.4 - servant-yaml ==0.1.0.1 - - serverless-haskell ==0.8.8 - serversession ==1.0.1 - serversession-frontend-wai ==1.0 - servius ==1.2.3.0 - ses-html ==0.4.0.0 + - set-cover ==0.0.9 - setenv ==0.1.1.3 - setlocale ==1.0.0.8 + - sexp-grammar ==2.0.2 + - sexpr-parser ==0.1.1.2 - SHA ==1.6.4.4 - shake-language-c ==0.12.0 - shakespeare ==2.0.20 - shared-memory ==0.2.0.0 - shell-conduit ==4.7.0 - shell-escape ==0.2.0 + - shellmet ==0.0.2.0 - shelltestrunner ==1.9 - - shelly ==1.8.0 + - shelly ==1.8.1 - shikensu ==0.3.11 - shortcut-links ==0.4.2.1 - should-not-typecheck ==2.1.0 - show-combinators ==0.1.1.0 - - show-prettyprint ==0.2.3 + - shower ==0.2.0.1 + - show-prettyprint ==0.3.0.1 - siggy-chardust ==1.0.0 - signal ==0.1.0.4 - - silently ==1.2.5 - - simple-cabal ==0.0.0 - - simple-cmd ==0.1.4 + - silently ==1.2.5.1 + - simple ==0.11.3 + - simple-cabal ==0.0.0.1 + - simple-cmd ==0.2.0.1 - simple-cmd-args ==0.1.2 - simple-log ==0.9.12 - simple-reflect ==0.3.3 - simple-sendfile ==0.2.28 - - simple-vec3 ==0.4.0.10 + - simple-session ==0.10.1.1 + - simple-templates ==0.9.0.0 + - simple-vec3 ==0.6 + - simplistic-generics ==0.1.0.0 - since ==0.0.0 - - singleton-bool ==0.1.4 + - singleton-bool ==0.1.5 - singleton-nats ==0.4.2 - singletons ==2.5.1 - siphash ==1.0.3 @@ -1870,20 +1936,20 @@ default-package-overrides: - skein ==1.0.9.4 - skews ==0.1.0.2 - skip-var ==0.1.1.0 - - skylighting ==0.7.7 - - skylighting-core ==0.7.7 + - skylighting ==0.8.2 + - skylighting-core ==0.8.2 - slack-web ==0.2.0.11 - smallcheck ==1.1.5 + - smallcheck-series ==0.6.1 - smoothie ==0.4.2.9 - - smtp-mail ==0.1.4.6 - snap-blaze ==0.2.1.5 - snap-core ==1.0.4.0 - - snap-server ==1.1.0.0 + - snap-server ==1.1.1.1 - snowflake ==0.1.1.1 - soap ==0.2.3.6 - soap-tls ==0.1.1.4 - socket-activation ==0.1.0.2 - - socks ==0.5.6 + - socks ==0.6.0 - sop-core ==0.4.0.0 - sort ==1.0.0.0 - sorted-list ==0.2.1.0 @@ -1899,7 +1965,7 @@ default-package-overrides: - Spintax ==0.3.3 - splice ==0.6.1.1 - split ==0.2.3.3 - - splitmix ==0.0.2 + - splitmix ==0.0.3 - spoon ==0.3.1 - spreadsheet ==0.1.3.8 - sqlite-simple ==0.4.16.0 @@ -1907,17 +1973,15 @@ default-package-overrides: - sql-words ==0.1.6.3 - srcloc ==0.5.1.2 - stache ==2.0.1 - - stack2nix ==0.2.3 - starter ==0.3.0 - state-codes ==0.1.3 - stateref ==0.3 - statestack ==0.2.0.5 - - StateVar ==1.1.1.1 + - StateVar ==1.2 - static-text ==0.2.0.4 - statistics ==0.15.0.0 - stb-image-redux ==0.2.1.2 - step-function ==0.2 - - stm ==2.5.0.0 - stm-chans ==3.0.0.4 - stm-conduit ==4.0.1 - stm-delay ==0.1.1.1 @@ -1928,50 +1992,58 @@ default-package-overrides: - storable-record ==0.0.4 - storable-tuple ==0.0.3.3 - storablevector ==0.2.13 - - store ==0.5.1.1 + - store ==0.5.1.2 - store-core ==0.4.4 - Strafunski-StrategyLib ==5.0.1.0 - - stratosphere ==0.29.1 + - stratosphere ==0.40.0 - streaming ==0.2.2.0 - streaming-attoparsec ==1.0.0.1 - streaming-bytestring ==0.1.6 + - streaming-cassava ==0.1.0.1 - streaming-commons ==0.2.1.1 - streaming-wai ==0.1.1 - - streamly ==0.5.2 + - streamly ==0.6.1 - streamproc ==1.6.2 - streams ==3.3 - strict ==0.3.2 - strict-base-types ==0.6.1 - strict-concurrency ==0.2.4.3 + - strict-list ==0.1.4 - stringbuilder ==0.5.1 - string-class ==0.1.7.0 - string-combinators ==0.6.0.5 - string-conv ==0.1.2 - string-conversions ==0.4.0.1 + - string-interpolate ==0.1.0.1 - string-qq ==0.0.2 - stringsearch ==0.3.6.6 - string-transform ==1.1.1 + - stripe-concepts ==1.0.1.0 + - stripe-scotty ==1.0.0.0 + - stripe-signature ==1.0.0.1 + - stripe-wreq ==1.0.0.0 - strive ==5.0.8 - structs ==0.1.2 - - stylish-haskell ==0.9.2.2 - - summoner ==1.2.0 + - structured-cli ==2.5.1.0 + - summoner ==1.3.0.1 - sum-type-boilerplate ==0.1.1 - sundown ==0.6 - superbuffer ==0.3.1.1 + - sv ==1.3.1 - sv-cassava ==0.3 - - sv-core ==0.3.1 + - sv-core ==0.4.1 - svg-builder ==0.1.1 - SVGFonts ==1.7.0.1 - svg-tree ==0.6.2.4 - swagger ==0.3.0 - - swagger2 ==2.3.1.1 + - swagger2 ==2.4 - swish ==0.10.0.1 - syb ==0.7.1 - symbol ==0.2.4 - symengine ==0.1.2.0 - sysinfo ==0.1.1 - system-argv0 ==0.1.1 - - systemd ==1.1.2 + - systemd ==1.2.0 - system-fileio ==0.3.16.4 - system-filepath ==0.4.14 - tabular ==0.2.2.7 @@ -1988,19 +2060,21 @@ default-package-overrides: - tar ==0.5.1.0 - tar-conduit ==0.3.2 - tardis ==0.4.1.0 - - tasty ==1.2 + - tasty ==1.2.3 - tasty-ant-xml ==1.1.6 - - tasty-dejafu ==1.2.1.0 + - tasty-dejafu ==2.0.0.1 - tasty-discover ==4.2.1 - tasty-expected-failure ==0.11.1.1 - tasty-golden ==2.3.2 + - tasty-hedgehog ==1.0.0.1 - tasty-hspec ==1.1.5.1 - - tasty-hunit ==0.10.0.1 + - tasty-hunit ==0.10.0.2 - tasty-kat ==0.0.3 - tasty-leancheck ==0.0.1 + - tasty-lua ==0.2.0.1 - tasty-program ==1.0.5 - tasty-quickcheck ==0.10.1 - - tasty-silver ==3.1.12 + - tasty-silver ==3.1.13 - tasty-smallcheck ==0.8.1 - tasty-th ==0.1.7 - TCache ==0.12.1 @@ -2008,14 +2082,14 @@ default-package-overrides: - tcp-streams ==1.0.1.1 - tcp-streams-openssl ==1.0.1.0 - tdigest ==0.2.1 - - telegram-bot-simple ==0.2.0 - template-toolkit ==0.1.1.0 - temporary ==1.3 - temporary-rc ==1.2.0.3 - temporary-resourcet ==0.1.0.1 - tensorflow-test ==0.1.0.0 - tensors ==0.1.4 - - termbox ==0.1.0 + - termbox ==0.2.0 + - terminal-progress-bar ==0.4.1 - terminal-size ==0.3.2.1 - test-framework ==0.8.2.0 - test-framework-hunit ==0.3.0.2 @@ -2026,7 +2100,6 @@ default-package-overrides: - testing-feat ==1.1.0.0 - testing-type-modifiers ==0.1.0.1 - texmath ==0.11.2.2 - - text ==1.2.3.1 - text-binary ==0.2.1.1 - text-builder ==0.6.5.1 - text-conversions ==0.3.0 @@ -2038,20 +2111,23 @@ default-package-overrides: - text-manipulate ==0.2.0.1 - text-metrics ==0.3.0 - text-postgresql ==0.0.3.1 - - text-printer ==0.5 + - text-printer ==0.5.0.1 - text-region ==0.3.1.0 - - text-short ==0.1.2 - - text-show ==3.7.5 + - text-short ==0.1.3 + - text-show ==3.8.2 + - text-show-instances ==3.8.1 + - text-zipper ==0.10.1 - tfp ==1.0.1.1 - tf-random ==0.5 - - th-abstraction ==0.2.11.0 + - th-abstraction ==0.3.1.0 - th-data-compat ==0.0.2.7 - th-desugar ==1.9 - - these ==0.7.6 + - these ==1.0.1 - th-expand-syns ==0.4.4.0 - th-extras ==0.0.0.4 - - th-lift ==0.7.11 - - th-lift-instances ==0.1.12 + - th-lift ==0.8.0.1 + - th-lift-instances ==0.1.13 + - th-nowq ==0.1.0.3 - th-orphans ==0.13.7 - th-printf ==0.6.0 - thread-hierarchy ==0.3.0.1 @@ -2063,11 +2139,11 @@ default-package-overrides: - throttle-io-stream ==0.2.0.1 - throwable-exceptions ==0.1.0.9 - th-strict-compat ==0.1.0.1 + - th-test-utils ==1.0.0 - th-utilities ==0.2.3.0 - thyme ==0.3.5.5 - - tidal ==1.0.14 - tile ==0.3.0.0 - - time-compat ==0.1.0.3 + - time-compat ==1.9.2.2 - timeit ==2.0 - timelens ==0.2.0.2 - time-lens ==0.4.0.2 @@ -2077,33 +2153,46 @@ default-package-overrides: - time-parsers ==0.1.2.1 - time-qq ==0.0.1.0 - timerep ==2.0.0.2 - - timer-wheel ==0.1.0 + - timer-wheel ==0.2.0.1 - timezone-olson ==0.1.9 - timezone-series ==0.1.9 - - tinylog ==0.14.1 + - tintin ==1.10.0 + - tinylog ==0.15.0 - titlecase ==1.0.1 - tldr ==0.4.0.1 - tls ==1.4.1 - tls-debug ==0.4.5 - - tls-session-manager ==0.0.2.1 + - tls-session-manager ==0.0.3 - tmapchan ==0.0.3 - tmapmvar ==0.0.4 - - tmp-postgres ==0.1.2.2 + - tmp-postgres ==0.2.0.0 - token-bucket ==0.1.0.1 - - tomland ==0.5.0 + - tomland ==1.1.0.1 + - tonalude ==0.1.1.0 + - tonaparser ==0.1.0.0 + - tonatona ==0.1.0.1 + - tonatona-logger ==0.2.0.0 + - tonatona-persistent-postgresql ==0.1.0.1 + - tonatona-persistent-sqlite ==0.1.0.1 + - tonatona-servant ==0.1.0.2 + - torsor ==0.1 - tostring ==0.2.1.1 - TotalMap ==0.1.0.0 + - tracing ==0.0.4.0 - transaction ==0.1.1.3 - transformers-base ==0.4.5.2 - transformers-bifunctors ==0.1 - transformers-compat ==0.6.5 - transformers-fix ==1.0 - traverse-with-class ==1.0.0.0 - - tree-diff ==0.0.2.1 + - tree-diff ==0.1 - tree-fun ==0.8.1.0 - trifecta ==2 - triplesec ==0.2.2.1 + - trivial-constraint ==0.6.0.0 + - true-name ==0.1.0.3 - tsv2csv ==0.1.0.2 + - ttl-hashtables ==1.3.1.0 - ttrie ==0.1.2.1 - tuple ==0.3.0.2 - tuples-homogenous-h98 ==0.1.1.0 @@ -2111,28 +2200,33 @@ default-package-overrides: - tuple-th ==0.2.5 - turtle ==1.5.14 - TypeCompose ==0.9.14 - - typed-process ==0.2.5.0 + - typed-process ==0.2.6.0 + - type-errors ==0.2.0.0 + - type-errors-pretty ==0.0.0.0 - type-fun ==0.1.1 - type-hint ==0.1 - type-level-integers ==0.0.1 - type-level-kv-list ==1.1.0 - type-level-numbers ==0.1.1.1 - - typelits-witnesses ==0.3.0.3 + - typelits-witnesses ==0.4.0.0 + - type-map ==0.1.6.0 - typenums ==0.1.2.1 - type-of-html ==1.5.0.0 - type-of-html-static ==0.1.0.2 - - type-operators ==0.1.0.4 - - typerep-map ==0.3.1 - - type-spec ==0.3.0.1 + - type-operators ==0.2.0.0 + - typerep-map ==0.3.2 + - type-spec ==0.4.0.0 - tz ==0.1.3.2 - tzdata ==0.1.20190325.0 - ua-parser ==0.7.5.1 - ucam-webauth ==0.1.0.0 - ucam-webauth-types ==0.1.0.0 - uglymemo ==0.1.0.1 + - unagi-chan ==0.4.1.2 - unbounded-delays ==0.1.1.0 - unbound-generics ==0.4.0 - unboxed-ref ==0.4.0.0 + - unboxing-vector ==0.1.1.0 - uncertain ==0.3.1.0 - unconstrained ==0.1.0.2 - unicode ==0.0.1.1 @@ -2145,17 +2239,24 @@ default-package-overrides: - uniprot-kb ==0.1.2.0 - uniq-deep ==1.1.1 - unique ==0 + - unique-logic ==0.4 + - unique-logic-tf ==0.5.1 - unit-constraint ==0.0.0 - - universe-base ==1.0.2.1 - - universe-instances-base ==1.0 - - universe-instances-trans ==1.0.0.1 - - universe-reverse-instances ==1.0 + - universe ==1.1 + - universe-base ==1.1.1 + - universe-dependent-sum ==1.1.0.1 + - universe-instances-base ==1.1 + - universe-instances-extended ==1.1 + - universe-instances-trans ==1.1 + - universe-reverse-instances ==1.1 - universum ==1.5.0 - unix-bytestring ==0.3.7.3 - - unix-compat ==0.5.1 + - unix-compat ==0.5.2 - unix-time ==0.4.7 - - unliftio ==0.2.11 + - unliftio ==0.2.12 - unliftio-core ==0.1.2.0 + - unliftio-pool ==0.2.1.0 + - unliftio-streams ==0.1.1.0 - unlit ==0.4.0.0 - unordered-containers ==0.2.10.0 - unordered-intmap ==0.1.1 @@ -2175,7 +2276,7 @@ default-package-overrides: - utility-ht ==0.0.14 - uuid ==1.3.13 - uuid-types ==1.0.3 - - validation ==1 + - validation ==1.1 - validity ==0.9.0.1 - validity-aeson ==0.2.0.2 - validity-bytestring ==0.4.1.0 @@ -2188,8 +2289,8 @@ default-package-overrides: - validity-uuid ==0.1.0.2 - validity-vector ==0.2.0.2 - valor ==0.1.0.0 - - vault ==0.3.1.2 - - vec ==0.1.1 + - vault ==0.3.1.3 + - vec ==0.1.1.1 - vector ==0.12.0.3 - vector-algorithms ==0.8.0.1 - vector-binary-instances ==0.2.5.1 @@ -2199,13 +2300,14 @@ default-package-overrides: - vector-instances ==3.4 - vector-mmap ==0.0.3 - vector-sized ==1.2.0.1 - - vector-space ==0.15 + - vector-space ==0.16 - vector-split ==1.0.0.2 - vector-th-unbox ==0.2.1.6 - - verbosity ==0.2.3.0 + - verbosity ==0.3.0.0 - versions ==3.5.1 - ViennaRNAParser ==1.3.3 - - vinyl ==0.10.0.1 + - viewprof ==0.0.0.28 + - vinyl ==0.11.0 - vivid ==0.4.2.3 - vivid-osc ==0.5.0.0 - vivid-supercollider ==0.4.1.2 @@ -2213,11 +2315,12 @@ default-package-overrides: - vty ==5.25.1 - wai ==3.2.2.1 - wai-app-static ==3.1.6.3 - - wai-cli ==0.1.1 + - wai-cli ==0.2.1 - wai-conduit ==3.0.0.4 - wai-cors ==0.2.7 + - wai-enforce-https ==0.0.1 - wai-eventsource ==3.0.0 - - wai-extra ==3.0.26.1 + - wai-extra ==3.0.27 - wai-handler-launch ==3.0.2.4 - wai-logger ==2.3.5 - wai-middleware-auth ==0.1.2.1 @@ -2235,10 +2338,10 @@ default-package-overrides: - warp ==3.2.28 - warp-tls ==3.2.7 - warp-tls-uid ==0.2.0.6 - - wave ==0.1.5 + - wave ==0.2.0 - wcwidth ==0.0.2 - web3 ==0.8.3.2 - - webdriver ==0.8.5 + - webdriver ==0.9.0.1 - webex-teams-api ==0.2.0.0 - webex-teams-conduit ==0.2.0.0 - webex-teams-pipes ==0.2.0.0 @@ -2253,11 +2356,12 @@ default-package-overrides: - wikicfp-scraper ==0.1.0.11 - wild-bind ==0.1.2.4 - wild-bind-x11 ==0.2.0.7 + - Win32 ==2.6.1.0 - Win32-notify ==0.3.0.3 - windns ==0.1.0.1 - - winery ==0.3.1 + - winery ==1.1.2 - wire-streams ==0.1.1.0 - - witherable ==0.3.1 + - witherable ==0.3.2 - with-location ==0.1.0 - witness ==0.4 - wizards ==1.0.3 @@ -2266,10 +2370,15 @@ default-package-overrides: - wl-pprint-text ==1.2.0.0 - word24 ==2.0.1 - word8 ==0.1.3 + - wordpress-auth ==1.0.0.0 - word-trie ==0.3.0 - - world-peace ==0.1.0.0 + - word-wrap ==0.4.1 + - world-peace ==1.0.1.0 - wrap ==0.0.0 - - wreq ==0.5.3.1 + - wreq ==0.5.3.2 + - writer-cps-exceptions ==0.1.0.1 + - writer-cps-mtl ==0.1.1.6 + - writer-cps-transformers ==0.5.6.1 - ws ==0.0.5 - wuss ==1.1.14 - X11 ==1.9 @@ -2281,16 +2390,16 @@ default-package-overrides: - x509-validation ==1.6.11 - Xauth ==0.1 - xdg-basedir ==0.2.2 + - xdg-userdirs ==0.1.0.2 - xeno ==0.3.5.1 - xenstore ==0.1.1 - - xhtml ==3000.2.2.1 - xls ==0.1.2 - xlsx ==0.7.2 - xlsx-tabular ==0.2.2.1 - xml ==1.3.14 - xml-basic ==0.1.3.1 - - xmlbf ==0.4.1 - - xmlbf-xeno ==0.1.1 + - xmlbf ==0.6 + - xmlbf-xeno ==0.2 - xml-conduit ==1.8.0.1 - xml-conduit-parse ==0.3.1.2 - xml-conduit-writer ==0.1.1.2 @@ -2309,8 +2418,6 @@ default-package-overrides: - xmonad-extras ==0.15.1 - xss-sanitize ==0.3.6 - xxhash-ffi ==0.2.0.0 - - yam ==0.5.17 - - yam-datasource ==0.5.17 - yaml ==0.11.1.0 - yeshql ==4.1.0.1 - yeshql-core ==4.1.0.2 @@ -2325,11 +2432,10 @@ default-package-overrides: - yesod-csp ==0.2.5.0 - yesod-eventsource ==1.6.0 - yesod-fb ==0.5.0 - - yesod-form ==1.6.5 + - yesod-form ==1.6.6 - yesod-form-bootstrap4 ==2.1.2 - yesod-gitrepo ==0.3.0 - yesod-gitrev ==0.2.1 - - yesod-markdown ==0.12.6.2 - yesod-newsfeed ==1.6.1.0 - yesod-paginator ==1.1.0.2 - yesod-persistent ==1.6.0.2 @@ -2346,12 +2452,12 @@ default-package-overrides: - yoga ==0.0.0.5 - youtube ==0.2.1.1 - zero ==0.1.5 - - zeromq4-haskell ==0.7.0 + - zeromq4-haskell ==0.8.0 - zeromq4-patterns ==0.3.1.0 - zim-parser ==0.2.1.0 - zip ==1.2.0 - zip-archive ==0.4.1 - - zippers ==0.2.5 + - zippers ==0.3 - zip-stream ==0.2.0.1 - zlib ==0.6.2 - zlib-bindings ==0.1.1.5 @@ -2369,6 +2475,7 @@ extra-packages: - binary > 0.8 && < 0.9 # keep a 8.x major release around for older compilers - blank-canvas < 0.6.3 # more recent versions depend on base-compat-batteries == 0.10.* but we're on base-compat-0.9.* - Cabal == 2.2.* # required for jailbreak-cabal etc. + - Cabal == 2.4.* # required for cabal-install etc. - colour < 2.3.4 # newer versions don't support GHC 7.10.x - conduit >=1.1 && <1.3 # pre-lts-11.x versions neeed by git-annex 6.20180227 - conduit-extra >=1.1 && <1.3 # pre-lts-11.x versions neeed by git-annex 6.20180227 @@ -2415,6 +2522,7 @@ extra-packages: - seqid-streams < 0.2 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x - split < 0.2 # newer versions don't work with GHC 6.12.3 - tar < 0.4.2.0 # later versions don't work with GHC < 7.6.x + - these == 0.7.6 # required by hnix 0.6.1 - transformers == 0.4.3.* # the latest version isn't supported by mtl yet - vector < 0.10.10 # newer versions don't work with GHC 6.12.3 - xml-conduit ^>= 1.7 # pre-lts-11.x versions neeed by git-annex 6.20180227 @@ -2664,7 +2772,6 @@ broken-packages: - acme-stringly-typed - acme-zalgo - acme-zero - - acousticbrainz-client - ActionKid - activehs - activehs-base @@ -2708,6 +2815,7 @@ broken-packages: - aeson-t - aeson-tiled - aeson-typescript + - affection - affine-invariant-ensemble-mcmc - afv - ag-pictgen @@ -2742,6 +2850,7 @@ broken-packages: - AlgorithmW - align-text - AlignmentAlgorithms + - Allure - alms - alpha - alphachar @@ -2758,6 +2867,146 @@ broken-packages: - amazon-emailer - amazon-emailer-client-snap - amazon-products + - amazonka + - amazonka-alexa-business + - amazonka-apigateway + - amazonka-application-autoscaling + - amazonka-appstream + - amazonka-appsync + - amazonka-athena + - amazonka-autoscaling + - amazonka-autoscaling-plans + - amazonka-batch + - amazonka-budgets + - amazonka-certificatemanager + - amazonka-certificatemanager-pca + - amazonka-cloud9 + - amazonka-clouddirectory + - amazonka-cloudformation + - amazonka-cloudfront + - amazonka-cloudhsm + - amazonka-cloudhsmv2 + - amazonka-cloudsearch + - amazonka-cloudsearch-domains + - amazonka-cloudtrail + - amazonka-cloudwatch + - amazonka-cloudwatch-events + - amazonka-cloudwatch-logs + - amazonka-codebuild + - amazonka-codecommit + - amazonka-codedeploy + - amazonka-codepipeline + - amazonka-codestar + - amazonka-cognito-identity + - amazonka-cognito-idp + - amazonka-cognito-sync + - amazonka-comprehend + - amazonka-config + - amazonka-connect + - amazonka-core + - amazonka-cost-explorer + - amazonka-cur + - amazonka-datapipeline + - amazonka-devicefarm + - amazonka-directconnect + - amazonka-discovery + - amazonka-dms + - amazonka-ds + - amazonka-dynamodb + - amazonka-dynamodb-dax + - amazonka-dynamodb-streams + - amazonka-ec2 + - amazonka-ecr + - amazonka-ecs + - amazonka-efs + - amazonka-elasticache + - amazonka-elasticbeanstalk + - amazonka-elasticsearch + - amazonka-elastictranscoder + - amazonka-elb + - amazonka-elbv2 + - amazonka-emr + - amazonka-fms + - amazonka-gamelift + - amazonka-glacier + - amazonka-glue + - amazonka-greengrass + - amazonka-guardduty + - amazonka-health + - amazonka-iam + - amazonka-importexport + - amazonka-inspector + - amazonka-iot + - amazonka-iot-analytics + - amazonka-iot-dataplane + - amazonka-iot-jobs-dataplane + - amazonka-kinesis + - amazonka-kinesis-analytics + - amazonka-kinesis-firehose + - amazonka-kinesis-video + - amazonka-kinesis-video-archived-media + - amazonka-kinesis-video-media + - amazonka-kms + - amazonka-lambda + - amazonka-lex-models + - amazonka-lex-runtime + - amazonka-lightsail + - amazonka-marketplace-analytics + - amazonka-marketplace-entitlement + - amazonka-marketplace-metering + - amazonka-mechanicalturk + - amazonka-mediaconvert + - amazonka-medialive + - amazonka-mediapackage + - amazonka-mediastore + - amazonka-mediastore-dataplane + - amazonka-migrationhub + - amazonka-ml + - amazonka-mobile + - amazonka-mq + - amazonka-opsworks + - amazonka-opsworks-cm + - amazonka-organizations + - amazonka-pinpoint + - amazonka-polly + - amazonka-pricing + - amazonka-rds + - amazonka-redshift + - amazonka-rekognition + - amazonka-resourcegroups + - amazonka-resourcegroupstagging + - amazonka-route53 + - amazonka-route53-autonaming + - amazonka-route53-domains + - amazonka-s3 + - amazonka-s3-streaming + - amazonka-sagemaker + - amazonka-sagemaker-runtime + - amazonka-sdb + - amazonka-secretsmanager + - amazonka-serverlessrepo + - amazonka-servicecatalog + - amazonka-ses + - amazonka-shield + - amazonka-sms + - amazonka-snowball + - amazonka-sns + - amazonka-sqs + - amazonka-ssm + - amazonka-stepfunctions + - amazonka-storagegateway + - amazonka-sts + - amazonka-support + - amazonka-swf + - amazonka-test + - amazonka-transcribe + - amazonka-translate + - amazonka-waf + - amazonka-waf-regional + - amazonka-workdocs + - amazonka-workmail + - amazonka-workspaces + - amazonka-xray - amby - AMI - ampersand @@ -2784,11 +3033,22 @@ broken-packages: - anonymous-sums - anonymous-sums-tests - ansi-terminal-game + - ansigraph - antagonist - antfarm - anticiv - antigate - antimirov + - antiope-athena + - antiope-contract + - antiope-core + - antiope-dynamodb + - antiope-messages + - antiope-optparse-applicative + - antiope-s3 + - antiope-sns + - antiope-sqs + - antiope-swf - antisplice - antlr-haskell - antlrc @@ -2830,6 +3090,7 @@ broken-packages: - ApproxFun-hs - arb-fft - arbb-vm + - arbor-monad-logger - arbor-monad-metric - arbor-monad-metric-datadog - arbor-postgres @@ -2853,6 +3114,7 @@ broken-packages: - arpack - array-forth - array-primops + - arraylist - ArrayRef - arrow-improve - arrow-list @@ -2862,6 +3124,7 @@ broken-packages: - ArrowVHDL - artery - artifact + - asap - ascii-flatten - ascii-string - ascii-vector-avc @@ -2896,7 +3159,6 @@ broken-packages: - atomic-primops-vector - atomo - ats-format - - ats-pkg - ats-setup - ats-storable - attic-schedule @@ -2904,11 +3166,13 @@ broken-packages: - AttoJson - attoparsec-data - attoparsec-enumerator + - attoparsec-ip - attoparsec-iteratee - attoparsec-text - attoparsec-text-enumerator - attoparsec-time - attoparsec-trans + - attoparsec-uri - attosplit - Attrac - atuin @@ -2941,6 +3205,7 @@ broken-packages: - aws-configuration-tools - aws-dynamodb-conduit - aws-dynamodb-streams + - aws-easy - aws-ec2 - aws-ec2-knownhosts - aws-elastic-transcoder @@ -2949,12 +3214,14 @@ broken-packages: - aws-kinesis-client - aws-kinesis-reshard - aws-lambda + - aws-lambda-runtime - aws-mfa-credentials - aws-performance-tests - aws-route53 - aws-sdk - aws-sdk-text-converter - aws-sdk-xml-unordered + - aws-ses-easy - aws-sign4 - aws-simple - aws-sns @@ -2968,6 +3235,7 @@ broken-packages: - babylon - backblaze-b2-hs - backdropper + - backprop - backstop - backtracking-exceptions - backward-state @@ -2986,6 +3254,7 @@ broken-packages: - Bang - bank-holiday-usa - banwords + - barbly - barchart - barcodes-code128 - barecheck @@ -2997,7 +3266,6 @@ broken-packages: - base-feature-macros - base-generics - base-io-access - - base64-bytestring-type - base64-conduit - baserock-schema - BASIC @@ -3039,7 +3307,6 @@ broken-packages: - bidirectionalization-combined - bidispec - bidispec-extras - - bifunctor - BiGUL - billboard-parser - billeksah-forms @@ -3051,7 +3318,6 @@ broken-packages: - binary-ext - binary-file - binary-indexed-tree - - binary-instances - binary-protocol - binary-protocol-zmq - binary-streams @@ -3097,9 +3363,7 @@ broken-packages: - Biobase - BiobaseBlast - BiobaseDotP - - BiobaseENA - BiobaseEnsembl - - BiobaseFasta - BiobaseFR3D - BiobaseHTTP - BiobaseHTTPTools @@ -3108,9 +3372,7 @@ broken-packages: - BiobaseNewick - BiobaseTrainingData - BiobaseTurner - - BiobaseTypes - BiobaseVienna - - BiobaseXNA - biocore - biofasta - biofastq @@ -3123,8 +3385,8 @@ broken-packages: - birch-beer - bird - BirdPP + - bisc - bisect-binary - - bishbosh - bit-array - bit-stream - bitcoin-hs @@ -3138,11 +3400,13 @@ broken-packages: - bitstream - BitStringRandomMonad - bittorrent - - bitvec + - bitwise - bizzlelude - bizzlelude-js - bkr - bla + - blacktip + - blake2 - blakesum - blakesum-demo - blas @@ -3184,7 +3448,6 @@ broken-packages: - blunt - BNFC-meta - bno055-haskell - - board-games - bogre-banana - bolt - boltzmann-brain @@ -3194,10 +3457,11 @@ broken-packages: - bookkeeper - bookkeeper-permissions - Bookshelf + - boolean-normal-forms - boolexpr - boombox - boomslang - - boots + - boots-app - borel - boring-window-switcher - bot @@ -3243,13 +3507,15 @@ broken-packages: - buildbox-tools - buildwrapper - bullet + - bulletproofs + - bulmex - bumper - bunz - burnt-explorer - burst-detection - bus-pirate - - buster - Buster + - buster - buster-gtk - buster-network - butter @@ -3285,6 +3551,7 @@ broken-packages: - cabal-dependency-licenses - cabal-dev - cabal-dir + - cabal-fmt - cabal-ghc-dynflags - cabal-ghci - cabal-graphdeps @@ -3298,10 +3565,12 @@ broken-packages: - cabal-nirvana - cabal-progdeps - cabal-query + - cabal-rpm - cabal-setup - cabal-sort - cabal-src - cabal-test + - cabal-test-quickcheck - cabal-toolkit - cabal-upload - cabal2arch @@ -3318,6 +3587,9 @@ broken-packages: - cabin - cabocha - cached + - cachix + - cachix-api + - cacophony - caffegraph - cairo-core - cake @@ -3335,7 +3607,6 @@ broken-packages: - call-haskell-from-anything - camfort - campfire - - canon - canonical-filepath - canonical-json - canteven-http @@ -3343,10 +3614,10 @@ broken-packages: - canteven-log - canteven-parsedate - cantor + - cantor-pairing - cao - cap - Capabilities - - capataz - capnp - capped-list - capri @@ -3371,18 +3642,20 @@ broken-packages: - cash - cassandra-cql - Cassava + - cassava-conduit - cassette - cassy + - caster - castle - casui - catamorphism - Catana - catch-fd - categorical-algebra - - category - category-extras - category-traced - catnplus + - cautious-gen - cayley-client - CBOR - CC-delcont-alt @@ -3407,6 +3680,7 @@ broken-packages: - cereal-ieee754 - cereal-io-streams - cereal-plus + - cereal-streams - certificate - cf - cfipu @@ -3427,8 +3701,8 @@ broken-packages: - chatwork - cheapskate-terminal - check-pvp - - checked - Checked + - checked - checkmate - chell - chell-hunit @@ -3436,6 +3710,7 @@ broken-packages: - chessIO - chevalier-common - chiasma + - chiphunk - chitauri - Chitra - choose @@ -3531,6 +3806,8 @@ broken-packages: - clustering - clustertools - clutterhs + - cmark-highlight + - cmark-patterns - cmark-sections - cmath - cmathml3 @@ -3567,6 +3844,7 @@ broken-packages: - collada-types - collapse-duplication - collapse-util + - collection-json - collections - collections-api - collections-base-instances @@ -3626,12 +3904,13 @@ broken-packages: - concrete-typerep - concurrent-buffer - Concurrent-Cache + - concurrent-dns-cache - concurrent-machines - concurrent-state - Concurrential - ConcurrentUtils - - condor - Condor + - condor - condorcet - conductive-base - conductive-hsc3 @@ -3644,6 +3923,7 @@ broken-packages: - conduit-throttle - conduit-tokenize-attoparsec - conf + - confcrypt - conffmt - confide - config-parser @@ -3666,9 +3946,7 @@ broken-packages: - constrained-category - constrained-dynamic - constrained-monads - - constraint - constraint-manip - - constraint-reflection - ConstraintKinds - constraints-emerge - constructive-algebra @@ -3703,8 +3981,12 @@ broken-packages: - convert-annotation - convertible-ascii - convertible-text + - copilot - copilot-cbmc + - copilot-language + - copilot-libraries - copilot-sbv + - copilot-theorem - copr - COrdering - core @@ -3731,7 +4013,6 @@ broken-packages: - cparsing - CPBrainfuck - cpio-conduit - - cpkg - cplusplus-th - cprng-aes-effect - cpuperf @@ -3782,8 +4063,10 @@ broken-packages: - crypto-simple - cryptocompare - cryptoconditions + - cryptol - cryptsy-api - crystalfontz + - csa - cse-ghc-plugin - csg - CSPM-cspm @@ -3806,7 +4089,6 @@ broken-packages: - curry-frontend - CurryDB - cursedcsv - - cursor-gen - curve25519 - curves - custom-prelude @@ -3817,8 +4099,8 @@ broken-packages: - dag - DAG-Tournament - Dangerous - - dao - Dao + - dao - dapi - darcs-benchmark - darcs-beta @@ -3852,6 +4134,7 @@ broken-packages: - data-fin - data-fin-simple - data-flagset + - data-interval - data-ivar - data-kiln - data-layer @@ -3872,14 +4155,13 @@ broken-packages: - data-repr - data-result - data-rev - - data-rope - Data-Rope + - data-rope - data-rtuple - data-size - data-spacepart - data-standards - data-store - - data-stringmap - data-structure-inferrer - data-type - data-util @@ -3890,6 +4172,7 @@ broken-packages: - datadog-tracing - datafix - dataflow + - DataIndex - datalog - datasets - DataTreeView @@ -3974,8 +4257,10 @@ broken-packages: - deptrack-core - deptrack-devops - deptrack-dot + - dequeue - derangement - derivation-trees + - derive - derive-enumerable - derive-gadt - derive-IG @@ -3996,6 +4281,7 @@ broken-packages: - dgim - dgs - dhall-check + - dhall-json - dhall-lsp-server - dhall-nix - dhall-to-cabal @@ -4031,8 +4317,10 @@ broken-packages: - difftodo - digestive-bootstrap - digestive-foundation-lucid + - digestive-functors-happstack - digestive-functors-heist - digestive-functors-hsp + - digit - DigitalOcean - digitalocean-kzs - digraph @@ -4054,6 +4342,7 @@ broken-packages: - dirtree - discogs-haskell - discord-gateway + - discord-haskell - discord-hs - discord-rest - discord-types @@ -4096,6 +4385,7 @@ broken-packages: - djembe - djinn-th - dl-fedora + - dmcc - dmenu - dmenu-pkill - dmenu-pmount @@ -4108,13 +4398,13 @@ broken-packages: - doc-review - doccheck - docidx + - docker - docker-build-cacher - dockercook - DocTest - doctest-discover-configurator - doctest-driver-gen - doctest-prop - - docusign-client - docusign-example - docvim - doi @@ -4123,9 +4413,11 @@ broken-packages: - domain-auth - domplate - dot-linker + - dot2graphml - dotenv - dotfs - doublify-toolkit + - dovin - download-media-content - dozenal - dozens @@ -4181,7 +4473,6 @@ broken-packages: - dwarfadt - dyckword - dynamic-cabal - - dynamic-graph - dynamic-object - dynamic-plot - dynamic-pp @@ -4200,6 +4491,7 @@ broken-packages: - easyplot - ebeats - ebnf-bff + - ec2-unikernel - ecma262 - ecu - eddie @@ -4226,15 +4518,18 @@ broken-packages: - Eight-Ball-Pool-Hack-Cheats - either-list-functions - EitherT + - ekg-cloudwatch - ekg-elastic - ekg-elasticsearch - ekg-influxdb - ekg-log + - ekg-prometheus-adapter - ekg-push - ekg-rrd - elevator - elision - elm-websocket + - elsa - emacs-keys - email - email-header @@ -4252,12 +4547,10 @@ broken-packages: - encoding-io - engine-io-growler - engine-io-snap - - engine-io-wai - engine-io-yesod - entangle - EntrezHTTP - entwine - - enum-text-rio - EnumContainers - enumerate - enumerate-function @@ -4268,7 +4561,6 @@ broken-packages: - enumfun - EnumMap - enummapmap - - enummapset - enummapset-th - env-parser - envstatus @@ -4320,6 +4612,7 @@ broken-packages: - ethereum-client-haskell - ethereum-merkle-patricia-db - eths-rlp + - euler-tour-tree - euphoria - eurofxref - Euterpea @@ -4333,6 +4626,8 @@ broken-packages: - eventlog2html - EventSocket - eventsource-geteventstore-store + - eventsource-store-specs + - eventsource-stub-store - eventstore - every-bit-counts - exact-cover @@ -4362,21 +4657,21 @@ broken-packages: - explicit-sharing - explore - exposed-containers - - expressions - expressions-z3 - extcore - extemp - extended-categories - extensible-data + - extensible-effects-concurrent - Extra - extract-dependencies - extractelf + - extralife - ez-couch - ez3 - f-ree-hack-cheats-free-v-bucks-generator - Facebook-Password-Hacker-Online-Latest-Version - faceted - - factory - Facts - factual-api - fadno @@ -4402,9 +4697,18 @@ broken-packages: - FastxPipe - fathead-util - fault-tree + - fay + - fay-base - fay-builder + - fay-dom + - fay-geoposition - fay-hsx + - fay-jquery + - fay-ref - fay-simplejson + - fay-text + - fay-uri + - fay-websockets - fb-persistent - fbmessenger-api - fca @@ -4417,6 +4721,7 @@ broken-packages: - fdo-trash - feature-flipper - feature-flipper-postgres + - fedora-haskell-tools - fedora-img-dl - fedora-packages - feed-cli @@ -4439,7 +4744,6 @@ broken-packages: - ffmpeg-tutorials - ffunctor - fgl-extras-decompositions - - fib - fibon - ficketed - fields @@ -4454,14 +4758,15 @@ broken-packages: - FileManipCompat - fileneglect - filepath-io-access - - filepather - FilePather + - filepather - Files - FileSystem - filesystem-conduit - filesystem-enumerator - filesystem-trees - fillit + - Fin - final-pretty-printer - Finance-Quote-Yahoo - Finance-Treasury @@ -4476,8 +4781,8 @@ broken-packages: - first-and-last - firstify - FirstOrderTheory - - fishfood - fit + - fits-parse - fitsio - fix-parser-simple - fix-symbols-gitit @@ -4486,6 +4791,7 @@ broken-packages: - fixed-point-vector-space - fixed-precision - fixed-storable-array + - fixed-timestep - fixed-vector-binary - fixed-vector-cborg - fixed-vector-cereal @@ -4526,8 +4832,8 @@ broken-packages: - FM-SBLEX - fmark - FModExRaw - - fmt-for-rio - fn-extra + - focuslist - foldl-incremental - foldl-statistics - folds-common @@ -4559,6 +4865,7 @@ broken-packages: - forth-hll - Fortnite-Hack-Cheats-Free-V-Bucks-Generator - fortran-src + - fortytwo - foscam-directory - foscam-filename - foscam-sort @@ -4570,6 +4877,7 @@ broken-packages: - Fractaler - fractals - frag + - Frames - Frames-beam - Frames-dsv - Frames-map-reduce @@ -4605,6 +4913,7 @@ broken-packages: - fresh - friday-devil - friday-scale-dct + - front - frown - frp-arduino - frpnow @@ -4617,8 +4926,11 @@ broken-packages: - fsmActions - fsutils - fswait + - ft-generator - ftdi - FTGL-bytestring + - ftp-client + - ftp-client-conduit - ftp-conduit - FTPLine - ftshell @@ -4633,15 +4945,16 @@ broken-packages: - functional-arrow - functor - functor-combinators + - functor-products - functorm - funflow - funflow-nix - FunGEn - Fungi - funion + - funnyprint - funpat - funsat - - fused-effects-exceptions - fusion - futun - future @@ -4722,6 +5035,7 @@ broken-packages: - GeocoderOpenCage - geodetic - geodetic-types + - geojson - geojson-types - geolite-csv - geom2d @@ -4732,7 +5046,6 @@ broken-packages: - getflag - GGg - ggtsTC - - gh-labeler - ghc-core-smallstep - ghc-datasize - ghc-dump-tree @@ -4740,7 +5053,6 @@ broken-packages: - ghc-events-analyze - ghc-events-parallel - ghc-generic-instances - - ghc-heap-view - ghc-imported-from - ghc-instances - ghc-man-completion @@ -4774,40 +5086,24 @@ broken-packages: - ghcprofview - ght - gi-cairo-again - - gi-dbusmenu - - gi-dbusmenugtk3 - - gi-gdkx11 - - gi-ggit - - gi-girepository - - gi-gst - - gi-gstaudio - - gi-gstbase + - gi-graphene + - gi-gsk - gi-gstpbutils - gi-gsttag - - gi-gstvideo - - gi-gtk - gi-gtk-declarative - gi-gtk-declarative-app-simple - - gi-gtk-hs - gi-gtkosxapplication - - gi-gtksource - gi-handy - gi-notify - - gi-ostree - - gi-pangocairo - gi-poppler - - gi-secret - - gi-soup - - gi-vte - gi-wnck - - gi-xlib - giak - Gifcurry - - ginger - ginsu - gipeda - - gist + - giphy-api - GiST + - gist - git-checklist - git-config - git-date @@ -4818,9 +5114,7 @@ broken-packages: - git-remote-ipfs - git-repair - git-sanity - - git-vogue - gitdo - - github - github-backup - github-data - github-tools @@ -4834,6 +5128,7 @@ broken-packages: - gitlib-s3 - gitlib-utils - gitson + - givegif - glade - gladexml-accessor - glapp @@ -4880,9 +5175,11 @@ broken-packages: - google-drive - google-html5-slide - google-mail-filters + - google-maps-geocoding - google-oauth2 - google-oauth2-easy - google-search + - google-static-maps - google-translate - GoogleCodeJam - GoogleDirections @@ -4904,6 +5201,7 @@ broken-packages: - GotoT-transformers - gotta-go-fast - gpah + - GPipe - GPipe-Collada - GPipe-Examples - GPipe-GLFW @@ -4912,6 +5210,8 @@ broken-packages: - gps2htmlReport - GPX - gpx-conduit + - grab + - grab-form - graceful - graflog - Grafos @@ -4946,7 +5246,9 @@ broken-packages: - graphics-formats-collada - graphicsFormats - graphicstools - - graphql-w-persistent + - graphite + - graphql + - graphql-api - graphtype - graql - grasp @@ -4968,6 +5270,7 @@ broken-packages: - group-with - growler - GrowlNotify + - grpc-api-etcd - grpc-etcd-client - gruff - gruff-examples @@ -4979,8 +5282,6 @@ broken-packages: - GTALib - gtfs - gtk-serialized-event - - gtk-sni-tray - - gtk-strut - gtk-toy - gtk2hs-hello - gtk2hs-rpn @@ -5053,12 +5354,15 @@ broken-packages: - hahp - haiji - hail + - hailgun - hailgun-send + - hailgun-simple - hairy - hakaru - hakismet - hakka - hako + - hakyll - hakyll-agda - hakyll-blaze-templates - hakyll-contrib @@ -5068,9 +5372,15 @@ broken-packages: - hakyll-contrib-links - hakyll-convert - hakyll-dhall + - hakyll-dir-list + - hakyll-favicon - hakyll-filestore + - hakyll-images - hakyll-ogmarkup - hakyll-R + - hakyll-sass + - hakyll-series + - hakyll-shakespeare - hakyll-shortcode - hakyll-shortcut-links - halberd @@ -5116,20 +5426,25 @@ broken-packages: - happstack-data - happstack-dlg - happstack-facebook + - happstack-fastcgi - happstack-fay - happstack-fay-ajax - happstack-foundation - happstack-hamlet - happstack-heist - happstack-helpers + - happstack-hsp - happstack-hstringtemplate - happstack-ixset - happstack-jmacro - happstack-lite - happstack-monad-peel - happstack-plugins + - happstack-server + - happstack-server-tls - happstack-server-tls-cryptonite - happstack-state + - happstack-static-routing - happstack-util - happstack-yui - happy-meta @@ -5159,6 +5474,7 @@ broken-packages: - Haschoo - HasGP - hash + - hash-store - hashable-extras - hashable-generics - hashabler @@ -5185,7 +5501,6 @@ broken-packages: - haskell-cnc - haskell-coffee - haskell-compression - - haskell-conll - haskell-course-preludes - haskell-disque - haskell-eigen-util @@ -5194,6 +5509,7 @@ broken-packages: - haskell-generate - haskell-go-checkers - haskell-holes-th + - haskell-import-graph - haskell-in-space - haskell-kubernetes - haskell-lsp-client @@ -5215,7 +5531,6 @@ broken-packages: - haskell-src-exts-prisms - haskell-src-exts-qq - haskell-src-exts-sc - - haskell-src-exts-simple - haskell-src-meta-mwotton - haskell-stack-trace-plugin - haskell-token-utils @@ -5259,6 +5574,8 @@ broken-packages: - haskelldb-th - haskelldb-wx - HaskellLM + - HaskellNet + - HaskellNet-SSL - HaskellNN - Haskelloids - haskellscrabble @@ -5301,6 +5618,7 @@ broken-packages: - haskus-system-build - haskus-utils - haskus-utils-compat + - haskus-utils-variant - haskus-web - haslo - hasloGUI @@ -5308,7 +5626,6 @@ broken-packages: - hasql-backend - hasql-class - hasql-cursor-query - - hasql-cursor-transaction - hasql-dynamic-statements - hasql-generic - hasql-implicits @@ -5331,7 +5648,6 @@ broken-packages: - HaTeX-qq - hats - hatt - - haven - haverer - HaVSA - hawitter @@ -5373,8 +5689,8 @@ broken-packages: - hdaemonize-buildfix - hdbc-aeson - HDBC-mysql - - hdbc-postgresql-hstore - HDBC-postgresql-hstore + - hdbc-postgresql-hstore - hdbi - hdbi-conduit - hdbi-postgresql @@ -5396,14 +5712,14 @@ broken-packages: - heartbeat-streams - heatitup - heatitup-complete + - heavy-logger-amazon - hecc - heckle - hedgehog-checkers - hedgehog-checkers-lens - hedgehog-classes - - hedgehog-fn - hedgehog-gen-json - - hedgehog-quickcheck + - hedgehog-generic - Hedi - hedis-config - hedis-pile @@ -5462,6 +5778,7 @@ broken-packages: - hexquote - hext - heyefi + - heyting-algebras - hF2 - hfann - hfd @@ -5486,6 +5803,7 @@ broken-packages: - hgis - hgithub - HGL + - hgmp - hgom - hgopher - HGraphStorage @@ -5494,7 +5812,6 @@ broken-packages: - hgrib - hharp - HHDL - - hi-file-parser - hi3status - hiccup - hichi @@ -5507,6 +5824,7 @@ broken-packages: - hierarchy - hiernotify - Hieroglyph + - higgledy - HiggsSet - higherorder - highjson @@ -5524,6 +5842,7 @@ broken-packages: - hinstaller - hint-server - hinter + - hinterface - hinvaders - hinze-streams - hipbot @@ -5551,7 +5870,6 @@ broken-packages: - hjsonschema - hjugement-cli - HJVM - - hkgr - hlatex - hlbfgsb - hlcm @@ -5560,6 +5878,7 @@ broken-packages: - HLearn-classification - HLearn-datastructures - HLearn-distributions + - hledger-api - hledger-chart - hledger-flow - hledger-irr @@ -5569,14 +5888,16 @@ broken-packages: - hlibfam - HList - HListPP - - hlogger + - hlivy - HLogger + - hlogger - hlongurl - hls - hlwm - hly - hmark - hmarkup + - hmatrix-backprop - hmatrix-banded - hmatrix-mmap - hmatrix-morpheus @@ -5584,6 +5905,7 @@ broken-packages: - hmatrix-sparse - hmatrix-static - hmatrix-sundials + - hmatrix-svdlibc - hmatrix-syntax - hmatrix-tests - hmeap @@ -5591,8 +5913,8 @@ broken-packages: - hmenu - hmep - hmk - - hmm - HMM + - hmm - hmm-hmatrix - hmm-lapack - hMollom @@ -5600,6 +5922,9 @@ broken-packages: - Hmpf - hmt-diagrams - hmumps + - hnetcdf + - hnix + - hnix-store-remote - HNM - hnormalise - ho-rewriting @@ -5648,6 +5973,7 @@ broken-packages: - hoovie - hopencc - hopencl + - hopenpgp-tools - hopfield - hoppy-docs - hoppy-generator @@ -5667,6 +5993,7 @@ broken-packages: - hp2any-graph - hp2any-manager - hpack-convert + - hpack-dhall - hpaco - hpaco-lib - hpage @@ -5681,12 +6008,14 @@ broken-packages: - hpdft - hpg - HPi + - hpio - hplaylist - HPlot - hpodder - HPong - hpqtypes - hpqtypes-extras + - hprotoc - hprotoc-fork - hprox - hps @@ -5701,8 +6030,8 @@ broken-packages: - hR - hranker - HRay - - hricket - Hricket + - hricket - hriemann - HROOT - HROOT-core @@ -5749,6 +6078,7 @@ broken-packages: - hsbencher - hsbencher-codespeed - hsbencher-fusion + - hsc2hs - hsc3-auditor - hsc3-cairo - hsc3-data @@ -5874,6 +6204,7 @@ broken-packages: - hsx - hsx-jmacro - hsx-xhtml + - hsx2hs - hsXenCtrl - HsYAML-aeson - hsyscall @@ -5892,6 +6223,8 @@ broken-packages: - html-kure - html-rules - html-tokenizer + - htoml + - htoml-megaparsec - hts - htsn - htsn-import @@ -5899,18 +6232,16 @@ broken-packages: - http-client-auth - http-client-lens - http-client-request-modifiers + - http-client-restricted - http-client-session - http-client-streams - http-conduit-browser - - http-conduit-downloader - http-directory - http-dispatch - - http-download - http-enumerator - http-grammar - http-kinder - http-monad - - http-pony - http-pony-serve-wai - http-proxy - http-querystring @@ -5919,7 +6250,6 @@ broken-packages: - http-streams - http-wget - http2-client-grpc - - http2-grpc-types - https-everywhere-rules - https-everywhere-rules-raw - httpspec @@ -5944,7 +6274,6 @@ broken-packages: - hunspell-hs - hunt-searchengine - hunt-server - - hup - hurdle - hurriyet - husk-scheme @@ -5956,6 +6285,7 @@ broken-packages: - hVOIDP - hw-balancedparens - hw-bits + - hw-ci-assist - hw-dsv - hw-dump - hw-eliasfano @@ -5995,8 +6325,8 @@ broken-packages: - hybrid - hydra-hs - hydra-print - - hydrogen - Hydrogen + - hydrogen - hydrogen-cli - hydrogen-cli-args - hydrogen-data @@ -6028,6 +6358,7 @@ broken-packages: - ical - iCalendar - IcoGrid + - iconv-typed - ide-backend - ide-backend-common - ide-backend-server @@ -6073,7 +6404,6 @@ broken-packages: - imap - imapget - imbib - - imgur - imgurder - imj-animation - imj-base @@ -6085,6 +6415,7 @@ broken-packages: - imperative-edsl - imperative-edsl-vhdl - ImperativeHaskell + - impl - implicit-logging - implicit-params - importify @@ -6111,11 +6442,11 @@ broken-packages: - InfixApplicative - inflist - informative + - ini-qq - inilist - inject-function - inline-java - inserts - - inspection-proxy - inspector-wrecker - instana-haskell-trace-sdk - instant-aeson @@ -6144,11 +6475,13 @@ broken-packages: - invertible-hlist - io-capture - io-reactive + - ion - IOR - IORefCAS - iostring - iothread - iotransaction + - ip - ip2location - ip2proxy - ipatch @@ -6190,7 +6523,16 @@ broken-packages: - iterIO - iterio-server - ivor + - ivory + - ivory-backend-c - ivory-bitdata + - ivory-eval + - ivory-examples + - ivory-hw + - ivory-opts + - ivory-quickcheck + - ivory-serialize + - ivory-stdlib - ivy-web - ixdopp - ixmonad @@ -6198,8 +6540,8 @@ broken-packages: - iyql - j2hs - jack-bindings - - jackminimix - JackMiniMix + - jackminimix - jacobi-roots - jaeger-flamegraph - jail @@ -6213,10 +6555,10 @@ broken-packages: - java-character - java-reflect - javascript-extras - - javasf - Javasf - - javav + - javasf - Javav + - javav - jbi - jcdecaux-vls - Jdh @@ -6244,7 +6586,6 @@ broken-packages: - jsaddle-wkwebview - JsContracts - jsmw - - json-api - json-api-lib - json-ast-json-encoder - json-ast-quickcheck @@ -6269,7 +6610,6 @@ broken-packages: - JSONb - jsonextfilter - JsonGrammar - - jsonpath - jsonresume - jsonrpc-conduit - jsons-to-schema @@ -6281,6 +6621,7 @@ broken-packages: - judge - judy - juicy-gcode + - JuicyPixels-blp - JuicyPixels-canvas - JunkDB - JunkDB-driver-gdbm @@ -6297,8 +6638,8 @@ broken-packages: - kademlia - kafka-client - kaleidoscope - - kalman - Kalman + - kalman - kangaroo - kansas-lava - kansas-lava-cores @@ -6306,14 +6647,15 @@ broken-packages: - kansas-lava-shake - karakuri - karps - - katip-datadog - katip-elasticsearch - - katip-logzio + - katip-kafka - katip-rollbar - katip-scalyr-scribe - katip-syslog - katt + - katydid - kawaii + - kawhi - kd-tree - kdesrc-build-extra - keccak @@ -6339,6 +6681,7 @@ broken-packages: - keyring - keysafe - keystore + - keyvaluehash - keyword-args - khph - kicad-data @@ -6346,7 +6689,6 @@ broken-packages: - kickchan - kif-parser - kit - - kleene - kmeans-par - kmeans-vector - kmp-dfa @@ -6355,6 +6697,7 @@ broken-packages: - knit-haskell - knots - koellner-phonetic + - kontra-config - korfu - kqueue - krapsh @@ -6367,6 +6710,7 @@ broken-packages: - kubernetes-client-core - kure - kure-your-boilerplate + - kurita - KyotoCabinet - l-bfgs-b - L-seed @@ -6418,7 +6762,6 @@ broken-packages: - LambdaShell - lambdatex - lambdatwit - - Lambdaya - lambdaya-bus - lambdiff - lame @@ -6484,11 +6827,11 @@ broken-packages: - lazy-hash-cache - lazy-io-streams - lazyarray + - lazyboy - lazyset - LazyVault - ld-intervals - lda - - ldap-client - ldapply - ldif - leaf @@ -6564,13 +6907,15 @@ broken-packages: - limp-cbc - linda - linden - - line-drawing + - line-bot-sdk - linear-algebra-cblas - linear-circuit - linear-code - linear-maps - linear-opengl + - linear-socket - linear-vect + - linearEqSolver - linearmap-category - linearscan - linearscan-hoopl @@ -6581,6 +6926,7 @@ broken-packages: - linkcore - linked-list-with-iterator - linkedhashmap + - linode - linode-v4 - linux-blkid - linux-cgroup @@ -6603,10 +6949,12 @@ broken-packages: - list-t-html-parser - list-t-http-client - list-t-text + - list-witnesses - list-zipper - listenbrainz-client - listlike-instances - ListT + - liszt - lit - literals - live-sequencer @@ -6691,6 +7039,7 @@ broken-packages: - LslPlus - lsp-test - lsystem + - ltext - ltk - lua-bc - luachunk @@ -6719,17 +7068,20 @@ broken-packages: - machines-amazonka - machines-process - machines-zlib + - mackerel-client - maclight - macos-corelibs - macosx-make-standalone - madlang - mage - magic-wormhole + - magicbane - MagicHaskeller - magico - magma - mahoro - maid + - mail-pool - mailbox-count - mailchimp - mailchimp-subscribe @@ -6765,6 +7117,7 @@ broken-packages: - map-exts - map-reduce-folds - map-syntax + - mapalgebra - Mapping - mappy - marionetta @@ -6772,6 +7125,7 @@ broken-packages: - markdown-pap - markdown2svg - marked-pretty + - markov-chain-usage-model - markov-processes - markov-realization - markup @@ -6783,12 +7137,16 @@ broken-packages: - marxup - masakazu-bot - MASMGen + - massiv + - massiv-io - massiv-test - master-plan + - matchable-th - matchers - math-grads - mathblog - mathflow + - mathgenealogy - mathlink - matplotlib - matrix-as-xyz @@ -6806,6 +7164,7 @@ broken-packages: - MazesOfMonad - MBot - mbox-tools + - mbug - MC-Fold-DP - mcl - mcm @@ -6823,19 +7182,20 @@ broken-packages: - mecab - mech - Mecha - - mechs - Mechs + - mechs - med-module - mediabus - mediabus-fdk-aac - mediabus-rtp - mediawiki + - mediawiki2latex - medium-sdk-haskell + - mega-sdist - mellon-core - mellon-gpio - mellon-web - melody - - membrain - memcache-conduit - memcache-haskell - memcached-binary @@ -6876,8 +7236,10 @@ broken-packages: - microgroove - microlens-each - micrologger + - microsoft-translator - MicrosoftTranslator - mida + - midi-simple - midi-utils - midimory - midisurface @@ -6888,6 +7250,7 @@ broken-packages: - mikrokosmos - miku - mime-directory + - min-max-pqueue - minecraft-data - minesweeper - miniforth @@ -6904,6 +7267,7 @@ broken-packages: - mios - mirror-tweet - miso-action-logger + - miso-examples - miss - miss-porcelain - missing-py2 @@ -6915,9 +7279,6 @@ broken-packages: - ml-w - mlist - mltool - - mmark - - mmark-cli - - mmark-ext - mmtf - mmtl - mmtl-base @@ -6932,15 +7293,14 @@ broken-packages: - module-management - modulespection - modulo - - moe - Moe + - moe - MoeDict - mohws - mole - mollie-api-haskell - monad-atom - monad-atom-simple - - monad-chronicle - monad-codec - monad-dijkstra - monad-exception @@ -7016,7 +7376,6 @@ broken-packages: - morphisms-objects - morte - mosaico-lib - - moss - mount - movie-monad - mp @@ -7034,6 +7393,8 @@ broken-packages: - mrifk - mrm - ms + - msgpack + - msgpack-aeson - msgpack-idl - msgpack-rpc - msh @@ -7129,9 +7490,11 @@ broken-packages: - nanovg - nanovg-simple - nanq + - NaperianNetCDF - narc - nat-sized-numbers - nationstates + - nats-queue - natural - natural-number - naver-translate @@ -7154,6 +7517,9 @@ broken-packages: - nested-sequence - NestedFunctor - nestedmap + - net-mqtt + - net-spider + - net-spider-cli - net-spider-pangraph - net-spider-rpl - netclock @@ -7172,7 +7538,8 @@ broken-packages: - network-address - network-anonymous-i2p - network-anonymous-tor - - network-bsd + - network-api-support + - network-arbitrary - network-builder - network-bytestring - network-connection @@ -7188,17 +7555,14 @@ broken-packages: - network-run - network-server - network-service - - network-simple - network-simple-sockaddr - - network-simple-tls - - network-simple-ws - - network-simple-wss - network-stream - network-topic-models - network-transport-amqp - network-transport-inmemory - network-transport-tcp - network-transport-tests + - network-uri-json - network-voicetext - network-wai-router - network-websocket @@ -7228,12 +7592,12 @@ broken-packages: - nitro - niv - nixfromnpm - - nixpkgs-update - nkjp - nlp-scores - nlp-scores-scripts - nm - NMap + - nn - nntp - no-role-annots - noether @@ -7247,13 +7611,12 @@ broken-packages: - Nomyx-Web - non-empty-zipper - NonEmpty - - nonempty-containers + - nonempty-lift - NonEmptyList - normalization-insensitive - NoSlow - not-gloss-examples - notcpp - - notifications-tray-icon - notmuch-haskell - notmuch-web - np-linear @@ -7298,6 +7661,7 @@ broken-packages: - objectid - ObjectIO - objective + - oblivious-transfer - ocaml-export - octane - octohat @@ -7318,8 +7682,8 @@ broken-packages: - olwrapper - omaketex - ombra - - omega - Omega + - omega - omnifmt - on-a-horse - onama @@ -7334,6 +7698,7 @@ broken-packages: - open-haddock - open-pandoc - open-signals + - open-typerep - OpenAFP - OpenAFP-Utils - openapi-petstore @@ -7347,6 +7712,7 @@ broken-packages: - OpenSCAD - opensoundcontrol-ht - openssh-github-keys + - openssh-protocol - opentheory-char - opentok - opentype @@ -7355,6 +7721,8 @@ broken-packages: - openweathermap - Operads - operational-extra + - opml-conduit + - opn - optima - optimal-blocks - optimization @@ -7362,7 +7730,6 @@ broken-packages: - optional - options-time - optparse-applicative-simple - - optparse-enum - orc - orchestrate - OrchestrateDB @@ -7399,26 +7766,32 @@ broken-packages: - packed-dawg - packed-multikey-map - packedstring + - packer-messagepack - packman - packunused - pacman-memcache - padKONTROL + - pads-haskell - pagarme - PageIO - pagure-hook-receiver - Paillier + - pairing - pam - panda + - pandoc-emphasize-code - pandoc-include + - pandoc-include-code - pandoc-japanese-filters - pandoc-lens + - pandoc-markdown-ghci-filter - pandoc-plantuml-diagrams + - pandoc-pyplot - pandoc-unlit - PandocAgda - pang-a-lambda - pangraph - panpipe - - pantry - pantry-tmp - papa-export - papa-implement @@ -7437,7 +7810,7 @@ broken-packages: - Parallel-Arrows-Eden - parallel-tasks - parameterized - - paramtree + - parameterized-utils - paranoia - parco - parco-attoparsec @@ -7502,6 +7875,7 @@ broken-packages: - pedestrian-dag - peg - peggy + - pell - penny - penny-bin - penny-lib @@ -7511,8 +7885,9 @@ broken-packages: - peregrin - perf - perf-analysis - - perfecthash + - perfect-vector-shuffle - PerfectHash + - perfecthash - perhaps - periodic - perm @@ -7534,10 +7909,8 @@ broken-packages: - persistent-protobuf - persistent-ratelimit - persistent-refs - - persistent-relational-record - persistent-template-classy - persistent-test - - persistent-typed-db - persistent-vector - persistent-zookeeper - persona @@ -7576,11 +7949,13 @@ broken-packages: - pier-core - piet - pig + - pinboard-notes-backup - pinchot - ping - pinpon - Pipe - pipe-enumerator + - piped - pipes-async - pipes-attoparsec-streaming - pipes-bgzf @@ -7597,9 +7972,6 @@ broken-packages: - pipes-illumina - pipes-io - pipes-key-value-csv - - pipes-network - - pipes-network-tls - - pipes-network-ws - pipes-p2p - pipes-p2p-examples - pipes-protolude @@ -7630,7 +8002,6 @@ broken-packages: - plat - platinum-parsing - PlayingCards - - plex - plist-buddy - plocketed - plot @@ -7653,7 +8024,6 @@ broken-packages: - pocket-dns - point-octree - pointfree-fancy - - pointful - pointless-lenses - pointless-rewrite - pokemon-go-protobuf-types @@ -7664,12 +8034,10 @@ broken-packages: - polh-lexicon - polimorf - Pollutocracy - - poly - poly-control - polydata - polydata-core - polynomial - - polysemy - polysemy-plugin - polysemy-RandomFu - polysemy-zoo @@ -7677,6 +8045,7 @@ broken-packages: - polysoup - polytypeable - polytypeable-utils + - pomaps - pomodoro - pomohoro - ponder @@ -7698,7 +8067,6 @@ broken-packages: - postgres-tmp - postgres-websockets - postgresql-copy-escape - - postgresql-lo-stream - postgresql-named - postgresql-query - postgresql-simple-bind @@ -7712,6 +8080,7 @@ broken-packages: - postgrest - postgrest-ws - postie + - postmark - postmark-streams - potato-tool - potoki @@ -7751,11 +8120,9 @@ broken-packages: - preview - prim-array - primes-type - - primitive-addr - primitive-atomic - primitive-checked - primitive-containers - - primitive-extras - primitive-indexed - primitive-simd - primitive-sort @@ -7782,7 +8149,6 @@ broken-packages: - procrastinating-variable - procstat - producer - - product - prof2dot - prof2pretty - progress @@ -7794,12 +8160,13 @@ broken-packages: - project-m36 - projectile - prolog-graph + - prolog-graph-lib + - prometheus - prometheus-effect - promise - pronounce - proof-combinators - propane - - propellor - Proper - properties - property-list @@ -7854,6 +8221,7 @@ broken-packages: - puzzle-draw - puzzle-draw-cmdline - pvd + - PyF - pyffi - pyfi - python-pickle @@ -7890,7 +8258,7 @@ broken-packages: - quick-schema - QuickAnnotate - quickbooks - - quickcheck-arbitrary-template + - quickcheck-combinators - quickcheck-poly - quickcheck-property-comb - quickcheck-property-monad @@ -7900,8 +8268,8 @@ broken-packages: - quickcheck-report - quickcheck-state-machine - quickcheck-state-machine-distributed + - quickcheck-string-random - quickcheck-webdriver - - quickcheck-with-counterexamples - QuickCheckVariant - QuickPlot - quickpull @@ -7926,6 +8294,7 @@ broken-packages: - radium - radium-formula-parser - radix + - radixtree - rados-haskell - raft - rail-compiler-editor @@ -7934,6 +8303,7 @@ broken-packages: - raketka - rakhana - rakuten + - ralist - rallod - raml - rand-vars @@ -7943,12 +8313,10 @@ broken-packages: - random-derive - random-eff - random-effin - - random-fu-multivariate - random-hypergeometric - random-stream - RandomDotOrg - Range - - range-set-list - range-space - rangemin - rank1dynamic @@ -7969,7 +8337,6 @@ broken-packages: - rasa-ext-vim - rascal - Rasenschach - - rating-chgk-info - rattle - rattletrap - raven-haskell-scotty @@ -7999,7 +8366,6 @@ broken-packages: - reactor - read-io - readline-statevar - - readme-lhs - readpyc - readshp - really-simple-xml-parser @@ -8021,13 +8387,14 @@ broken-packages: - reduce-equations - reedsolomon - reenact - - ref - Ref + - ref - ref-fd - ref-mtl - refcount - Referees - refh + - refined - reflection-extras - reflex - reflex-animation @@ -8039,6 +8406,9 @@ broken-packages: - reflex-orphans - reflex-sdl2 - reflex-transformers + - reflex-vty + - reform-happstack + - reform-hsp - reformat - refresht - refurb @@ -8075,6 +8445,8 @@ broken-packages: - reified-records - reify - relacion + - relapse + - relation - relational-postgresql8 - relative-date - reload @@ -8110,10 +8482,14 @@ broken-packages: - reprinter - reproject - req-conduit + - req-oauth2 + - req-url-extra + - reqcatcher - request-monad - require - reserve - reservoir + - resin - resistor-cube - resolve - resolve-trivial-conflicts @@ -8153,8 +8529,9 @@ broken-packages: - rfc-psql - rfc-redis - rfc-servant - - rfc1413-server + - rg - rhythm-game-tutorial + - rib - RichConditional - ridley - ridley-extras @@ -8162,7 +8539,6 @@ broken-packages: - riff - ring-buffer - ring-buffers - - rio-prettyprint - riot - risc386 - riscv-isa @@ -8174,6 +8550,7 @@ broken-packages: - rl-satton - Rlang-QQ - rlglue + - RLP - rlwe-challenges - rmonad - RMP @@ -8241,7 +8618,7 @@ broken-packages: - safe-json - safe-lazy-io - safe-length - - safe-money-xmlbf + - safe-money-store - safe-plugins - safe-printf - safecopy-store @@ -8254,7 +8631,6 @@ broken-packages: - sai-shape-syb - sajson - salak-toml - - salak-yaml - Salsa - saltine-quickcheck - salvia @@ -8282,14 +8658,15 @@ broken-packages: - savage - sax - SBench + - sbv - sbvPlugin - sc2-lowlevel - sc2-proto - sc3-rdu - scalable-server - scaleimage - - scalendar - SCalendar + - scalendar - scalp-webhooks - scan-metadata - scan-vector-machine @@ -8303,7 +8680,6 @@ broken-packages: - scholdoc-citeproc - scholdoc-texmath - scholdoc-types - - SciBaseTypes - scidb-hquery - science-constants-dimensional - SciFlow @@ -8338,6 +8714,7 @@ broken-packages: - sde-solver - sdl2-cairo-image - sdl2-compositor + - sdl2-fps - sdr - seakale - seakale-postgresql @@ -8352,7 +8729,6 @@ broken-packages: - secret-sharing - secrm - sednaDBXML - - selda-json - selectors - SelectSequencesFromMSA - selenium @@ -8361,8 +8737,7 @@ broken-packages: - Semantique - semdoc - semi-iso - - semialign - - semialign-indexed + - semibounded-lattices - Semigroup - semigroupoids-syntax - semigroups-actions @@ -8398,6 +8773,7 @@ broken-packages: - servant-auth-token-leveldb - servant-auth-token-persistent - servant-auth-token-rocksdb + - servant-checked-exceptions - servant-cli - servant-client-namedargs - servant-csharp @@ -8405,10 +8781,10 @@ broken-packages: - servant-db-postgresql - servant-dhall - servant-examples + - servant-exceptions - servant-generate - servant-generic - servant-github - - servant-github-webhook - servant-haxl-client - servant-hmac-auth - servant-http-streams @@ -8418,12 +8794,15 @@ broken-packages: - servant-matrix-param - servant-namedargs - servant-nix + - servant-pandoc - servant-pool - servant-postgresql - servant-proto-lens + - servant-purescript - servant-pushbullet-client - servant-py - servant-quickcheck + - servant-rawm - servant-reason - servant-reflex - servant-router @@ -8431,10 +8810,15 @@ broken-packages: - servant-server-namedargs - servant-smsc-ru - servant-snap + - servant-static-th + - servant-streaming - servant-streaming-client - servant-streaming-docs - servant-streaming-server + - servant-subscriber + - servant-swagger-tags - servant-waargonaut + - servant-websockets - servant-xml - servant-zeppelin - servant-zeppelin-client @@ -8442,6 +8826,7 @@ broken-packages: - servant-zeppelin-swagger - server-generic - serverless-haskell + - serversession-backend-redis - serversession-frontend-snap - serversession-frontend-yesod - services @@ -8451,7 +8836,6 @@ broken-packages: - sessions - sessiontypes - sessiontypes-distributed - - set-cover - set-with - setdown - setgame @@ -8466,6 +8850,7 @@ broken-packages: - sfnt2woff - SFont - SG + - sgd - SGdemo - sgf - SGplus @@ -8511,13 +8896,14 @@ broken-packages: - sibe - sifflet - sifflet-lib + - siggy-chardust - sigma-ij + - sign - signals - signed-multiset - silvi - simd - simgi - - simple - simple-actors - simple-affine-space - simple-atom @@ -8538,13 +8924,10 @@ broken-packages: - simple-nix - simple-pascal - simple-pipe - - simple-postgresql-orm - simple-rope - - simple-session + - simple-src-utils - simple-tabular - simple-tar - - simple-templates - - simple-units - simple-vec3 - simple-zipper - simpleargs @@ -8582,6 +8965,7 @@ broken-packages: - skylark-client - skype4hs - slack + - slate - slave-thread - slidemews - Slides @@ -8620,6 +9004,7 @@ broken-packages: - snake - snake-game - snap + - snap-accept - snap-auth-cli - snap-blaze-clay - snap-configuration-utilities @@ -8720,6 +9105,7 @@ broken-packages: - sparrow - sparse - sparse-lin-alg + - sparse-tensor - sparsebit - sparsecheck - sparser @@ -8743,11 +9129,15 @@ broken-packages: - splay - splaytree - splines + - split-morphism - splitter - splot - Spock - Spock-api-ghcjs + - Spock-api-server - Spock-auth + - Spock-core + - Spock-digestive - Spock-lucid - Spock-worker - spoonutil @@ -8768,7 +9158,6 @@ broken-packages: - sqlvalue-list - sqsd-local - squeal-postgresql - - squeeze - srcinst - sscan - sscgi @@ -8806,6 +9195,7 @@ broken-packages: - stackage-types - stackage-upload - stackage2nix + - stacked-dag - standalone-derive-topdown - starling - stash @@ -8837,6 +9227,7 @@ broken-packages: - stemmer - stemmer-german - stepwise + - stern-brocot - stgi - stm-chunked-queues - stm-containers @@ -8845,6 +9236,7 @@ broken-packages: - stm-io-hooks - stm-promise - stm-stats + - stm-supply - stmcontrol - stochastic - Stomp @@ -8859,8 +9251,6 @@ broken-packages: - stratum-tool - stratux - stratux-demo - - stratux-http - - stratux-types - stratux-websockets - stream - stream-fusion @@ -8871,12 +9261,10 @@ broken-packages: - streaming-cassava - streaming-conduit - streaming-fft - - streaming-lzma - streaming-png - streaming-postgresql-simple - streaming-process - streaming-sort - - streaming-utils - strelka - strict-data - StrictBench @@ -8890,13 +9278,16 @@ broken-packages: - stripe-haskell - stripe-http-client - stripe-http-streams + - stripe-tests - structural-induction - structural-traversal - structured-mongoDB - structures - stt - stunts + - stylist - stylized + - suavemente - sub-state - subhask - subleq-toolchain @@ -8917,6 +9308,7 @@ broken-packages: - sunroof-server - super-user-spark - superbubbles + - superbuffer - supercollider-ht - supercollider-midi - superconstraints @@ -8924,6 +9316,7 @@ broken-packages: - supermonad - supero - supervisor + - supervisors - supplemented - surjective - sv @@ -8931,8 +9324,8 @@ broken-packages: - SVD2HS - svfactor - svg-builder-fork - - svg2q - SVG2Q + - svg2q - svgutils - svm-simple - svndump @@ -8949,16 +9342,14 @@ broken-packages: - sylvia - sym - sym-plot - - symantic - - symantic-cli - symantic-http-test - - symantic-lib - symantic-xml - symengine - symengine-hs - sync - sync-mht - syncthing-hs + - syntactic - syntax - syntax-attoparsec - syntax-example @@ -8985,15 +9376,15 @@ broken-packages: - t3-server - ta - table + - table-layout - table-tennis - tableaux - - tables - Tables + - tables - tablestorage - Tablify - tabloid - tabs - - taffybar - tag-bits - tag-stream - tagged-exception-core @@ -9003,9 +9394,9 @@ broken-packages: - taglib-api - tagsoup-ht - tagsoup-megaparsec + - tagsoup-navigate - tagsoup-parsec - tagsoup-selection - - tai - tai64 - takahashi - Takusen @@ -9032,7 +9423,7 @@ broken-packages: - tasty-lens - tasty-stats - tasty-tap - - tasty-travis + - Taxonomy - TaxonomyTools - TBC - TBit @@ -9070,7 +9461,6 @@ broken-packages: - tensorflow-opgen - tensorflow-ops - tensorflow-proto - - termbox-banana - termbox-bindings - terminal-punch - terminal-text @@ -9107,7 +9497,6 @@ broken-packages: - text-containers - text-generic-pretty - text-icu-normalized - - text-icu-translit - text-lens - text-locale-encoding - text-markup @@ -9115,11 +9504,12 @@ broken-packages: - text-plus - text-position - text-register-machine - - text-show-instances + - text-replace - text-time - text-utf8 - text-xml-qq - text-zipper-monad + - text1 - textmatetags - textocat-api - textual @@ -9145,7 +9535,6 @@ broken-packages: - Theora - theoremquest - theoremquest-client - - these-lens - these-skinny - thih - thimk @@ -9158,6 +9547,7 @@ broken-packages: - thrift - throttled-io-loop - through-text + - throwable-exceptions - thumbnail-plus - tic-tac-toe - tickle @@ -9193,6 +9583,7 @@ broken-packages: - timers-tick - timeseries - timespan + - timeutils - timezone-unix - tintin - tiny-scheduler @@ -9225,10 +9616,11 @@ broken-packages: - tomato-rubato-openal - toml - tomland + - tomlcheck - too-many-cells - toodles - - top - Top + - top - topkata - torch - TORCS @@ -9240,7 +9632,6 @@ broken-packages: - toysolver - tpar - tpb - - tpdb - trace - trace-call - trace-function-call @@ -9268,7 +9659,11 @@ broken-packages: - translatable-intset - translate - translate-cli + - trasa + - trasa-client - trasa-extra + - trasa-form + - trasa-server - trasa-th - travis - travis-meta-yaml @@ -9298,6 +9693,7 @@ broken-packages: - TrieMap - tries - trigger + - trim - trimpolya - tripLL - trivia @@ -9342,8 +9738,11 @@ broken-packages: - twill - twine - twitter + - twitter-conduit - twitter-enumerator - twitter-feed + - twitter-types + - twitter-types-lens - tx - txt - txtblk @@ -9358,7 +9757,6 @@ broken-packages: - type-combinators-singletons - type-digits - type-eq - - type-errors - type-indexed-queues - type-int - type-interpreter @@ -9390,6 +9788,7 @@ broken-packages: - types-compat - typesafe-precure - typescript-docs + - typograffiti - typography-geometry - tyro - u2f @@ -9401,7 +9800,6 @@ broken-packages: - uhc-light - uhc-util - uhexdump - - uhttpc - ui-command - UMM - unagi-bloomfilter @@ -9411,27 +9809,29 @@ broken-packages: - unbounded-delays-units - unboxed-containers - unbreak + - unfoldable + - unfoldable-restricted - uni-graphs - uni-uDrawGraph - unicode-normalization - unicode-show - unicode-symbols - uniform-io + - union - union-map + - Unique - uniqueid - uniquely-represented-sets - units-attoparsec - unittyped - unity-testresult-parser - unitym-yesod - - universe - - universe-dependent-sum - - universe-instances-extended - universe-th - universum - unix-fcntl - unix-handle - unix-process-conduit + - unjson - unm-hip - unordered-containers-rematch - unordered-graphs @@ -9478,6 +9878,7 @@ broken-packages: - usb-id-database - usb-iteratee - usb-safe + - userid - users-mysql-haskell - users-persistent - utc @@ -9487,6 +9888,7 @@ broken-packages: - util-exception - util-primitive - util-primitive-control + - util-universe - uu-cco - uu-cco-examples - uu-cco-hut-parsing @@ -9500,6 +9902,7 @@ broken-packages: - uxadt - v4l2 - v4l2-examples + - vabal - vacuum - vacuum-cairo - vacuum-graphviz @@ -9507,7 +9910,6 @@ broken-packages: - vacuum-ubigraph - valid-names - validate-input - - validated-literals - validated-types - Validation - validations @@ -9541,6 +9943,7 @@ broken-packages: - vector-instances-collections - vector-random - vector-read-instances + - vector-space-map - vector-space-opengl - vector-static - vectortiles @@ -9565,7 +9968,11 @@ broken-packages: - Villefort - vimus - vintage-basic + - vinyl + - vinyl-generics + - vinyl-gl - vinyl-json + - vinyl-named-sugar - vinyl-operational - vinyl-plus - vinyl-utils @@ -9626,6 +10033,7 @@ broken-packages: - wai-request-spec - wai-responsible - wai-router + - wai-routes - wai-routing - wai-secure-cookies - wai-session-alt @@ -9655,12 +10063,15 @@ broken-packages: - web-css - web-encodings - web-fpco + - web-inv-route - web-mongrel2 - web-output - web-page - web-push + - web-routes-happstack - web-routes-quasi - web-routes-regular + - web-routes-th - web-routes-transformers - web-routing - web3 @@ -9669,11 +10080,13 @@ broken-packages: - WebBits - WebBits-Html - WebBits-multiplate + - webby - webcloud - WebCont - webcrank - webcrank-dispatch - webcrank-wai + - webdriver-angular - webdriver-snoy - webdriver-w3c - WeberLogic @@ -9684,8 +10097,8 @@ broken-packages: - webserver - webshow - websockets-rpc + - websockets-simple - webwire - - weekdaze - weighted - weighted-regexp - welshy @@ -9700,6 +10113,7 @@ broken-packages: - whiskers - whitespace - why3 + - wide-word - WikimediaParser - wikipedia4epub - wild-bind-indicator @@ -9722,6 +10136,7 @@ broken-packages: - wobsurv - woffex - wolf + - word - word2vec-model - WordAlignment - wordify @@ -9768,7 +10183,6 @@ broken-packages: - wxSimpleCanvas - wxturtle - wyvern - - X - x-dsp - X11-extras - X11-rm @@ -9793,9 +10207,12 @@ broken-packages: - xkcd - xleb - xlsior + - xlsx + - xlsx-tabular - xlsx-templater - xml-catalog - xml-conduit-decode + - xml-conduit-stylist - xml-enumerator - xml-enumerator-combinators - xml-html-conduit-lens @@ -9811,7 +10228,7 @@ broken-packages: - xml-tydom-core - xml2json - xml2x - - xmlbf-xmlhtml + - xmlbf-xeno - XmlHtmlWriter - xmltv - XMMS @@ -9848,7 +10265,6 @@ broken-packages: - yajl - yajl-enumerator - yam-job - - yam-redis - yam-servant - yam-transaction-odbc - yam-web @@ -9909,6 +10325,7 @@ broken-packages: - yesod-dsl - yesod-examples - yesod-fast-devel + - yesod-fay - yesod-form-richtext - yesod-gitrev - yesod-goodies @@ -9942,6 +10359,7 @@ broken-packages: - yesod-tls - yesod-vend - yesod-worker + - yet-another-logger - YFrob - yggdrasil - yhccore @@ -9949,6 +10367,7 @@ broken-packages: - yi-contrib - yi-core - yi-dynamic-configuration + - yi-emacs-colours - yi-frontend-pango - yi-frontend-vty - yi-fuzzy-open @@ -9956,6 +10375,7 @@ broken-packages: - yi-keymap-cua - yi-keymap-emacs - yi-keymap-vim + - yi-language - yi-misc-modes - yi-mode-haskell - yi-mode-javascript @@ -10022,6 +10442,7 @@ broken-packages: - zoom-cache-pcm - zoom-cache-sndfile - zoom-refs + - Zora - zre - zsh-battery - zsyntax diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 23cbf15e51b..e5bd0e26408 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -95,6 +95,7 @@ self: super: builtins.intersectAttrs super { sfml-audio = appendConfigureFlag super.sfml-audio "--extra-include-dirs=${pkgs.openal}/include/AL"; cachix = enableSeparateBinOutput super.cachix; + ghcid = enableSeparateBinOutput super.ghcid; hzk = overrideCabal super.hzk (drv: { preConfigure = "sed -i -e /include-dirs/d hzk.cabal"; @@ -279,10 +280,7 @@ self: super: builtins.intersectAttrs super { let dontCheckDarwin = if pkgs.stdenv.isDarwin then dontCheck else pkgs.lib.id; - in dontCheckDarwin (super.llvm-hs.override { - llvm-config = pkgs.llvm_8; - llvm-hs-pure = super.llvm-hs-pure_8_0_0; - }); + in dontCheckDarwin (super.llvm-hs.override { llvm-config = pkgs.llvm_8; }); # Needs help finding LLVM. spaceprobe = addBuildTool super.spaceprobe self.llvmPackages.llvm; @@ -506,6 +504,12 @@ self: super: builtins.intersectAttrs super { ''; }); + # Break infinite recursion cycle between QuickCheck and splitmix. + splitmix = dontCheck super.splitmix; + + # Break infinite recursion cycle between tasty and clock. + clock = dontCheck super.clock; + # loc and loc-test depend on each other for testing. Break that infinite cycle: loc-test = super.loc-test.override { loc = dontCheck self.loc; }; @@ -585,5 +589,7 @@ self: super: builtins.intersectAttrs super { # Tests require internet dhall_1_25_0 = dontCheck super.dhall_1_25_0; + http-download = dontCheck super.http-download; + pantry = dontCheck super.pantry; } diff --git a/pkgs/development/haskell-modules/generic-stack-builder.nix b/pkgs/development/haskell-modules/generic-stack-builder.nix index 184d45eda44..96774f71730 100644 --- a/pkgs/development/haskell-modules/generic-stack-builder.nix +++ b/pkgs/development/haskell-modules/generic-stack-builder.nix @@ -2,6 +2,7 @@ , cacert, stack, makeSetupHook, lib }@depArgs: { buildInputs ? [] +, nativeBuildInputs ? [] , extraArgs ? [] , LD_LIBRARY_PATH ? [] , ghc ? depArgs.ghc @@ -22,7 +23,8 @@ in stdenv.mkDerivation (args // { buildInputs = buildInputs ++ lib.optional (stdenv.hostPlatform.libc == "glibc") glibcLocales; - nativeBuildInputs = [ ghc pkgconfig stack stackHook ]; + nativeBuildInputs = nativeBuildInputs + ++ [ ghc pkgconfig stack stackHook ]; STACK_PLATFORM_VARIANT = "nix"; STACK_IN_NIX_SHELL = 1; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index d5e5aa7ef56..740c49aac92 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -918,31 +918,6 @@ self: { }) {}; "Allure" = callPackage - ({ mkDerivation, async, base, containers, enummapset, filepath - , LambdaHack, optparse-applicative, random, template-haskell, text - , transformers, zlib - }: - mkDerivation { - pname = "Allure"; - version = "0.8.3.0"; - sha256 = "1yzqiidc8qbjlpgs2d3jkikzggyd7ajq7i7l1dgwqv6sh4r030vb"; - isLibrary = false; - isExecutable = true; - enableSeparateDataOutput = true; - executableHaskellDepends = [ - async base containers enummapset filepath LambdaHack - optparse-applicative random template-haskell text transformers zlib - ]; - testHaskellDepends = [ - base containers enummapset filepath LambdaHack optparse-applicative - random template-haskell text transformers zlib - ]; - description = "Near-future Sci-Fi roguelike and tactical squad game"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "Allure_0_9_5_0" = callPackage ({ mkDerivation, async, base, enummapset, filepath, ghc-compact , LambdaHack, optparse-applicative, primitive, random , template-haskell, text, transformers @@ -968,6 +943,7 @@ self: { description = "Near-future Sci-Fi roguelike and tactical squad combat game"; license = stdenv.lib.licenses.agpl3Plus; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "AndroidViewHierarchyImporter" = callPackage @@ -1585,8 +1561,6 @@ self: { ]; description = "European Nucleotide Archive data"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "BiobaseEnsembl" = callPackage @@ -1647,8 +1621,6 @@ self: { ]; description = "streaming FASTA parser"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "BiobaseHTTP" = callPackage @@ -1844,8 +1816,6 @@ self: { ]; description = "Collection of types for bioinformatics"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "BiobaseVienna" = callPackage @@ -1904,8 +1874,6 @@ self: { ]; description = "Efficient RNA/DNA/Protein Primary/Secondary Structure"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "BirdPP" = callPackage @@ -2683,6 +2651,35 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Cabal_3_0_0_0" = callPackage + ({ mkDerivation, array, base, base-compat, base-orphans, binary + , bytestring, containers, deepseq, Diff, directory, filepath + , integer-logarithms, mtl, optparse-applicative, parsec, pretty + , process, QuickCheck, stm, tagged, tar, tasty, tasty-golden + , tasty-hunit, tasty-quickcheck, temporary, text, time + , transformers, tree-diff, unix + }: + mkDerivation { + pname = "Cabal"; + version = "3.0.0.0"; + sha256 = "11yjd0cmqngi1yr7v0dr55n59rq78kk6121sr44abha0swkfqhsi"; + setupHaskellDepends = [ mtl parsec ]; + libraryHaskellDepends = [ + array base binary bytestring containers deepseq directory filepath + mtl parsec pretty process text time transformers unix + ]; + testHaskellDepends = [ + array base base-compat base-orphans binary bytestring containers + deepseq Diff directory filepath integer-logarithms + optparse-applicative pretty process QuickCheck stm tagged tar tasty + tasty-golden tasty-hunit tasty-quickcheck temporary text tree-diff + ]; + doCheck = false; + description = "A framework for packaging Haskell software"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Cabal-ide-backend" = callPackage ({ mkDerivation, array, base, binary, bytestring, Cabal, containers , deepseq, directory, extensible-exceptions, filepath, HUnit @@ -4168,6 +4165,8 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "A package for adding index column to data files"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "DataTreeView" = callPackage @@ -4189,6 +4188,19 @@ self: { broken = true; }) {}; + "DataVersion" = callPackage + ({ mkDerivation, base, generic-lens, hspec, microlens, QuickCheck + }: + mkDerivation { + pname = "DataVersion"; + version = "0.1.0.0"; + sha256 = "13cw7rzp510spn5ncxdqyzz66d9dnyq7s650zmpmjx2cg456zw9x"; + libraryHaskellDepends = [ base generic-lens microlens ]; + testHaskellDepends = [ base hspec QuickCheck ]; + description = "Type safe data migrations"; + license = stdenv.lib.licenses.mit; + }) {}; + "Deadpan-DDP" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , containers, doctest, filemanip, hashable, haskeline, lens, mtl @@ -5807,6 +5819,8 @@ self: { ]; description = "Finite totally-ordered sets"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Finance-Quote-Yahoo" = callPackage @@ -6203,6 +6217,8 @@ self: { benchmarkHaskellDepends = [ base criterion pipes transformers ]; description = "Data frames For working with tabular data files"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Frames-beam" = callPackage @@ -6589,6 +6605,8 @@ self: { ]; description = "Typesafe functional GPU graphics programming"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "GPipe-Collada" = callPackage @@ -6629,8 +6647,8 @@ self: { ({ mkDerivation, async, base, containers, GLFW-b, GPipe, stm }: mkDerivation { pname = "GPipe-GLFW"; - version = "1.4.1.1"; - sha256 = "1sr4dxc9bkfijaxvs7s94x5yfg14pb1r49fycwmzqkcycgz87n8q"; + version = "1.4.1.2"; + sha256 = "0i63pxz6bvzixjgi1hbipxhrg7nykd37zii555qhss2m7x4pydak"; enableSeparateDataOutput = true; libraryHaskellDepends = [ async base containers GLFW-b GPipe stm ]; description = "GLFW OpenGL context creation for GPipe"; @@ -7030,28 +7048,6 @@ self: { }: mkDerivation { pname = "Glob"; - version = "0.9.3"; - sha256 = "1s69lk3ic6zlkikhvb78ly9wl3g70a1h1m6ndhsca01pp8z8axrs"; - libraryHaskellDepends = [ - base containers directory dlist filepath transformers - transformers-compat - ]; - testHaskellDepends = [ - base containers directory dlist filepath HUnit QuickCheck - test-framework test-framework-hunit test-framework-quickcheck2 - transformers transformers-compat - ]; - description = "Globbing library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "Glob_0_10_0" = callPackage - ({ mkDerivation, base, containers, directory, dlist, filepath - , HUnit, QuickCheck, test-framework, test-framework-hunit - , test-framework-quickcheck2, transformers, transformers-compat - }: - mkDerivation { - pname = "Glob"; version = "0.10.0"; sha256 = "0953f91f62ncna402vsrfzdcyxhdpjna3bgdw017kad0dfymacs7"; revision = "1"; @@ -7067,7 +7063,6 @@ self: { ]; description = "Globbing library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "GlomeTrace" = callPackage @@ -9831,6 +9826,8 @@ self: { ]; description = "Client support for POP3, SMTP, and IMAP"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HaskellNet-SSL" = callPackage @@ -9847,6 +9844,8 @@ self: { ]; description = "Helpers to connect to SSL/TLS mail servers with HaskellNet"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HaskellTorrent" = callPackage @@ -10612,6 +10611,8 @@ self: { pname = "HsYAML-aeson"; version = "0.1.0.0"; sha256 = "1hf1gwa89ghd4aaim6g8dx9wppp6d1y0w1xiddm1r8lpfidca1nw"; + revision = "1"; + editedCabalFile = "1kf35mnvc2syly35c2ffl8xxcw4h6lxv9kqirzj2in1ms19df41y"; libraryHaskellDepends = [ aeson base bytestring HsYAML mtl text vector ]; @@ -11337,6 +11338,8 @@ self: { ]; description = "BLP format decoder/encoder over JuicyPixels library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "JuicyPixels-canvas" = callPackage @@ -11845,48 +11848,6 @@ self: { "LambdaHack" = callPackage ({ mkDerivation, assert-failure, async, base, base-compat, binary , bytestring, containers, deepseq, directory, enummapset, filepath - , ghc-prim, hashable, hsini, keys, miniutter, optparse-applicative - , pretty-show, random, sdl2, sdl2-ttf, stm, template-haskell, text - , time, transformers, unordered-containers, vector - , vector-binary-instances, zlib - }: - mkDerivation { - pname = "LambdaHack"; - version = "0.8.3.0"; - sha256 = "0v07c8v7l8yg111fysl735scsbsl9l6q3vzigy7rv05sjfl276ss"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - assert-failure async base base-compat binary bytestring containers - deepseq directory enummapset filepath ghc-prim hashable hsini keys - miniutter optparse-applicative pretty-show random sdl2 sdl2-ttf stm - text time transformers unordered-containers vector - vector-binary-instances zlib - ]; - executableHaskellDepends = [ - assert-failure async base base-compat binary bytestring containers - deepseq directory enummapset filepath ghc-prim hashable hsini keys - miniutter optparse-applicative pretty-show random stm - template-haskell text time transformers unordered-containers vector - vector-binary-instances zlib - ]; - testHaskellDepends = [ - assert-failure async base base-compat binary bytestring containers - deepseq directory enummapset filepath ghc-prim hashable hsini keys - miniutter optparse-applicative pretty-show random stm - template-haskell text time transformers unordered-containers vector - vector-binary-instances zlib - ]; - description = "A game engine library for tactical squad ASCII roguelike dungeon crawlers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "LambdaHack_0_9_5_0" = callPackage - ({ mkDerivation, assert-failure, async, base, base-compat, binary - , bytestring, containers, deepseq, directory, enummapset, filepath , ghc-compact, ghc-prim, hashable, hsini, keys, miniutter , optparse-applicative, pretty-show, primitive, random, sdl2 , sdl2-ttf, stm, template-haskell, text, time, transformers @@ -12027,8 +11988,6 @@ self: { ]; description = "Library for RedPitaya"; license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "LargeCardinalHierarchy" = callPackage @@ -12718,24 +12677,20 @@ self: { }) {}; "Map" = callPackage - ({ mkDerivation, base, containers, either-both, filtrable, map + ({ mkDerivation, base, containers, either-both, filtrable , smallcheck, tasty, tasty-smallcheck, util }: mkDerivation { pname = "Map"; - version = "0.0.0.0"; - sha256 = "1w79zzlzh3ivrqznvcrg5kgaizzs838y7hd52nvxn5v7lax5y3wz"; + version = "0.0.1.1"; + sha256 = "0m7654arnnm19assm0fvjm3m6jrq6pn54f9pqvcn09h6vawsbyza"; libraryHaskellDepends = [ base containers either-both filtrable util ]; - testHaskellDepends = [ - base map smallcheck tasty tasty-smallcheck - ]; + testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ]; description = "Class of key-value maps"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {map = null;}; + }) {}; "Mapping" = callPackage ({ mkDerivation, base }: @@ -13322,8 +13277,8 @@ self: { ({ mkDerivation, ansi-terminal, base, doctest, time }: mkDerivation { pname = "Monadoro"; - version = "0.2.1.1"; - sha256 = "0f7swjf5lr7w7gld46l74plc2x79v6dbq5zmsglpk1x8k7vpfj79"; + version = "0.2.1.5"; + sha256 = "1k4f7ks0cbyqz2g6y5kdzrlbx2j3xz7mrvj79k2m3lbhs4hcik6l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-terminal base time ]; @@ -13743,6 +13698,8 @@ self: { executableHaskellDepends = [ base hnetcdf Naperian split ]; description = "Instances of NcStore for hypercuboids"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "NaturalLanguageAlphabets" = callPackage @@ -15301,10 +15258,8 @@ self: { }: mkDerivation { pname = "Persistence"; - version = "2.0"; - sha256 = "0iwkvplldy6sznp33n5w5ink312cg6shh3qg98canz6j6hrspa8y"; - revision = "1"; - editedCabalFile = "063rizxqn44pzblj2nxyk3ia2zymryrqq55n081g21aih38n8xlr"; + version = "2.0.1"; + sha256 = "1qv35q7y7sl142dxdaf7647g62xr76b4blij0yn9x5694qm9r80v"; libraryHaskellDepends = [ base containers maximal-cliques parallel vector ]; @@ -15762,25 +15717,28 @@ self: { }) {}; "PyF" = callPackage - ({ mkDerivation, base, containers, deepseq, directory, filepath - , hashable, haskell-src-exts, haskell-src-meta, hspec, HUnit - , megaparsec, process, python3, template-haskell, temporary, text + ({ mkDerivation, base, bytestring, containers, deepseq, directory + , filepath, hashable, haskell-src-exts, haskell-src-meta, hspec + , HUnit, megaparsec, process, python3, template-haskell, temporary + , text }: mkDerivation { pname = "PyF"; - version = "0.7.3.0"; - sha256 = "17asilwlq7c8kj5jk0gm0pkfr2m65pgdspgx8hl0hwlp1wsg74yl"; + version = "0.8.0.0"; + sha256 = "0np08pyx5kd1wbnrxbzcbp6zryvh38iy2mbz1xbb6ldfmn98r78p"; libraryHaskellDepends = [ base containers haskell-src-exts haskell-src-meta megaparsec template-haskell text ]; testHaskellDepends = [ - base deepseq directory filepath hashable hspec HUnit process - template-haskell temporary text + base bytestring deepseq directory filepath hashable hspec HUnit + process template-haskell temporary text ]; testToolDepends = [ python3 ]; description = "Quasiquotations for a python like interpolated string formater"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) python3;}; "QIO" = callPackage @@ -15904,25 +15862,6 @@ self: { }) {}; "QuickCheck" = callPackage - ({ mkDerivation, base, containers, deepseq, erf, process, random - , template-haskell, tf-random, transformers - }: - mkDerivation { - pname = "QuickCheck"; - version = "2.12.6.1"; - sha256 = "0w51zbbvh46g3wllqfmx251xzbnddy94ixgm6rf8gd95qvssfahb"; - revision = "3"; - editedCabalFile = "1cxsn5y6mnzqp681fcghjiqk47bq8mnkvcfc5c8c7yvl258lz5yf"; - libraryHaskellDepends = [ - base containers deepseq erf random template-haskell tf-random - transformers - ]; - testHaskellDepends = [ base deepseq process ]; - description = "Automatic testing of Haskell programs"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "QuickCheck_2_13_2" = callPackage ({ mkDerivation, base, containers, deepseq, process, random , splitmix, template-haskell, transformers }: @@ -15937,7 +15876,6 @@ self: { testHaskellDepends = [ base deepseq process ]; description = "Automatic testing of Haskell programs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "QuickCheck-GenT" = callPackage @@ -16124,6 +16062,8 @@ self: { testHaskellDepends = [ base binary bytestring hspec ]; description = "RLP serialization as defined in Ethereum Yellow Paper"; license = stdenv.lib.licenses.lgpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "RMP" = callPackage @@ -16318,13 +16258,16 @@ self: { }) {}; "RSolve" = callPackage - ({ mkDerivation, base, containers }: + ({ mkDerivation, base, containers, lens, mtl }: mkDerivation { pname = "RSolve"; - version = "0.1.0.1"; - sha256 = "1qqcn87hmya2cl8d4b312y4j4s099czsw5qgqcwh1gc261ppkxvm"; - libraryHaskellDepends = [ base containers ]; - description = "A general solver for equations"; + version = "2.0.0.0"; + sha256 = "0rcbdxn9n2fimqxmprcfgq5c48y69wfjy5ny3acr5ln8ppcinmq8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base containers lens mtl ]; + executableHaskellDepends = [ base containers lens mtl ]; + testHaskellDepends = [ base containers lens mtl ]; license = stdenv.lib.licenses.mit; }) {}; @@ -17319,8 +17262,6 @@ self: { ]; description = "Base types and classes for statistics, sciences and humanities"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "SciFlow" = callPackage @@ -18140,6 +18081,8 @@ self: { libraryHaskellDepends = [ base hvect mtl Spock-api Spock-core ]; description = "Another Haskell web framework for rapid development"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Spock-auth" = callPackage @@ -18181,6 +18124,8 @@ self: { ]; description = "Another Haskell web framework for rapid development"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Spock-digestive" = callPackage @@ -18197,6 +18142,8 @@ self: { ]; description = "Digestive functors support for Spock"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Spock-lucid" = callPackage @@ -18288,23 +18235,11 @@ self: { ({ mkDerivation, base, stm, transformers }: mkDerivation { pname = "StateVar"; - version = "1.1.1.1"; - sha256 = "08r2iw0gdmfs4f6wraaq19vfmkjdbics3dbhw39y7mdjd98kcr7b"; - libraryHaskellDepends = [ base stm transformers ]; - description = "State variables"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "StateVar_1_2" = callPackage - ({ mkDerivation, base, stm, transformers }: - mkDerivation { - pname = "StateVar"; version = "1.2"; sha256 = "12sz6zkc9j5z3lwrjvljrkfxa5vhwnir5wsarigz2f6d3w13dh5g"; libraryHaskellDepends = [ base stm transformers ]; description = "State variables"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "StateVar-transformer" = callPackage @@ -18844,6 +18779,8 @@ self: { ]; description = "Libary for parsing, processing and vizualization of taxonomy data"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "TaxonomyTools" = callPackage @@ -19519,6 +19456,8 @@ self: { ]; description = "It provides the functionality like unix \"uniq\" utility"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Unixutils" = callPackage @@ -20132,6 +20071,19 @@ self: { ({ mkDerivation }: mkDerivation { pname = "Win32"; + version = "2.6.1.0"; + sha256 = "1qwwznnnqnr6zqvjzwr35bkvzrvjf7v90j4qkhinzs8p0yx4b97b"; + revision = "1"; + editedCabalFile = "1ia6dk2fvxg3gzqdmcypdka6fcnnrza23hq1rhslj53jy3qzs3kn"; + description = "A binding to part of the Win32 library"; + license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.none; + }) {}; + + "Win32_2_8_3_0" = callPackage + ({ mkDerivation }: + mkDerivation { + pname = "Win32"; version = "2.8.3.0"; sha256 = "0qsw3z11fsz12s7y9m4w226dlx037d1a0ak5whja4il5z7zbngsr"; description = "A binding to Windows Win32 API"; @@ -20422,15 +20374,13 @@ self: { ({ mkDerivation, base, bytestring, deepseq, text, text-short }: mkDerivation { pname = "X"; - version = "0.2.0.0"; - sha256 = "1p03ah2qi694kcbwb7gk2cypj6p42c6ajn51wpak96p9vmpp5a4r"; + version = "0.3.0.0"; + sha256 = "0grjiznl8j44mq3m0jkhm9z7wcr4cywrnfmk92nk3g6ddhcyakkc"; libraryHaskellDepends = [ base bytestring deepseq text text-short ]; description = "A light-weight XML library"; license = "BSD-3-Clause AND GPL-3.0-or-later"; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "X11" = callPackage @@ -20983,6 +20933,8 @@ self: { testHaskellDepends = [ base containers random tasty tasty-hunit ]; description = "Graphing library wrapper + assorted useful functions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Zwaluw" = callPackage @@ -22460,8 +22412,6 @@ self: { ]; description = "AcousticBrainz API client"; license = stdenv.lib.licenses.cc0; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "acquire" = callPackage @@ -22872,26 +22822,6 @@ self: { }: mkDerivation { pname = "aern2-mp"; - version = "0.1.3.1"; - sha256 = "1gyicxsdqzdbhs9bss5cfjqx859iksr7z1ilsfm9077jdf2032vm"; - libraryHaskellDepends = [ - base convertible hspec integer-logarithms lens mixed-types-num - QuickCheck regex-tdfa rounded template-haskell - ]; - testHaskellDepends = [ base hspec QuickCheck ]; - description = "Multi-precision ball (interval) arithmetic"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "aern2-mp_0_1_4" = callPackage - ({ mkDerivation, base, convertible, hspec, integer-logarithms, lens - , mixed-types-num, QuickCheck, regex-tdfa, rounded - , template-haskell - }: - mkDerivation { - pname = "aern2-mp"; version = "0.1.4"; sha256 = "1q4ygvpxndvj0lsxb7aqw754nkxj1r2037f263g79vpjczkzzfwf"; libraryHaskellDepends = [ @@ -22960,39 +22890,6 @@ self: { "aeson" = callPackage ({ mkDerivation, attoparsec, base, base-compat, base-orphans - , base16-bytestring, bytestring, containers, deepseq, directory - , dlist, filepath, generic-deriving, ghc-prim, hashable - , hashable-time, integer-logarithms, primitive, QuickCheck - , quickcheck-instances, scientific, tagged, tasty, tasty-hunit - , tasty-quickcheck, template-haskell, text, th-abstraction, time - , time-locale-compat, unordered-containers, uuid-types, vector - }: - mkDerivation { - pname = "aeson"; - version = "1.4.2.0"; - sha256 = "1l4b675nxddim3v30kd7zr3vmrs7i1m81rh8h9bfbm9k9a0p3kkm"; - revision = "1"; - editedCabalFile = "067y82gq86740j2zj4y6v7z9b5860ncg2g9lfnrpsnb9jqm7arl1"; - libraryHaskellDepends = [ - attoparsec base base-compat bytestring containers deepseq dlist - ghc-prim hashable primitive scientific tagged template-haskell text - th-abstraction time time-locale-compat unordered-containers - uuid-types vector - ]; - testHaskellDepends = [ - attoparsec base base-compat base-orphans base16-bytestring - bytestring containers directory dlist filepath generic-deriving - ghc-prim hashable hashable-time integer-logarithms QuickCheck - quickcheck-instances scientific tagged tasty tasty-hunit - tasty-quickcheck template-haskell text time time-locale-compat - unordered-containers uuid-types vector - ]; - description = "Fast JSON parsing and encoding"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "aeson_1_4_4_0" = callPackage - ({ mkDerivation, attoparsec, base, base-compat, base-orphans , base16-bytestring, bytestring, containers, deepseq, Diff , directory, dlist, filepath, generic-deriving, ghc-prim, hashable , hashable-time, integer-logarithms, primitive, QuickCheck @@ -23021,7 +22918,6 @@ self: { ]; description = "Fast JSON parsing and encoding"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-applicative" = callPackage @@ -23089,22 +22985,6 @@ self: { }: mkDerivation { pname = "aeson-casing"; - version = "0.1.1.0"; - sha256 = "14qx1aqrf25bdasrwibprl116ixxfr0s4fc62fa6pdj64a7jc480"; - libraryHaskellDepends = [ aeson base ]; - testHaskellDepends = [ - aeson base tasty tasty-hunit tasty-quickcheck tasty-th - ]; - description = "Tools to change the formatting of field names in Aeson instances"; - license = stdenv.lib.licenses.mit; - }) {}; - - "aeson-casing_0_2_0_0" = callPackage - ({ mkDerivation, aeson, base, tasty, tasty-hunit, tasty-quickcheck - , tasty-th - }: - mkDerivation { - pname = "aeson-casing"; version = "0.2.0.0"; sha256 = "0cwjy46ac7vzdvkw6cm5xcbcljf2a4lcvc2xbsh8iwd3fdb0f8rp"; libraryHaskellDepends = [ aeson base ]; @@ -23113,7 +22993,6 @@ self: { ]; description = "Tools to change the formatting of field names in Aeson instances"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-coerce" = callPackage @@ -23224,35 +23103,6 @@ self: { }) {}; "aeson-extra" = callPackage - ({ mkDerivation, aeson, aeson-compat, attoparsec - , attoparsec-iso8601, base, base-compat-batteries, bytestring - , containers, deepseq, exceptions, hashable, parsec - , quickcheck-instances, recursion-schemes, scientific, tasty - , tasty-hunit, tasty-quickcheck, template-haskell, text, these - , time, time-parsers, unordered-containers, vector - }: - mkDerivation { - pname = "aeson-extra"; - version = "0.4.1.1"; - sha256 = "1y7xss382hdxrv4jzprsm3b7ij7wiw8jgjg9wp49dx6bfvcnb2nl"; - revision = "4"; - editedCabalFile = "0ja5vr9w22wyknkjyl7w43frdfdfnxphvrai1b18lhinjqcd9bl5"; - libraryHaskellDepends = [ - aeson aeson-compat attoparsec attoparsec-iso8601 base - base-compat-batteries bytestring containers deepseq exceptions - hashable parsec recursion-schemes scientific template-haskell text - these time unordered-containers vector - ]; - testHaskellDepends = [ - base containers quickcheck-instances tasty tasty-hunit - tasty-quickcheck these time time-parsers unordered-containers - vector - ]; - description = "Extra goodies for aeson"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "aeson-extra_0_4_1_2" = callPackage ({ mkDerivation, aeson, aeson-compat, align, attoparsec , attoparsec-iso8601, base, base-compat-batteries, bytestring , containers, deepseq, exceptions, hashable, parsec @@ -23278,7 +23128,6 @@ self: { ]; description = "Extra goodies for aeson"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-filthy" = callPackage @@ -23754,30 +23603,6 @@ self: { }: mkDerivation { pname = "aeson-typescript"; - version = "0.1.3.0"; - sha256 = "0vn6pckb03vf7lwpfjari4v86clyhq5fpqw9vvnr4gcgh5hhsa1v"; - libraryHaskellDepends = [ - aeson base containers interpolate mtl template-haskell text - th-abstraction unordered-containers - ]; - testHaskellDepends = [ - aeson base bytestring containers directory filepath hspec - interpolate mtl process template-haskell temporary text - th-abstraction unordered-containers - ]; - description = "Generate TypeScript definition files from your ADTs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "aeson-typescript_0_2_0_0" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, directory - , filepath, hspec, interpolate, mtl, process, template-haskell - , temporary, text, th-abstraction, unordered-containers - }: - mkDerivation { - pname = "aeson-typescript"; version = "0.2.0.0"; sha256 = "15w28x2b8h402fic5agq96g51ssryvd7q3zs22n5mz9aa43qlphw"; libraryHaskellDepends = [ @@ -23856,6 +23681,8 @@ self: { ]; description = "A simple Game Engine using SDL"; license = stdenv.lib.licenses.lgpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "affine" = callPackage @@ -24453,24 +24280,6 @@ self: { }: mkDerivation { pname = "alarmclock"; - version = "0.6.0.2"; - sha256 = "1zhq3sx6x54v7cjzmjvcs7pzqyql3x4vk3b5n4x7xhgxs54xdasc"; - libraryHaskellDepends = [ - async base clock stm time unbounded-delays - ]; - testHaskellDepends = [ - async base clock hspec stm time unbounded-delays - ]; - description = "Wake up and perform an action at a certain time"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "alarmclock_0_7_0_1" = callPackage - ({ mkDerivation, async, base, clock, hspec, stm, time - , unbounded-delays - }: - mkDerivation { - pname = "alarmclock"; version = "0.7.0.1"; sha256 = "08y3qzm1z28k819xg2qz3dbj0kpynxmhs5bwa6rmgw52sxbiwlnf"; libraryHaskellDepends = [ @@ -24481,7 +24290,6 @@ self: { ]; description = "Wake up and perform an action at a certain time"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "alea" = callPackage @@ -24752,27 +24560,6 @@ self: { }: mkDerivation { pname = "algebraic-graphs"; - version = "0.3"; - sha256 = "1q4xlyg3xjm7q2x11s4lbffywp096y3s3b72b8amfdyi27har4hl"; - libraryHaskellDepends = [ - array base base-compat containers deepseq mtl - ]; - testHaskellDepends = [ - array base base-compat base-orphans containers extra - inspection-testing QuickCheck - ]; - description = "A library for algebraic graph construction and transformation"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "algebraic-graphs_0_4" = callPackage - ({ mkDerivation, array, base, base-compat, base-orphans, containers - , deepseq, extra, inspection-testing, mtl, QuickCheck - }: - mkDerivation { - pname = "algebraic-graphs"; version = "0.4"; sha256 = "1dyk8qgaahrvcp4gsl9c6s3hwmwys4xvznwnh0y1x8bqc4md61f9"; libraryHaskellDepends = [ @@ -25077,8 +24864,8 @@ self: { }: mkDerivation { pname = "alsa-gui"; - version = "0.1"; - sha256 = "0zcyjckdjhsj614iib3dzj9dfp8xj847jfqf4q1sk9311gscbzns"; + version = "0.1.0.1"; + sha256 = "17a34k0c6s1cisbnh02akyry7fmxigzn3d2ml9j0v56340r86059"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -25404,6 +25191,8 @@ self: { testHaskellDepends = [ base tasty tasty-hunit ]; description = "Comprehensive Amazon Web Services SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-alexa-business" = callPackage @@ -25421,6 +25210,8 @@ self: { ]; description = "Amazon Alexa For Business SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-apigateway" = callPackage @@ -25438,6 +25229,8 @@ self: { ]; description = "Amazon API Gateway SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-application-autoscaling" = callPackage @@ -25455,6 +25248,8 @@ self: { ]; description = "Amazon Application Auto Scaling SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-appstream" = callPackage @@ -25472,6 +25267,8 @@ self: { ]; description = "Amazon AppStream SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-appsync" = callPackage @@ -25489,6 +25286,8 @@ self: { ]; description = "Amazon AppSync SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-athena" = callPackage @@ -25506,6 +25305,8 @@ self: { ]; description = "Amazon Athena SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-autoscaling" = callPackage @@ -25523,6 +25324,8 @@ self: { ]; description = "Amazon Auto Scaling SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-autoscaling-plans" = callPackage @@ -25540,6 +25343,8 @@ self: { ]; description = "Amazon Auto Scaling Plans SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-batch" = callPackage @@ -25557,6 +25362,8 @@ self: { ]; description = "Amazon Batch SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-budgets" = callPackage @@ -25574,6 +25381,8 @@ self: { ]; description = "Amazon Budgets SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-certificatemanager" = callPackage @@ -25591,6 +25400,8 @@ self: { ]; description = "Amazon Certificate Manager SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-certificatemanager-pca" = callPackage @@ -25608,6 +25419,8 @@ self: { ]; description = "Amazon Certificate Manager Private Certificate Authority SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-cloud9" = callPackage @@ -25625,6 +25438,8 @@ self: { ]; description = "Amazon Cloud9 SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-clouddirectory" = callPackage @@ -25642,6 +25457,8 @@ self: { ]; description = "Amazon CloudDirectory SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-cloudformation" = callPackage @@ -25659,6 +25476,8 @@ self: { ]; description = "Amazon CloudFormation SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-cloudfront" = callPackage @@ -25676,6 +25495,8 @@ self: { ]; description = "Amazon CloudFront SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-cloudhsm" = callPackage @@ -25693,6 +25514,8 @@ self: { ]; description = "Amazon CloudHSM SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-cloudhsmv2" = callPackage @@ -25710,6 +25533,8 @@ self: { ]; description = "Amazon CloudHSM V2 SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-cloudsearch" = callPackage @@ -25727,6 +25552,8 @@ self: { ]; description = "Amazon CloudSearch SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-cloudsearch-domains" = callPackage @@ -25744,6 +25571,8 @@ self: { ]; description = "Amazon CloudSearch Domain SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-cloudtrail" = callPackage @@ -25761,6 +25590,8 @@ self: { ]; description = "Amazon CloudTrail SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-cloudwatch" = callPackage @@ -25778,6 +25609,8 @@ self: { ]; description = "Amazon CloudWatch SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-cloudwatch-events" = callPackage @@ -25795,6 +25628,8 @@ self: { ]; description = "Amazon CloudWatch Events SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-cloudwatch-logs" = callPackage @@ -25812,6 +25647,8 @@ self: { ]; description = "Amazon CloudWatch Logs SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-codebuild" = callPackage @@ -25829,6 +25666,8 @@ self: { ]; description = "Amazon CodeBuild SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-codecommit" = callPackage @@ -25846,6 +25685,8 @@ self: { ]; description = "Amazon CodeCommit SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-codedeploy" = callPackage @@ -25863,6 +25704,8 @@ self: { ]; description = "Amazon CodeDeploy SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-codepipeline" = callPackage @@ -25880,6 +25723,8 @@ self: { ]; description = "Amazon CodePipeline SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-codestar" = callPackage @@ -25897,6 +25742,8 @@ self: { ]; description = "Amazon CodeStar SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-cognito-identity" = callPackage @@ -25914,6 +25761,8 @@ self: { ]; description = "Amazon Cognito Identity SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-cognito-idp" = callPackage @@ -25931,6 +25780,8 @@ self: { ]; description = "Amazon Cognito Identity Provider SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-cognito-sync" = callPackage @@ -25948,6 +25799,8 @@ self: { ]; description = "Amazon Cognito Sync SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-comprehend" = callPackage @@ -25965,6 +25818,8 @@ self: { ]; description = "Amazon Comprehend SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-config" = callPackage @@ -25982,6 +25837,8 @@ self: { ]; description = "Amazon Config SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-connect" = callPackage @@ -25999,6 +25856,8 @@ self: { ]; description = "Amazon Connect Service SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-core" = callPackage @@ -26029,6 +25888,8 @@ self: { ]; description = "Core data types and functionality for Amazonka libraries"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-cost-explorer" = callPackage @@ -26046,6 +25907,8 @@ self: { ]; description = "Amazon Cost Explorer Service SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-cur" = callPackage @@ -26063,6 +25926,8 @@ self: { ]; description = "Amazon Cost and Usage Report Service SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-datapipeline" = callPackage @@ -26080,6 +25945,8 @@ self: { ]; description = "Amazon Data Pipeline SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-devicefarm" = callPackage @@ -26097,6 +25964,8 @@ self: { ]; description = "Amazon Device Farm SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-directconnect" = callPackage @@ -26114,6 +25983,8 @@ self: { ]; description = "Amazon Direct Connect SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-discovery" = callPackage @@ -26131,6 +26002,8 @@ self: { ]; description = "Amazon Application Discovery Service SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-dms" = callPackage @@ -26148,6 +26021,8 @@ self: { ]; description = "Amazon Database Migration Service SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-ds" = callPackage @@ -26165,6 +26040,8 @@ self: { ]; description = "Amazon Directory Service SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-dynamodb" = callPackage @@ -26182,6 +26059,8 @@ self: { ]; description = "Amazon DynamoDB SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-dynamodb-dax" = callPackage @@ -26199,6 +26078,8 @@ self: { ]; description = "Amazon DynamoDB Accelerator (DAX) SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-dynamodb-streams" = callPackage @@ -26216,6 +26097,8 @@ self: { ]; description = "Amazon DynamoDB Streams SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-ec2" = callPackage @@ -26233,6 +26116,8 @@ self: { ]; description = "Amazon Elastic Compute Cloud SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-ecr" = callPackage @@ -26250,6 +26135,8 @@ self: { ]; description = "Amazon EC2 Container Registry SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-ecs" = callPackage @@ -26267,6 +26154,8 @@ self: { ]; description = "Amazon EC2 Container Service SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-efs" = callPackage @@ -26284,6 +26173,8 @@ self: { ]; description = "Amazon Elastic File System SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-elasticache" = callPackage @@ -26301,6 +26192,8 @@ self: { ]; description = "Amazon ElastiCache SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-elasticbeanstalk" = callPackage @@ -26318,6 +26211,8 @@ self: { ]; description = "Amazon Elastic Beanstalk SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-elasticsearch" = callPackage @@ -26335,6 +26230,8 @@ self: { ]; description = "Amazon Elasticsearch Service SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-elastictranscoder" = callPackage @@ -26352,6 +26249,8 @@ self: { ]; description = "Amazon Elastic Transcoder SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-elb" = callPackage @@ -26369,6 +26268,8 @@ self: { ]; description = "Amazon Elastic Load Balancing SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-elbv2" = callPackage @@ -26386,6 +26287,8 @@ self: { ]; description = "Amazon Elastic Load Balancing SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-emr" = callPackage @@ -26403,6 +26306,8 @@ self: { ]; description = "Amazon Elastic MapReduce SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-fms" = callPackage @@ -26420,6 +26325,8 @@ self: { ]; description = "Amazon Firewall Management Service SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-gamelift" = callPackage @@ -26437,6 +26344,8 @@ self: { ]; description = "Amazon GameLift SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-glacier" = callPackage @@ -26454,6 +26363,8 @@ self: { ]; description = "Amazon Glacier SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-glue" = callPackage @@ -26471,6 +26382,8 @@ self: { ]; description = "Amazon Glue SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-greengrass" = callPackage @@ -26488,6 +26401,8 @@ self: { ]; description = "Amazon Greengrass SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-guardduty" = callPackage @@ -26505,6 +26420,8 @@ self: { ]; description = "Amazon GuardDuty SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-health" = callPackage @@ -26522,6 +26439,8 @@ self: { ]; description = "Amazon Health APIs and Notifications SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-iam" = callPackage @@ -26539,6 +26458,8 @@ self: { ]; description = "Amazon Identity and Access Management SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-iam-policy" = callPackage @@ -26577,6 +26498,8 @@ self: { ]; description = "Amazon Import/Export SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-inspector" = callPackage @@ -26594,6 +26517,8 @@ self: { ]; description = "Amazon Inspector SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-iot" = callPackage @@ -26611,6 +26536,8 @@ self: { ]; description = "Amazon IoT SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-iot-analytics" = callPackage @@ -26628,6 +26555,8 @@ self: { ]; description = "Amazon IoT Analytics SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-iot-dataplane" = callPackage @@ -26645,6 +26574,8 @@ self: { ]; description = "Amazon IoT Data Plane SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-iot-jobs-dataplane" = callPackage @@ -26662,6 +26593,8 @@ self: { ]; description = "Amazon IoT Jobs Data Plane SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-kinesis" = callPackage @@ -26679,6 +26612,8 @@ self: { ]; description = "Amazon Kinesis SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-kinesis-analytics" = callPackage @@ -26696,6 +26631,8 @@ self: { ]; description = "Amazon Kinesis Analytics SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-kinesis-firehose" = callPackage @@ -26713,6 +26650,8 @@ self: { ]; description = "Amazon Kinesis Firehose SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-kinesis-video" = callPackage @@ -26730,6 +26669,8 @@ self: { ]; description = "Amazon Kinesis Video Streams SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-kinesis-video-archived-media" = callPackage @@ -26747,6 +26688,8 @@ self: { ]; description = "Amazon Kinesis Video Streams Archived Media SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-kinesis-video-media" = callPackage @@ -26764,6 +26707,8 @@ self: { ]; description = "Amazon Kinesis Video Streams Media SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-kms" = callPackage @@ -26781,6 +26726,8 @@ self: { ]; description = "Amazon Key Management Service SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-lambda" = callPackage @@ -26798,6 +26745,8 @@ self: { ]; description = "Amazon Lambda SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-lex-models" = callPackage @@ -26815,6 +26764,8 @@ self: { ]; description = "Amazon Lex Model Building Service SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-lex-runtime" = callPackage @@ -26832,6 +26783,8 @@ self: { ]; description = "Amazon Lex Runtime Service SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-lightsail" = callPackage @@ -26849,6 +26802,8 @@ self: { ]; description = "Amazon Lightsail SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-marketplace-analytics" = callPackage @@ -26866,6 +26821,8 @@ self: { ]; description = "Amazon Marketplace Commerce Analytics SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-marketplace-entitlement" = callPackage @@ -26883,6 +26840,8 @@ self: { ]; description = "Amazon Marketplace Entitlement Service SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-marketplace-metering" = callPackage @@ -26900,6 +26859,8 @@ self: { ]; description = "Amazon Marketplace Metering SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-mechanicalturk" = callPackage @@ -26917,6 +26878,8 @@ self: { ]; description = "Amazon Mechanical Turk SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-mediaconvert" = callPackage @@ -26934,6 +26897,8 @@ self: { ]; description = "Amazon Elemental MediaConvert SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-medialive" = callPackage @@ -26951,6 +26916,8 @@ self: { ]; description = "Amazon Elemental MediaLive SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-mediapackage" = callPackage @@ -26968,6 +26935,8 @@ self: { ]; description = "Amazon Elemental MediaPackage SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-mediastore" = callPackage @@ -26985,6 +26954,8 @@ self: { ]; description = "Amazon Elemental MediaStore SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-mediastore-dataplane" = callPackage @@ -27002,6 +26973,8 @@ self: { ]; description = "Amazon Elemental MediaStore Data Plane SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-migrationhub" = callPackage @@ -27019,6 +26992,8 @@ self: { ]; description = "Amazon Migration Hub SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-ml" = callPackage @@ -27036,6 +27011,8 @@ self: { ]; description = "Amazon Machine Learning SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-mobile" = callPackage @@ -27053,6 +27030,8 @@ self: { ]; description = "Amazon Mobile SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-mq" = callPackage @@ -27070,6 +27049,8 @@ self: { ]; description = "Amazon MQ SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-opsworks" = callPackage @@ -27087,6 +27068,8 @@ self: { ]; description = "Amazon OpsWorks SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-opsworks-cm" = callPackage @@ -27104,6 +27087,8 @@ self: { ]; description = "Amazon OpsWorks for Chef Automate SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-organizations" = callPackage @@ -27121,6 +27106,8 @@ self: { ]; description = "Amazon Organizations SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-pinpoint" = callPackage @@ -27138,6 +27125,8 @@ self: { ]; description = "Amazon Pinpoint SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-polly" = callPackage @@ -27155,6 +27144,8 @@ self: { ]; description = "Amazon Polly SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-pricing" = callPackage @@ -27172,6 +27163,8 @@ self: { ]; description = "Amazon Price List Service SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-rds" = callPackage @@ -27189,6 +27182,8 @@ self: { ]; description = "Amazon Relational Database Service SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-redshift" = callPackage @@ -27206,6 +27201,8 @@ self: { ]; description = "Amazon Redshift SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-rekognition" = callPackage @@ -27223,6 +27220,8 @@ self: { ]; description = "Amazon Rekognition SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-resourcegroups" = callPackage @@ -27240,6 +27239,8 @@ self: { ]; description = "Amazon Resource Groups SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-resourcegroupstagging" = callPackage @@ -27257,6 +27258,8 @@ self: { ]; description = "Amazon Resource Groups Tagging API SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-route53" = callPackage @@ -27274,6 +27277,8 @@ self: { ]; description = "Amazon Route 53 SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-route53-autonaming" = callPackage @@ -27291,6 +27296,8 @@ self: { ]; description = "Amazon Route 53 Auto Naming SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-route53-domains" = callPackage @@ -27308,6 +27315,8 @@ self: { ]; description = "Amazon Route 53 Domains SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-s3" = callPackage @@ -27325,6 +27334,8 @@ self: { ]; description = "Amazon Simple Storage Service SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-s3-streaming" = callPackage @@ -27344,6 +27355,8 @@ self: { ]; description = "Provides conduits to upload data to S3 using the Multipart API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-sagemaker" = callPackage @@ -27361,6 +27374,8 @@ self: { ]; description = "Amazon SageMaker Service SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-sagemaker-runtime" = callPackage @@ -27378,6 +27393,8 @@ self: { ]; description = "Amazon SageMaker Runtime SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-sdb" = callPackage @@ -27395,6 +27412,8 @@ self: { ]; description = "Amazon SimpleDB SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-secretsmanager" = callPackage @@ -27412,6 +27431,8 @@ self: { ]; description = "Amazon Secrets Manager SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-serverlessrepo" = callPackage @@ -27429,6 +27450,8 @@ self: { ]; description = "Amazon ServerlessApplicationRepository SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-servicecatalog" = callPackage @@ -27446,6 +27469,8 @@ self: { ]; description = "Amazon Service Catalog SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-ses" = callPackage @@ -27463,6 +27488,8 @@ self: { ]; description = "Amazon Simple Email Service SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-shield" = callPackage @@ -27480,6 +27507,8 @@ self: { ]; description = "Amazon Shield SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-sms" = callPackage @@ -27497,6 +27526,8 @@ self: { ]; description = "Amazon Server Migration Service SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-snowball" = callPackage @@ -27514,6 +27545,8 @@ self: { ]; description = "Amazon Import/Export Snowball SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-sns" = callPackage @@ -27531,6 +27564,8 @@ self: { ]; description = "Amazon Simple Notification Service SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-sqs" = callPackage @@ -27548,6 +27583,8 @@ self: { ]; description = "Amazon Simple Queue Service SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-ssm" = callPackage @@ -27565,6 +27602,8 @@ self: { ]; description = "Amazon Simple Systems Manager (SSM) SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-stepfunctions" = callPackage @@ -27582,6 +27621,8 @@ self: { ]; description = "Amazon Step Functions SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-storagegateway" = callPackage @@ -27599,6 +27640,8 @@ self: { ]; description = "Amazon Storage Gateway SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-sts" = callPackage @@ -27616,6 +27659,8 @@ self: { ]; description = "Amazon Security Token Service SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-support" = callPackage @@ -27633,6 +27678,8 @@ self: { ]; description = "Amazon Support SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-swf" = callPackage @@ -27650,6 +27697,8 @@ self: { ]; description = "Amazon Simple Workflow Service SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-test" = callPackage @@ -27671,6 +27720,8 @@ self: { ]; description = "Common functionality for Amazonka library test-suites"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-transcribe" = callPackage @@ -27688,6 +27739,8 @@ self: { ]; description = "Amazon Transcribe Service SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-translate" = callPackage @@ -27705,6 +27758,8 @@ self: { ]; description = "Amazon Translate SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-waf" = callPackage @@ -27722,6 +27777,8 @@ self: { ]; description = "Amazon WAF SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-waf-regional" = callPackage @@ -27739,6 +27796,8 @@ self: { ]; description = "Amazon WAF Regional SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-workdocs" = callPackage @@ -27756,6 +27815,8 @@ self: { ]; description = "Amazon WorkDocs SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-workmail" = callPackage @@ -27773,6 +27834,8 @@ self: { ]; description = "Amazon WorkMail SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-workspaces" = callPackage @@ -27790,6 +27853,8 @@ self: { ]; description = "Amazon WorkSpaces SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-xray" = callPackage @@ -27807,6 +27872,8 @@ self: { ]; description = "Amazon X-Ray SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amby" = callPackage @@ -27876,33 +27943,6 @@ self: { }: mkDerivation { pname = "amqp"; - version = "0.18.2"; - sha256 = "0sp7c9vbgaxc5rhfc402q52djr0qpqgmfklhcrx45av2rqymkyxv"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base binary bytestring clock connection containers - data-binary-ieee754 monad-control network network-uri split stm - text vector - ]; - executableHaskellDepends = [ base containers xml ]; - testHaskellDepends = [ - base binary bytestring clock connection containers - data-binary-ieee754 hspec hspec-expectations network network-uri - split stm text vector - ]; - description = "Client library for AMQP servers (currently only RabbitMQ)"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "amqp_0_18_3" = callPackage - ({ mkDerivation, base, binary, bytestring, clock, connection - , containers, data-binary-ieee754, hspec, hspec-expectations - , monad-control, network, network-uri, split, stm, text, vector - , xml - }: - mkDerivation { - pname = "amqp"; version = "0.18.3"; sha256 = "1cyzazl3hz5yd2i220b4g8xs0fm47xqlwyvgarxbnn5gnrm8ys21"; isLibrary = true; @@ -27920,7 +27960,6 @@ self: { ]; description = "Client library for AMQP servers (currently only RabbitMQ)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amqp-conduit" = callPackage @@ -28518,19 +28557,6 @@ self: { ({ mkDerivation, base, colour }: mkDerivation { pname = "ansi-terminal"; - version = "0.8.2"; - sha256 = "147ss9wz03ww6ypbv6yh5vi1wfrfcaqm8r6nxh50vnp7254359wh"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base colour ]; - description = "Simple ANSI terminal support, with Windows compatibility"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ansi-terminal_0_9_1" = callPackage - ({ mkDerivation, base, colour }: - mkDerivation { - pname = "ansi-terminal"; version = "0.9.1"; sha256 = "1yr0ld0kqns3w3j9gl62bdwshvyazidx4dv1qkvq19ivnf08w23l"; isLibrary = true; @@ -28538,7 +28564,6 @@ self: { libraryHaskellDepends = [ base colour ]; description = "Simple ANSI terminal support, with Windows compatibility"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ansi-terminal-game" = callPackage @@ -28570,21 +28595,6 @@ self: { ({ mkDerivation, ansi-terminal, base }: mkDerivation { pname = "ansi-wl-pprint"; - version = "0.6.8.2"; - sha256 = "0gnb4mkqryv08vncxnj0bzwcnd749613yw3cxfzw6y3nsldp4c56"; - revision = "2"; - editedCabalFile = "0xq83bwya8mfijp3dn9zfsqbbkl1wpzfjcmnkw8a06icjh9vg458"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ ansi-terminal base ]; - description = "The Wadler/Leijen Pretty Printer for colored ANSI terminal output"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ansi-wl-pprint_0_6_9" = callPackage - ({ mkDerivation, ansi-terminal, base }: - mkDerivation { - pname = "ansi-wl-pprint"; version = "0.6.9"; sha256 = "1b2fg8px98dzbaqyns10kvs8kn6cl1hdq5wb9saz40izrpkyicm7"; isLibrary = true; @@ -28592,7 +28602,6 @@ self: { libraryHaskellDepends = [ ansi-terminal base ]; description = "The Wadler/Leijen Pretty Printer for colored ANSI terminal output"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ansigraph" = callPackage @@ -28607,6 +28616,8 @@ self: { testHaskellDepends = [ base hspec QuickCheck ]; description = "Terminal-based graphing via ANSI and Unicode"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "antagonist" = callPackage @@ -28728,27 +28739,8 @@ self: { }: mkDerivation { pname = "antiope-athena"; - version = "6.2.0"; - sha256 = "0kd31s399rddcjj8ayvki85j66xlkb7gh0jgfwxmxcxp3x4gs0xi"; - libraryHaskellDepends = [ - amazonka amazonka-athena amazonka-core base lens resourcet text - unliftio-core - ]; - testHaskellDepends = [ - amazonka amazonka-athena amazonka-core base lens resourcet text - unliftio-core - ]; - license = stdenv.lib.licenses.mit; - }) {}; - - "antiope-athena_7_2_2" = callPackage - ({ mkDerivation, amazonka, amazonka-athena, amazonka-core, base - , lens, resourcet, text, unliftio-core - }: - mkDerivation { - pname = "antiope-athena"; - version = "7.2.2"; - sha256 = "1a5mp3s22qv41p9cgiyz6gc96kwz9f9wwx8v4dr1jjgslmlik4m1"; + version = "7.3.0"; + sha256 = "1ixrpfc1yrvzigv5mid12s9yill5x0yvr5xfzwl9plm9jpzjjvv9"; libraryHaskellDepends = [ amazonka amazonka-athena amazonka-core base lens resourcet text unliftio-core @@ -28760,44 +28752,25 @@ self: { description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "antiope-contract" = callPackage ({ mkDerivation, aeson, antiope-s3, avro, base, bytestring, text }: mkDerivation { pname = "antiope-contract"; - version = "7.2.2"; - sha256 = "188p6b4mzj513ylkjlf9z3cra6qdv6x0ar4fc1hjs1waggng0b9d"; + version = "7.3.0"; + sha256 = "0alg9nfwgyrvwxi8syrarqhf8din9dayvvll2078zl82r1x8hmgb"; libraryHaskellDepends = [ aeson antiope-s3 avro base bytestring text ]; description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "antiope-core" = callPackage - ({ mkDerivation, amazonka, amazonka-core, base, bytestring - , exceptions, generic-lens, http-client, http-types, lens - , monad-logger, mtl, resourcet, text, transformers, unliftio-core - }: - mkDerivation { - pname = "antiope-core"; - version = "6.2.0"; - sha256 = "0g3bhh8vdnkd5h9savhjc053jbb4k7b7chbzcjjqd4kj95v8jmr3"; - libraryHaskellDepends = [ - amazonka amazonka-core base bytestring exceptions generic-lens - http-client http-types lens monad-logger mtl resourcet text - transformers unliftio-core - ]; - testHaskellDepends = [ - amazonka amazonka-core base bytestring exceptions generic-lens - http-client http-types lens monad-logger mtl resourcet text - transformers unliftio-core - ]; - license = stdenv.lib.licenses.mit; - }) {}; - - "antiope-core_7_2_2" = callPackage ({ mkDerivation, aeson, aeson-lens, amazonka, amazonka-core, base , bytestring, exceptions, generic-lens, hedgehog, hspec , http-client, http-types, hw-hspec-hedgehog, lens, mtl, resourcet @@ -28805,8 +28778,8 @@ self: { }: mkDerivation { pname = "antiope-core"; - version = "7.2.2"; - sha256 = "0j27bd5f9zkx0qhsl9zam7rzvprcb5075rm174gr77gmf4lqraaa"; + version = "7.3.0"; + sha256 = "0x2lz5ljxdd2d0fv3srn6v6az1dacb83n16fshnm27z9vgnzvfjc"; libraryHaskellDepends = [ aeson amazonka amazonka-core base bytestring exceptions generic-lens http-client http-types lens mtl resourcet text @@ -28821,37 +28794,18 @@ self: { description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "antiope-dynamodb" = callPackage - ({ mkDerivation, amazonka, amazonka-core, amazonka-dynamodb - , antiope-core, base, generic-lens, lens, text, unliftio-core - , unordered-containers - }: - mkDerivation { - pname = "antiope-dynamodb"; - version = "6.2.0"; - sha256 = "1kv6ihb6829fbgzz489sg0zyz02rp9p8wk90w4x3sjsynf8djrjj"; - libraryHaskellDepends = [ - amazonka amazonka-core amazonka-dynamodb antiope-core base - generic-lens lens text unliftio-core unordered-containers - ]; - testHaskellDepends = [ - amazonka amazonka-core amazonka-dynamodb antiope-core base - generic-lens lens text unliftio-core unordered-containers - ]; - license = stdenv.lib.licenses.mit; - }) {}; - - "antiope-dynamodb_7_2_2" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-dynamodb , antiope-core, base, generic-lens, lens, text, unliftio-core , unordered-containers }: mkDerivation { pname = "antiope-dynamodb"; - version = "7.2.2"; - sha256 = "19a41njxa09sf1qlc9zmy65nmwp02lcn0q0dk5gwqkpmjjf5ah3s"; + version = "7.3.0"; + sha256 = "04izlg44mz7xv529q2m6j47hcxfca1zrk1fl11rcixdfi3iwfmvf"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-dynamodb antiope-core base generic-lens lens text unliftio-core unordered-containers @@ -28863,31 +28817,10 @@ self: { description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "antiope-messages" = callPackage - ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3 - , amazonka-sqs, antiope-s3, base, generic-lens, lens, lens-aeson - , monad-loops, network-uri, text, unliftio-core - }: - mkDerivation { - pname = "antiope-messages"; - version = "6.2.0"; - sha256 = "11zkyfv06fsqxznr36hh563yz401y3wg2a5hc6x6ydza4xdnrzdz"; - libraryHaskellDepends = [ - aeson amazonka amazonka-core amazonka-s3 amazonka-sqs antiope-s3 - base generic-lens lens lens-aeson monad-loops network-uri text - unliftio-core - ]; - testHaskellDepends = [ - aeson amazonka amazonka-core amazonka-s3 amazonka-sqs antiope-s3 - base generic-lens lens lens-aeson monad-loops network-uri text - unliftio-core - ]; - license = stdenv.lib.licenses.mit; - }) {}; - - "antiope-messages_7_2_2" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, base, bytestring , generic-lens, hedgehog, hspec, hw-hspec-hedgehog, lens , lens-aeson, monad-loops, network-uri, scientific, text @@ -28895,8 +28828,8 @@ self: { }: mkDerivation { pname = "antiope-messages"; - version = "7.2.2"; - sha256 = "0vdp8kkqv4g3lkjvwhg4yyb8rjwphjp4gjmx0b6910jwizhslqwf"; + version = "7.3.0"; + sha256 = "13mm39hbwmlhg1qv61nv0rs6kvw784k2ynrfd9yi1zlr5zycgwlm"; libraryHaskellDepends = [ aeson amazonka amazonka-core base bytestring generic-lens lens lens-aeson monad-loops network-uri text unliftio-core @@ -28909,6 +28842,7 @@ self: { description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "antiope-optparse-applicative" = callPackage @@ -28917,8 +28851,8 @@ self: { }: mkDerivation { pname = "antiope-optparse-applicative"; - version = "7.2.2"; - sha256 = "006jr3kdyvfzyabxr4zc4kf9sm8pkaca572whdxwpnfpz0m54k0j"; + version = "7.3.0"; + sha256 = "1qgd4mb99vpjswxca6l10ghg3d63vlqj3wc87afdcddfwa50f1zr"; libraryHaskellDepends = [ amazonka amazonka-core amazonka-s3 base optparse-applicative text ]; @@ -28928,34 +28862,11 @@ self: { ]; description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "antiope-s3" = callPackage - ({ mkDerivation, amazonka, amazonka-core, amazonka-s3, antiope-core - , attoparsec, base, bytestring, conduit, conduit-extra, exceptions - , generic-lens, hedgehog, hspec, http-types, hw-hspec-hedgehog - , lens, monad-logger, mtl, network-uri, resourcet, text - , unliftio-core - }: - mkDerivation { - pname = "antiope-s3"; - version = "6.2.0"; - sha256 = "1gb9ypj5gp6qkzncg44sja35pw2s6qg7msjrlcvhdfbcjs6pxrqj"; - libraryHaskellDepends = [ - amazonka amazonka-core amazonka-s3 antiope-core attoparsec base - bytestring conduit conduit-extra exceptions generic-lens http-types - lens monad-logger mtl network-uri resourcet text unliftio-core - ]; - testHaskellDepends = [ - amazonka amazonka-core amazonka-s3 antiope-core attoparsec base - bytestring conduit conduit-extra exceptions generic-lens hedgehog - hspec http-types hw-hspec-hedgehog lens monad-logger mtl - network-uri resourcet text unliftio-core - ]; - license = stdenv.lib.licenses.mit; - }) {}; - - "antiope-s3_7_2_2" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3 , antiope-core, antiope-messages, attoparsec, base, bytestring , conduit, conduit-extra, exceptions, generic-lens, hedgehog, hspec @@ -28964,8 +28875,8 @@ self: { }: mkDerivation { pname = "antiope-s3"; - version = "7.2.2"; - sha256 = "14lmkkr86n8h7iqkjvc5sxmccxi3fv97kgljb8m8fl35fxcwd1j8"; + version = "7.3.0"; + sha256 = "03qkvaz95qfqrildz92qhrnrny4i00p2l89j5p7miwxbdfzy7ga9"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-s3 antiope-core antiope-messages attoparsec base bytestring conduit conduit-extra @@ -28981,36 +28892,18 @@ self: { description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "antiope-sns" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-sns, base - , generic-lens, lens, text, unliftio-core - }: - mkDerivation { - pname = "antiope-sns"; - version = "6.2.0"; - sha256 = "0npm9q3vf2njiqwyswxc6xh5psjls0skz29mz22y59sk25m5fmkv"; - libraryHaskellDepends = [ - aeson amazonka amazonka-core amazonka-sns base generic-lens lens - text unliftio-core - ]; - testHaskellDepends = [ - aeson amazonka amazonka-core amazonka-sns base generic-lens lens - text unliftio-core - ]; - license = stdenv.lib.licenses.mit; - }) {}; - - "antiope-sns_7_2_2" = callPackage - ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-sns, base , bytestring, generic-lens, hedgehog, hspec, hw-hspec-hedgehog , lens, text, time, unliftio-core }: mkDerivation { pname = "antiope-sns"; - version = "7.2.2"; - sha256 = "10wbf6pmws8gway4i7z55z7xi2az5xzb65yj0q1qc86vxbchnxkk"; + version = "7.3.0"; + sha256 = "066ryids04k0sixn9yf0h70jfj55z2g2xkrpqhxnr54sk2jr4njy"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-sns base bytestring generic-lens lens text time unliftio-core @@ -29023,31 +28916,10 @@ self: { description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "antiope-sqs" = callPackage - ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3 - , amazonka-sqs, antiope-messages, antiope-s3, base, generic-lens - , lens, lens-aeson, monad-loops, network-uri, text, unliftio-core - }: - mkDerivation { - pname = "antiope-sqs"; - version = "6.2.0"; - sha256 = "0v33diw8cwvfb9b4k24whbyl4apjq67rh36ndn5qr6627kp3b825"; - libraryHaskellDepends = [ - aeson amazonka amazonka-core amazonka-s3 amazonka-sqs - antiope-messages antiope-s3 base generic-lens lens lens-aeson - monad-loops network-uri text unliftio-core - ]; - testHaskellDepends = [ - aeson amazonka amazonka-core amazonka-s3 amazonka-sqs - antiope-messages antiope-s3 base generic-lens lens lens-aeson - monad-loops network-uri text unliftio-core - ]; - license = stdenv.lib.licenses.mit; - }) {}; - - "antiope-sqs_7_2_2" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-sqs, base , bytestring, conduit, generic-lens, hedgehog, hspec , hw-hspec-hedgehog, lens, lens-aeson, monad-loops, mtl @@ -29056,8 +28928,8 @@ self: { }: mkDerivation { pname = "antiope-sqs"; - version = "7.2.2"; - sha256 = "0qjnwrc23zav84s4ffqi2g97yrfpkxmzm981ik6h5fsi7f6wzj0n"; + version = "7.3.0"; + sha256 = "1nhs4v0h0hqjv6ncfy1wpsdsxkbbb0gz45rhf8swm8h2zfv9rqxl"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-sqs base bytestring conduit generic-lens lens lens-aeson monad-loops mtl network-uri split text @@ -29071,6 +28943,7 @@ self: { description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "antiope-swf" = callPackage @@ -29079,12 +28952,14 @@ self: { }: mkDerivation { pname = "antiope-swf"; - version = "7.2.2"; - sha256 = "1shw4sw0nfrkdcjjin3nq63igfalywz03w171v5knn2kx6xwf4yy"; + version = "7.3.0"; + sha256 = "1jqhq0ifdv8dqsnqsyb814nqq987fvng04gg8sbz5cjds7nm1c0m"; libraryHaskellDepends = [ amazonka-swf base lens text ]; testHaskellDepends = [ base hedgehog hspec hw-hspec-hedgehog ]; description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "antiprimes" = callPackage @@ -29298,23 +29173,6 @@ self: { }) {}; "apecs" = callPackage - ({ mkDerivation, base, containers, criterion, linear, mtl - , QuickCheck, template-haskell, vector - }: - mkDerivation { - pname = "apecs"; - version = "0.7.3"; - sha256 = "1vrfmpnpihsywd8lq1kc7bsjsp8kxrcv341mzxsaa68qd5xi698l"; - libraryHaskellDepends = [ - base containers mtl template-haskell vector - ]; - testHaskellDepends = [ base containers linear QuickCheck vector ]; - benchmarkHaskellDepends = [ base criterion linear ]; - description = "Fast Entity-Component-System library for game programming"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "apecs_0_8_1" = callPackage ({ mkDerivation, array, base, containers, criterion, linear, mtl , QuickCheck, template-haskell, vector }: @@ -29329,7 +29187,6 @@ self: { benchmarkHaskellDepends = [ base criterion linear ]; description = "Fast Entity-Component-System library for game programming"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "apecs-gloss" = callPackage @@ -29338,29 +29195,13 @@ self: { }: mkDerivation { pname = "apecs-gloss"; - version = "0.2.0"; - sha256 = "0qkdjanbrnwhxzr168xwrnhcd1hwsymlb1nvsb1mrklzj93amfvh"; - libraryHaskellDepends = [ - apecs apecs-physics base containers gloss linear - ]; - description = "Simple gloss renderer for apecs"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "apecs-gloss_0_2_1" = callPackage - ({ mkDerivation, apecs, apecs-physics, base, containers, gloss - , linear - }: - mkDerivation { - pname = "apecs-gloss"; - version = "0.2.1"; - sha256 = "0v1nagzwhb1l9wfjl4yp3ymbhbpjcrwrih2y8cxkzws5wxgbbnvg"; + version = "0.2.2"; + sha256 = "0p8r8hraqa49f13p045j54kzyrcvgscppgqllwnqgdx0in8j71cf"; libraryHaskellDepends = [ apecs apecs-physics base containers gloss linear ]; description = "Simple gloss renderer for apecs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "apecs-physics" = callPackage @@ -29369,8 +29210,8 @@ self: { }: mkDerivation { pname = "apecs-physics"; - version = "0.3.2"; - sha256 = "15xwhji60garvryv971ahibdb6b0qlpafx9xy5898h0s4bhrhysf"; + version = "0.4.2"; + sha256 = "0jqylv937c4y4jygqyb127n9lvvmss52pz7rcwq7x3qc3k5mwgnh"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ apecs base containers inline-c linear template-haskell vector @@ -29379,14 +29220,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "apecs-physics_0_4_0" = callPackage + "apecs-physics_0_4_3" = callPackage ({ mkDerivation, apecs, base, Cabal, containers, inline-c, linear , template-haskell, vector }: mkDerivation { pname = "apecs-physics"; - version = "0.4.0"; - sha256 = "0yqylgsl2n0fsb73qdvl1iinazfzzx64683jp37sr2dm8jpys3lc"; + version = "0.4.3"; + sha256 = "1d1dq50r5hqq3551abn82i35qaq62gsk04h6vzwhi01jrfkjxyxr"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ apecs base containers inline-c linear template-haskell vector @@ -30433,6 +30274,8 @@ self: { testHaskellDepends = [ base hedgehog hspec hw-hspec-hedgehog ]; description = "Simple logging library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "arbor-monad-metric" = callPackage @@ -30491,8 +30334,8 @@ self: { }: mkDerivation { pname = "arbor-postgres"; - version = "0.0.3"; - sha256 = "18rqy2zyaf5cawn8dkn3xmjh19zzqgwj6mkk415x5a4p53dya46b"; + version = "0.0.4"; + sha256 = "0z3n2w9a57sl24i7h4yz8204drwkgr54pr2yrjam4xs3dyx6irf4"; libraryHaskellDepends = [ base bytestring generic-lens lens network-uri optparse-applicative postgresql-simple text @@ -30951,34 +30794,6 @@ self: { "arithmoi" = callPackage ({ mkDerivation, array, base, containers, deepseq, exact-pi, gauge , ghc-prim, integer-gmp, integer-logarithms, QuickCheck, random - , smallcheck, tasty, tasty-hunit, tasty-quickcheck - , tasty-smallcheck, transformers, vector - }: - mkDerivation { - pname = "arithmoi"; - version = "0.8.0.0"; - sha256 = "17nk0n89fb0qh6w8535ll45mq4msir32w6fhqzpzhlpbily3mlw2"; - revision = "3"; - editedCabalFile = "1cn6axcdiahaqnq1rsm0snr78lrypay6cxh3yxw3vrrwilavri1i"; - configureFlags = [ "-f-llvm" ]; - libraryHaskellDepends = [ - array base containers deepseq exact-pi ghc-prim integer-gmp - integer-logarithms random transformers vector - ]; - testHaskellDepends = [ - base containers exact-pi integer-gmp QuickCheck smallcheck tasty - tasty-hunit tasty-quickcheck tasty-smallcheck transformers vector - ]; - benchmarkHaskellDepends = [ - base containers deepseq gauge integer-logarithms random vector - ]; - description = "Efficient basic number-theoretic functions"; - license = stdenv.lib.licenses.mit; - }) {}; - - "arithmoi_0_9_0_0" = callPackage - ({ mkDerivation, array, base, containers, deepseq, exact-pi, gauge - , ghc-prim, integer-gmp, integer-logarithms, QuickCheck, random , semirings, smallcheck, tasty, tasty-hunit, tasty-quickcheck , tasty-smallcheck, transformers, vector }: @@ -31004,7 +30819,6 @@ self: { ]; description = "Efficient basic number-theoretic functions"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "arity-generic-liftA" = callPackage @@ -31111,6 +30925,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "array-chunks" = callPackage + ({ mkDerivation, base, primitive, QuickCheck, quickcheck-classes + , tasty, tasty-hunit, tasty-quickcheck + }: + mkDerivation { + pname = "array-chunks"; + version = "0.1.0.0"; + sha256 = "15x8l8m953ws3253zvxg4q0q0qqcc34wawijnzmq87y39g9ghlag"; + libraryHaskellDepends = [ base primitive ]; + testHaskellDepends = [ + base primitive QuickCheck quickcheck-classes tasty tasty-hunit + tasty-quickcheck + ]; + description = "Lists of chunks"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "array-forth" = callPackage ({ mkDerivation, array, base, HUnit, mcmc-synthesis , modular-arithmetic, MonadRandom, OddWord, QuickCheck, split @@ -31194,6 +31025,8 @@ self: { ]; description = "Memory-efficient ArrayList implementation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "arrow-extras" = callPackage @@ -31377,6 +31210,8 @@ self: { testHaskellDepends = [ base hedgehog jwt mtl text time ]; description = "Atlassian Service Authentication Protocol"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ascetic" = callPackage @@ -31603,44 +31438,6 @@ self: { "asif" = callPackage ({ mkDerivation, attoparsec, base, binary, bytestring, conduit , conduit-combinators, conduit-extra, containers, cpu, directory - , either, exceptions, generic-lens, hedgehog, hspec, hw-bits - , hw-hspec-hedgehog, hw-ip, iproute, lens, network, old-locale - , optparse-applicative, resourcet, temporary-resourcet, text, thyme - , vector - }: - mkDerivation { - pname = "asif"; - version = "3.2.0"; - sha256 = "0ryg35rl7i89r28l0hpchgmrgmhxwgzxz7jhnwhqfwk5mql08hq0"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - attoparsec base binary bytestring conduit conduit-combinators - conduit-extra containers cpu either exceptions generic-lens hw-bits - hw-ip iproute lens network old-locale resourcet temporary-resourcet - text thyme vector - ]; - executableHaskellDepends = [ - attoparsec base binary bytestring conduit conduit-combinators - conduit-extra containers cpu directory either exceptions - generic-lens hw-bits hw-ip iproute lens network old-locale - optparse-applicative resourcet temporary-resourcet text thyme - vector - ]; - testHaskellDepends = [ - attoparsec base binary bytestring conduit conduit-combinators - conduit-extra containers cpu either exceptions generic-lens - hedgehog hspec hw-bits hw-hspec-hedgehog hw-ip iproute lens network - old-locale resourcet temporary-resourcet text thyme vector - ]; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "asif_6_0_1" = callPackage - ({ mkDerivation, attoparsec, base, binary, bytestring, conduit - , conduit-combinators, conduit-extra, containers, cpu, directory , either, exceptions, foldl, generic-lens, hedgehog, hspec, hw-bits , hw-hspec-hedgehog, hw-ip, lens, network, old-locale , optparse-applicative, profunctors, resourcet, temporary-resourcet @@ -32741,8 +32538,6 @@ self: { doHaddock = false; description = "A build tool for ATS"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ats-setup" = callPackage @@ -32872,8 +32667,8 @@ self: { pname = "attoparsec"; version = "0.13.2.2"; sha256 = "0j6qcwd146yzlkc9mcvzvnixsyl65n2a68l28322q5v9p4g4g4yx"; - revision = "3"; - editedCabalFile = "1birva836xdp92lf1v5yrs8lj3bgj9vnarrfh2ssfxxacqj1gjji"; + revision = "4"; + editedCabalFile = "1vz6jz7cwd80sryabpa99hccamgccjf2l7907wjblbs7dy66a8cb"; libraryHaskellDepends = [ array base bytestring containers deepseq scientific text transformers @@ -33006,6 +32801,8 @@ self: { ]; description = "Parse IP data types with attoparsec"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "attoparsec-iso8601" = callPackage @@ -33149,6 +32946,8 @@ self: { ]; description = "URI parser / printer using attoparsec"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "attoparsec-varword" = callPackage @@ -33484,17 +33283,6 @@ self: { }) {}; "auto-update" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "auto-update"; - version = "0.1.5"; - sha256 = "0gyczrbz85gp90ibig99556gvi1m0j3rrilxdms6jryw70kkxbnz"; - libraryHaskellDepends = [ base ]; - description = "Efficiently run periodic, on-demand actions"; - license = stdenv.lib.licenses.mit; - }) {}; - - "auto-update_0_1_6" = callPackage ({ mkDerivation, base, exceptions, hspec, HUnit, retry }: mkDerivation { pname = "auto-update"; @@ -33504,15 +33292,14 @@ self: { testHaskellDepends = [ base exceptions hspec HUnit retry ]; description = "Efficiently run periodic, on-demand actions"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "autoexporter" = callPackage ({ mkDerivation, base, Cabal, directory, filepath }: mkDerivation { pname = "autoexporter"; - version = "1.1.13"; - sha256 = "05mgvif7wiq0vplk92kp8qn4a5wfma1gwdihqlz5lspmczszpdkv"; + version = "1.1.14"; + sha256 = "0ijykr8qg7ijadlkn0gx3n06n14ihar8dvaddmmaab2awpmaa3l8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Cabal directory filepath ]; @@ -33868,42 +33655,8 @@ self: { }: mkDerivation { pname = "avro"; - version = "0.4.4.3"; - sha256 = "12r08n7bz8qwknv8108qz3j0n7x12ia0wnzqng54pjb47jfdgfzi"; - libraryHaskellDepends = [ - aeson array base base16-bytestring bifunctors binary bytestring - containers data-binary-ieee754 deepseq fail hashable mtl scientific - semigroups tagged template-haskell text tf-random - unordered-containers vector zlib - ]; - testHaskellDepends = [ - aeson array base base16-bytestring bifunctors binary bytestring - containers directory extra fail hashable hspec lens lens-aeson mtl - pure-zlib QuickCheck raw-strings-qq scientific semigroups tagged - template-haskell text tf-random transformers unordered-containers - vector - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ - aeson base bytestring containers gauge hashable mtl random - raw-strings-qq text transformers unordered-containers vector - ]; - description = "Avro serialization support for Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "avro_0_4_5_1" = callPackage - ({ mkDerivation, aeson, array, base, base16-bytestring, bifunctors - , binary, bytestring, containers, data-binary-ieee754, deepseq - , directory, extra, fail, gauge, hashable, hspec, hspec-discover - , lens, lens-aeson, mtl, pure-zlib, QuickCheck, random - , raw-strings-qq, scientific, semigroups, tagged, template-haskell - , text, tf-random, transformers, unordered-containers, vector, zlib - }: - mkDerivation { - pname = "avro"; - version = "0.4.5.1"; - sha256 = "1a7ykj2c8bk7y8iaac1076sp4c4qzxh37d97w0xv63srmy7l1r8s"; + version = "0.4.5.2"; + sha256 = "0cy2r8jrnyxwsxpd6mah4g56xh8n93f6gd613a4bwg8kqvykrpgq"; libraryHaskellDepends = [ aeson array base base16-bytestring bifunctors binary bytestring containers data-binary-ieee754 deepseq fail hashable mtl scientific @@ -33914,17 +33667,16 @@ self: { aeson array base base16-bytestring bifunctors binary bytestring containers directory extra fail hashable hspec lens lens-aeson mtl pure-zlib QuickCheck raw-strings-qq scientific semigroups tagged - template-haskell text tf-random transformers unordered-containers - vector + text tf-random transformers unordered-containers vector ]; testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ aeson base bytestring containers gauge hashable mtl random - raw-strings-qq text transformers unordered-containers vector + raw-strings-qq template-haskell text transformers + unordered-containers vector ]; description = "Avro serialization support for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "avwx" = callPackage @@ -34204,6 +33956,8 @@ self: { ]; description = "Helper function and types for working with amazonka"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aws-ec2" = callPackage @@ -34464,6 +34218,8 @@ self: { executableHaskellDepends = [ aeson base lens lens-aeson text ]; description = "Haskell on AWS Lambda Runtime API"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aws-mfa-credentials" = callPackage @@ -34627,6 +34383,8 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Wrapper over Amazonka's SES"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aws-sign4" = callPackage @@ -35064,6 +34822,31 @@ self: { ]; description = "Heterogeneous automatic differentation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "backprop_0_2_6_3" = callPackage + ({ mkDerivation, base, containers, criterion, deepseq, directory + , hmatrix, microlens, microlens-th, mwc-random, primitive + , reflection, time, transformers, vector, vinyl + }: + mkDerivation { + pname = "backprop"; + version = "0.2.6.3"; + sha256 = "0zk3k20c100iwqcvg1xw2vdysn01w4h9jypz08xs849n1a3bp7di"; + libraryHaskellDepends = [ + base containers deepseq microlens primitive reflection transformers + vector vinyl + ]; + benchmarkHaskellDepends = [ + base criterion deepseq directory hmatrix microlens microlens-th + mwc-random time vector + ]; + description = "Heterogeneous automatic differentation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "backstop" = callPackage @@ -35388,25 +35171,12 @@ self: { ({ mkDerivation, base, containers, hspec, QuickCheck, time }: mkDerivation { pname = "bank-holidays-england"; - version = "0.1.0.8"; - sha256 = "0ak7m4xaymbh3cyhddj45p0pcazf79lnp63wvh4kh2f4fwh4f69j"; - libraryHaskellDepends = [ base containers time ]; - testHaskellDepends = [ base containers hspec QuickCheck time ]; - description = "Calculation of bank holidays in England and Wales"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "bank-holidays-england_0_2_0_1" = callPackage - ({ mkDerivation, base, containers, hspec, QuickCheck, time }: - mkDerivation { - pname = "bank-holidays-england"; version = "0.2.0.1"; sha256 = "0vnadqs924k54f5zdm0airnss47gafqbrak59wvrmc667xn01k0h"; libraryHaskellDepends = [ base containers time ]; testHaskellDepends = [ base containers hspec QuickCheck time ]; description = "Calculation of bank holidays in England and Wales"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "banwords" = callPackage @@ -35436,8 +35206,8 @@ self: { }: mkDerivation { pname = "barbies"; - version = "1.1.2.1"; - sha256 = "0svcdjs03i4ryhg3qzrp3l7ck0ilgnhxwc2h69qnzknqjklz7p1y"; + version = "1.1.3.0"; + sha256 = "0fb7d0fr46zm8y00nipq8vvq5fvhsx41jj52zvz27f690azpj961"; libraryHaskellDepends = [ base bifunctors ]; testHaskellDepends = [ base QuickCheck tasty tasty-hunit tasty-quickcheck @@ -35446,21 +35216,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "barbies_1_1_3_0" = callPackage - ({ mkDerivation, base, bifunctors, QuickCheck, tasty, tasty-hunit - , tasty-quickcheck + "barbly" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, bytestring, mtl + , optparse-applicative, shh, text }: mkDerivation { - pname = "barbies"; - version = "1.1.3.0"; - sha256 = "0fb7d0fr46zm8y00nipq8vvq5fvhsx41jj52zvz27f690azpj961"; - libraryHaskellDepends = [ base bifunctors ]; - testHaskellDepends = [ - base QuickCheck tasty tasty-hunit tasty-quickcheck + pname = "barbly"; + version = "0.1.0.0"; + sha256 = "1mmbvgw5g2jb8qv7vd00iym9xyb07jx03wi6x1ldqvzfn2vcc22l"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson async attoparsec base bytestring mtl optparse-applicative shh + text ]; - description = "Classes for working with types that can change clothes"; + description = "Create status bar menus for macOS from executables"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "barchart" = callPackage @@ -35908,8 +35681,6 @@ self: { ]; description = "A newtype around ByteString, for base64 encoding"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "base64-conduit" = callPackage @@ -35970,25 +35741,11 @@ self: { ({ mkDerivation, base, ghc-prim }: mkDerivation { pname = "basement"; - version = "0.0.10"; - sha256 = "01gmqkwd8cizlsn24wb1ld358k40kbaw84579y0h5nl7f41iniz3"; - revision = "2"; - editedCabalFile = "0ysyr6ir3i05a52rphsd3sp5izw397b0idamb7hm23jzl58qhj5v"; - libraryHaskellDepends = [ base ghc-prim ]; - description = "Foundation scrap box of array & string"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "basement_0_0_11" = callPackage - ({ mkDerivation, base, ghc-prim }: - mkDerivation { - pname = "basement"; version = "0.0.11"; sha256 = "0srlws74yiraqaapgcjd9p5d1fwb3zr9swcz74jpjm55fls2nn37"; libraryHaskellDepends = [ base ghc-prim ]; description = "Foundation scrap box of array & string"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "basen-bytestring" = callPackage @@ -37386,8 +37143,6 @@ self: { libraryHaskellDepends = [ base category ]; description = "Bifunctors"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "bifunctors" = callPackage @@ -37548,22 +37303,6 @@ self: { }) {}; "bimap" = callPackage - ({ mkDerivation, base, containers, exceptions, QuickCheck - , template-haskell - }: - mkDerivation { - pname = "bimap"; - version = "0.3.3"; - sha256 = "1lca7bdw4bh8xj88g0h05dq43dis9ah858r2pbnkxgdwqxar70kk"; - libraryHaskellDepends = [ base containers exceptions ]; - testHaskellDepends = [ - base containers exceptions QuickCheck template-haskell - ]; - description = "Bidirectional mapping between two key types"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "bimap_0_4_0" = callPackage ({ mkDerivation, base, containers, deepseq, exceptions, QuickCheck , template-haskell }: @@ -37579,7 +37318,6 @@ self: { ]; description = "Bidirectional mapping between two key types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bimap-server" = callPackage @@ -37857,8 +37595,6 @@ self: { ]; description = "Orphan instances for binary"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "binary-list" = callPackage @@ -37891,32 +37627,6 @@ self: { }) {}; "binary-orphans" = callPackage - ({ mkDerivation, aeson, base, binary, case-insensitive, hashable - , QuickCheck, quickcheck-instances, scientific, tagged, tasty - , tasty-quickcheck, text, text-binary, time, unordered-containers - , vector, vector-binary-instances - }: - mkDerivation { - pname = "binary-orphans"; - version = "0.1.8.0"; - sha256 = "1k6067wn9zki7xvbslvxx8cq1wrmz3kjb3q3x8mxycc9v765fxgi"; - revision = "5"; - editedCabalFile = "1dny1jvwwcyrbzhqvymmn6n7ib48bpy0nasbrcrdrpzjypkmg500"; - libraryHaskellDepends = [ - aeson base binary case-insensitive hashable scientific tagged text - text-binary time unordered-containers vector - vector-binary-instances - ]; - testHaskellDepends = [ - aeson base binary case-insensitive hashable QuickCheck - quickcheck-instances scientific tagged tasty tasty-quickcheck text - time unordered-containers vector - ]; - description = "Orphan instances for binary"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "binary-orphans_1_0_1" = callPackage ({ mkDerivation, base, binary, QuickCheck, quickcheck-instances , tagged, tasty, tasty-quickcheck, transformers }: @@ -37933,7 +37643,6 @@ self: { ]; description = "Compatibility package for binary; provides instances"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "binary-parser" = callPackage @@ -38123,37 +37832,6 @@ self: { "binary-tagged" = callPackage ({ mkDerivation, aeson, array, base, base16-bytestring, bifunctors - , binary, binary-orphans, bytestring, containers, criterion - , deepseq, 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.5.2"; - sha256 = "04yy7af7iv6i4wbv69j9vldk8c2xaxd9vz3cg0j1dn7h4dmwwbsz"; - libraryHaskellDepends = [ - aeson array base base16-bytestring binary bytestring containers - generics-sop hashable scientific SHA tagged text time - unordered-containers vector - ]; - testHaskellDepends = [ - aeson array base base16-bytestring bifunctors binary binary-orphans - bytestring containers generics-sop hashable quickcheck-instances - scientific SHA tagged tasty tasty-quickcheck text time - unordered-containers vector - ]; - benchmarkHaskellDepends = [ - aeson array base base16-bytestring binary binary-orphans bytestring - containers criterion deepseq generics-sop hashable nats scientific - semigroups SHA tagged text time unordered-containers vector - ]; - description = "Tagged binary serialisation"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "binary-tagged_0_2" = callPackage - ({ mkDerivation, aeson, array, base, base16-bytestring, bifunctors , binary, binary-instances, bytestring, containers, criterion , cryptohash-sha1, deepseq, generics-sop, hashable, nats , quickcheck-instances, scientific, semigroups, SHA, tagged, tasty @@ -38183,7 +37861,6 @@ self: { ]; description = "Tagged binary serialisation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "binary-tree" = callPackage @@ -39425,8 +39102,8 @@ self: { }: mkDerivation { pname = "birch-beer"; - version = "0.1.4.2"; - sha256 = "02q89rp7f12vf257f2m7g34qwv15027k7gsm4yq95blhi4c5rbg0"; + version = "0.1.4.5"; + sha256 = "1yyb897yg2ipvz6jsc6np1jwlckyi41jq94dwxlpyj2sigawzvwh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -39486,6 +39163,8 @@ self: { ]; description = "A small tool that clears qutebrowser cookies"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bisect-binary" = callPackage @@ -39538,8 +39217,6 @@ self: { ]; description = "Plays chess"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "bit-array" = callPackage @@ -40160,23 +39837,24 @@ self: { }) {}; "bitvec" = callPackage - ({ mkDerivation, base, gauge, ghc-prim, primitive - , quickcheck-classes, tasty, tasty-hunit, tasty-quickcheck, vector + ({ mkDerivation, base, containers, gauge, ghc-prim, primitive + , quickcheck-classes, random, tasty, tasty-hunit, tasty-quickcheck + , vector }: mkDerivation { pname = "bitvec"; - version = "1.0.0.0"; - sha256 = "0m33q70h513iiiwv7w45p4zz7jkf00p5kjy9x3ds6y2rk4di4vl2"; + version = "1.0.0.1"; + sha256 = "1b3cf8f3a2xx4m80699p63id26dj61d7lgz38n5kv0vskq1zfcsp"; + revision = "1"; + editedCabalFile = "0q8hc4i62l43kpg8q3nqqzz03cdcv36ins2741sw3956sj92xfh4"; libraryHaskellDepends = [ base ghc-prim primitive vector ]; testHaskellDepends = [ base primitive quickcheck-classes tasty tasty-hunit tasty-quickcheck vector ]; - benchmarkHaskellDepends = [ base gauge vector ]; - description = "Unboxed bit vectors"; + benchmarkHaskellDepends = [ base containers gauge random vector ]; + description = "Space-efficient bit vectors"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "bitwise" = callPackage @@ -40192,6 +39870,8 @@ self: { benchmarkHaskellDepends = [ array base bytestring criterion ]; description = "fast multi-dimensional unboxed bit packed Bool arrays"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bitx-bitcoin" = callPackage @@ -40349,6 +40029,8 @@ self: { ]; description = "Decentralized, k-ordered unique ID generator"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "blake2" = callPackage @@ -40357,24 +40039,6 @@ self: { }: mkDerivation { pname = "blake2"; - version = "0.2.0"; - sha256 = "1z1c70l2lmaj7d4wffsikf2w61i5ypjxnlwxddd8zsf6ypii1n87"; - libraryHaskellDepends = [ base bytestring ]; - testHaskellDepends = [ - base base16-bytestring bytestring hlint QuickCheck tasty - tasty-quickcheck - ]; - benchmarkHaskellDepends = [ base bytestring criterion ]; - description = "A library providing BLAKE2"; - license = stdenv.lib.licenses.publicDomain; - }) {}; - - "blake2_0_3_0" = callPackage - ({ mkDerivation, base, base16-bytestring, bytestring, criterion - , hlint, QuickCheck, tasty, tasty-quickcheck - }: - mkDerivation { - pname = "blake2"; version = "0.3.0"; sha256 = "0y937kr3dp87likwrl4wpaw80jhf383k89zn8li1yj3zp1vb6niv"; libraryHaskellDepends = [ base bytestring ]; @@ -40386,6 +40050,7 @@ self: { description = "A library providing BLAKE2"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "blakesum" = callPackage @@ -41388,8 +41053,6 @@ self: { ]; description = "Three games for inclusion in a web server"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "bogocopy" = callPackage @@ -41722,6 +41385,8 @@ self: { ]; description = "Boolean normal form: NNF, DNF & CNF"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "boolector" = callPackage @@ -41881,6 +41546,41 @@ self: { ]; description = "Boot application by plugins"; license = stdenv.lib.licenses.mit; + }) {}; + + "boots_0_1" = callPackage + ({ mkDerivation, base, exceptions, hspec, mtl }: + mkDerivation { + pname = "boots"; + version = "0.1"; + sha256 = "0d9mg56alrh6fhv5r5lh33pykfqaw45yz38gky1k6idnyy7w5aik"; + libraryHaskellDepends = [ base exceptions mtl ]; + testHaskellDepends = [ base exceptions hspec mtl ]; + description = "IoC Monad in Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "boots-app" = callPackage + ({ mkDerivation, base, boots, data-default, exceptions, fast-logger + , hspec, menshen, microlens, monad-logger, mtl, salak, salak-yaml + , splitmix, text, unliftio-core, vault + }: + mkDerivation { + pname = "boots-app"; + version = "0.1.0.5"; + sha256 = "0dx2nlbf86nbqfrxaacjskammx84bg4nrp5v075h76b9mky00i5l"; + libraryHaskellDepends = [ + base boots data-default exceptions fast-logger menshen microlens + monad-logger mtl salak salak-yaml splitmix text unliftio-core vault + ]; + testHaskellDepends = [ + base boots data-default exceptions fast-logger hspec menshen + microlens monad-logger mtl salak salak-yaml splitmix text + unliftio-core vault + ]; + description = "Startup factories using IoC monad"; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -42684,6 +42384,8 @@ self: { pname = "broadcast-chan"; version = "0.2.0.2"; sha256 = "12ax37y9i3cs8wifz01lpq0awm9c235l5xkybf13ywvyk5svb0jv"; + revision = "1"; + editedCabalFile = "1sgifhdf9l8zkc0dddnkfy8f1bkry061vm67iich489fi8nlhfjn"; libraryHaskellDepends = [ base unliftio-core ]; benchmarkHaskellDepends = [ async base criterion deepseq stm ]; description = "Closable, fair, single-wakeup channel type that avoids 0 reader space leaks"; @@ -42738,8 +42440,8 @@ self: { pname = "broadcast-chan-tests"; version = "0.2.0.2"; sha256 = "1m7m06pd9vfvz0rfnylpr6pjvizxv31qizri3a400rkz3zanhkym"; - revision = "1"; - editedCabalFile = "0vlqyhz02y5jkmxlic1rsxf1ddfffrsvkp67vsaf2zmqjjkvc8rh"; + revision = "2"; + editedCabalFile = "0mfld36ppfyhx2w9a99gxa8qxnik0mnznl7bvqhbbaf1ayinhx91"; libraryHaskellDepends = [ async base broadcast-chan clock containers optparse-applicative paramtree stm tagged tasty tasty-golden tasty-hunit tasty-travis @@ -43170,8 +42872,8 @@ self: { pname = "buffer"; version = "0.5.3"; sha256 = "0bf9y6rb3q26rk6qd7a2mjlb1gd1gp2k080ywhp5g48l474h6p26"; - revision = "1"; - editedCabalFile = "19v3zis3fqirsacacqnn7ypgvddgi6i8dj8bkbap2ln2mmqkvlh0"; + revision = "2"; + editedCabalFile = "0lg7sy7c059a29gmyihlwck6d98vq5kqfkw4bjixnvc2r9znfcv7"; libraryHaskellDepends = [ base base-prelude bug bytestring ]; testHaskellDepends = [ bug quickcheck-instances rerebase tasty tasty-hunit @@ -43482,35 +43184,38 @@ self: { tasty-quickcheck text ]; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; - "bulletproofs_1_0_0" = callPackage + "bulletproofs_1_0_1" = callPackage ({ mkDerivation, arithmoi, base, containers, criterion, cryptonite - , galois-field, memory, MonadRandom, pairing, protolude, QuickCheck + , galois-field, memory, MonadRandom, protolude, QuickCheck , random-shuffle, tasty, tasty-discover, tasty-hunit , tasty-quickcheck, text }: mkDerivation { pname = "bulletproofs"; - version = "1.0.0"; - sha256 = "1q1d8bj8hh2ik4arrgqrkhk4gwirvabfiw8mbazmpgvir8yv19s0"; + version = "1.0.1"; + sha256 = "1c23dppl851a1ga9x8axkl27bswb0hlwql0mfabsd9ydclmipzf0"; libraryHaskellDepends = [ arithmoi base containers cryptonite galois-field memory MonadRandom - pairing protolude QuickCheck random-shuffle text + protolude QuickCheck random-shuffle text ]; testHaskellDepends = [ arithmoi base containers cryptonite galois-field memory MonadRandom - pairing protolude QuickCheck random-shuffle tasty tasty-discover + protolude QuickCheck random-shuffle tasty tasty-discover tasty-hunit tasty-quickcheck text ]; testToolDepends = [ tasty-discover ]; benchmarkHaskellDepends = [ arithmoi base containers criterion cryptonite galois-field memory - MonadRandom pairing protolude QuickCheck random-shuffle tasty - tasty-hunit tasty-quickcheck text + MonadRandom protolude QuickCheck random-shuffle tasty tasty-hunit + tasty-quickcheck text ]; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bulmex" = callPackage @@ -43529,6 +43234,8 @@ self: { ]; description = "Reflex infused with bulma (css)"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bumper" = callPackage @@ -43796,28 +43503,6 @@ self: { "bv-little" = callPackage ({ mkDerivation, base, criterion, deepseq, hashable, integer-gmp - , mono-traversable, primitive, QuickCheck, tasty, tasty-hunit - , tasty-quickcheck - }: - mkDerivation { - pname = "bv-little"; - version = "0.1.2"; - sha256 = "0xscq4qjwisqiykdhiirxc58gsrmabvxmxwxw80f2m6ia103k3cc"; - libraryHaskellDepends = [ - base deepseq hashable integer-gmp mono-traversable primitive - QuickCheck - ]; - testHaskellDepends = [ - base deepseq hashable mono-traversable QuickCheck tasty tasty-hunit - tasty-quickcheck - ]; - benchmarkHaskellDepends = [ base criterion deepseq hashable ]; - description = "Efficient little-endian bit vector library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "bv-little_1_1_0" = callPackage - ({ mkDerivation, base, criterion, deepseq, hashable, integer-gmp , keys, mono-traversable, mono-traversable-keys, primitive , QuickCheck, smallcheck, tasty, tasty-hunit, tasty-quickcheck , tasty-smallcheck, text-show @@ -43841,7 +43526,6 @@ self: { ]; description = "Efficient little-endian bit vector library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bv-sized" = callPackage @@ -44530,8 +44214,8 @@ self: { }: mkDerivation { pname = "bzlib-conduit"; - version = "0.3.0.1"; - sha256 = "0fd2hnr782s7qgipazg2yxwia9qqhkvm9bcm90773c3zkxa13n23"; + version = "0.3.0.2"; + sha256 = "0a21zin5plsl37hkxh2jv8cxwyjrbs2fy7n5cyrzgdaa7lmp6b7b"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bindings-DSL bytestring conduit data-default-class mtl @@ -44975,8 +44659,8 @@ self: { }: mkDerivation { pname = "cabal-debian"; - version = "4.38.5"; - sha256 = "0pqislgc38q57jf252aha7x71pbdw5nxinx3gcm4s7311m25fw1f"; + version = "4.39"; + sha256 = "0cp1q9pa6wdij23bq7c3dac1byxxdr7maxvjj3jyi3v4d2mhgyvp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -45079,6 +44763,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cabal-fmt" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, directory + , filepath, mtl, optparse-applicative, parsec, pretty, process + , tasty, tasty-golden + }: + mkDerivation { + pname = "cabal-fmt"; + version = "0.1"; + sha256 = "0rk2gmidsikbzvh0jkrzwn2pbri8z5fhxfvlsh7wivlcqrz4jsf3"; + isLibrary = false; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring Cabal containers filepath mtl parsec pretty + ]; + executableHaskellDepends = [ + base bytestring directory filepath optparse-applicative + ]; + testHaskellDepends = [ + base bytestring Cabal filepath process tasty tasty-golden + ]; + doHaddock = false; + description = "Format .cabal files"; + license = stdenv.lib.licenses.gpl3Plus; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "cabal-ghc-dynflags" = callPackage ({ mkDerivation, base, Cabal, ghc, transformers }: mkDerivation { @@ -45455,27 +45166,6 @@ self: { }: mkDerivation { pname = "cabal-rpm"; - version = "0.12.6"; - sha256 = "1k602v7v87w6xcd9a5m8n5grnjbkyn79rdi9azl7djna0rs129ns"; - revision = "1"; - editedCabalFile = "0wfj9gcygm1c9fy86973ybs8ww8g6fn3l7f5v2kvs28204g8i18g"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base bytestring Cabal directory filepath http-client - http-client-tls http-conduit process simple-cmd time unix - ]; - description = "RPM packaging tool for Haskell Cabal-based packages"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "cabal-rpm_0_13_3" = callPackage - ({ mkDerivation, base, bytestring, Cabal, directory, filepath - , http-client, http-client-tls, http-conduit, process, simple-cmd - , time, unix - }: - mkDerivation { - pname = "cabal-rpm"; version = "0.13.3"; sha256 = "04d5m74i0r6livhkhmccrwhshpa2aizyb77i2qcqhxradw0lkvl4"; revision = "1"; @@ -45489,6 +45179,7 @@ self: { description = "RPM packaging tool for Haskell Cabal-based packages"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cabal-scripts" = callPackage @@ -45634,6 +45325,8 @@ self: { libraryHaskellDepends = [ base Cabal QuickCheck ]; description = "QuickCheck for Cabal"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cabal-toolkit" = callPackage @@ -46036,45 +45729,6 @@ self: { "cachix" = callPackage ({ mkDerivation, async, base, base16-bytestring, base64-bytestring , bytestring, cachix-api, conduit, conduit-extra, cookie - , cryptonite, data-default, dhall, directory, ed25519, filepath - , fsnotify, here, hspec, hspec-discover, http-client - , http-client-tls, http-conduit, http-types, lzma-conduit - , megaparsec, memory, mmorph, netrc, optparse-applicative, process - , protolude, retry, safe-exceptions, servant, servant-auth - , servant-auth-client, servant-client, servant-client-core - , servant-conduit, temporary, text, unix, uri-bytestring, versions - }: - mkDerivation { - pname = "cachix"; - version = "0.2.0"; - sha256 = "0nk6ay0vdq656bwkbnd16y95ivjbi34k8k58gcabr91bgypp1fhn"; - revision = "1"; - editedCabalFile = "103ypqp0kclc1814q2ci5fi2jpfbxwmjqfsnkvwf3c1vr8cqplmh"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - async base base16-bytestring base64-bytestring bytestring - cachix-api conduit conduit-extra cookie cryptonite data-default - dhall directory ed25519 filepath fsnotify here http-client - http-client-tls http-conduit http-types lzma-conduit megaparsec - memory mmorph netrc optparse-applicative process protolude retry - safe-exceptions servant servant-auth servant-auth-client - servant-client servant-client-core servant-conduit text unix - uri-bytestring versions - ]; - executableHaskellDepends = [ base cachix-api ]; - executableToolDepends = [ hspec-discover ]; - testHaskellDepends = [ - base cachix-api directory here hspec protolude temporary - ]; - description = "Command line client for Nix binary cache hosting https://cachix.org"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "cachix_0_2_1" = callPackage - ({ mkDerivation, async, base, base16-bytestring, base64-bytestring - , bytestring, cachix-api, conduit, conduit-extra, cookie , cryptonite, dhall, directory, ed25519, filepath, fsnotify, here , hspec, hspec-discover, http-client, http-client-tls, http-conduit , http-types, lzma-conduit, megaparsec, memory, mmorph, netrc @@ -46108,6 +45762,7 @@ self: { description = "Command line client for Nix binary cache hosting https://cachix.org"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cachix-api" = callPackage @@ -46121,41 +45776,6 @@ self: { }: mkDerivation { pname = "cachix-api"; - version = "0.2.0"; - sha256 = "1wmyxknd5fliqfsavngpj01i34jcl39rsm1lx0nf13vlsf279wkk"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base base16-bytestring bytestring conduit cookie cryptonite - deepseq exceptions http-api-data http-media lens memory resourcet - servant servant-auth servant-auth-server servant-auth-swagger - servant-client servant-swagger string-conv swagger2 text - transformers - ]; - executableHaskellDepends = [ aeson base ]; - testHaskellDepends = [ - aeson base base16-bytestring bytestring conduit cookie cryptonite - hspec http-api-data http-media lens memory protolude servant - servant-auth servant-auth-server servant-auth-swagger - servant-swagger servant-swagger-ui-core string-conv swagger2 text - transformers - ]; - testToolDepends = [ hspec-discover ]; - description = "Servant HTTP API specification for https://cachix.org"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "cachix-api_0_2_1" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, bytestring - , conduit, cookie, cryptonite, deepseq, exceptions, hspec - , hspec-discover, http-api-data, http-media, lens, memory - , protolude, resourcet, servant, servant-auth, servant-auth-server - , servant-auth-swagger, servant-client, servant-swagger - , servant-swagger-ui-core, string-conv, swagger2, text - , transformers - }: - mkDerivation { - pname = "cachix-api"; version = "0.2.1"; sha256 = "1ja724ji12whjhyw135yi2fq323a65h4bj37r43b5d9ir1c04g67"; isLibrary = true; @@ -46179,6 +45799,7 @@ self: { description = "Servant HTTP API specification for https://cachix.org"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cacophony" = callPackage @@ -46206,6 +45827,8 @@ self: { ]; description = "A library implementing the Noise protocol"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "caf" = callPackage @@ -46714,8 +46337,6 @@ self: { libraryHaskellDepends = [ arithmoi array base containers random ]; description = "Arithmetic for Psychedelically Large Numbers"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "canonical-filepath" = callPackage @@ -46890,6 +46511,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Convert data to and from a natural number representation"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cao" = callPackage @@ -46973,8 +46596,6 @@ self: { ]; description = "OTP-like supervision trees in Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "capnp" = callPackage @@ -47765,6 +47386,8 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Conduit interface for cassava package"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cassava-embed" = callPackage @@ -47919,6 +47542,8 @@ self: { testToolDepends = [ tasty-discover ]; description = "Multicast, thread-safe, and fast logger"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "castle" = callPackage @@ -48012,26 +47637,11 @@ self: { ({ mkDerivation, alg, base, transformers }: mkDerivation { pname = "category"; - version = "0.2.4.0"; - sha256 = "0c1507vl3r91f401ccsnphhis8krrzj789vzx9ynlg2lfalkvnni"; - libraryHaskellDepends = [ alg base transformers ]; - description = "Categorical types and classes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "category_0_2_4_1" = callPackage - ({ mkDerivation, alg, base, transformers }: - mkDerivation { - pname = "category"; version = "0.2.4.1"; sha256 = "0gliy1frgpgyzq3vkin315ylpklfc6dvg0vd93hz8f9m3js6dm48"; libraryHaskellDepends = [ alg base transformers ]; description = "Categorical types and classes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "category-extras" = callPackage @@ -48151,6 +47761,8 @@ self: { hspec QuickCheck ]; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cayene-lpp" = callPackage @@ -48245,29 +47857,6 @@ self: { }) {}; "cborg" = callPackage - ({ mkDerivation, aeson, array, base, base16-bytestring - , base64-bytestring, bytestring, containers, deepseq, fail - , ghc-prim, half, integer-gmp, primitive, QuickCheck, scientific - , tasty, tasty-hunit, tasty-quickcheck, text, vector - }: - mkDerivation { - pname = "cborg"; - version = "0.2.1.0"; - sha256 = "10vlv5mwg9625rmir7mi0zj5ygs3j3vlhm2h8lilkbj5frgp764i"; - libraryHaskellDepends = [ - array base bytestring containers deepseq ghc-prim half integer-gmp - primitive text - ]; - testHaskellDepends = [ - aeson array base base16-bytestring base64-bytestring bytestring - deepseq fail half QuickCheck scientific tasty tasty-hunit - tasty-quickcheck text vector - ]; - description = "Concise Binary Object Representation"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "cborg_0_2_2_0" = callPackage ({ mkDerivation, aeson, array, base, base-orphans , base16-bytestring, base64-bytestring, bytestring, containers , deepseq, fail, ghc-prim, half, integer-gmp, primitive, QuickCheck @@ -48289,7 +47878,6 @@ self: { ]; description = "Concise Binary Object Representation (CBOR)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cborg-json" = callPackage @@ -48710,6 +48298,8 @@ self: { ]; description = "Use cereal to encode/decode io-streams"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cereal-text" = callPackage @@ -48932,24 +48522,6 @@ self: { "cgi" = callPackage ({ mkDerivation, base, bytestring, containers, exceptions, mtl - , multipart, network, network-uri, parsec, time, xhtml - }: - mkDerivation { - pname = "cgi"; - version = "3001.3.0.3"; - sha256 = "1rml686pvjhpd51vj6g79c6132m8kx6kxikk7g246imps3bl90gb"; - revision = "3"; - editedCabalFile = "06gyp3mxx9jkkbz9sbn389wjsz33s231vk53pbsm37a1z9ply14a"; - libraryHaskellDepends = [ - base bytestring containers exceptions mtl multipart network - network-uri parsec time xhtml - ]; - description = "A library for writing CGI programs"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "cgi_3001_4_0_0" = callPackage - ({ mkDerivation, base, bytestring, containers, exceptions, mtl , multipart, network-uri, parsec, time, xhtml }: mkDerivation { @@ -48966,7 +48538,6 @@ self: { ]; description = "A library for writing CGI programs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cgi-undecidable" = callPackage @@ -49550,19 +49121,6 @@ self: { ({ mkDerivation, array, base, QuickCheck, random, semigroupoids }: mkDerivation { pname = "checkers"; - version = "0.4.14"; - sha256 = "0pnb7xdhaq4rw28hd4cz1b04w52ffjghw3x9zchiwm4h8hwhvibz"; - libraryHaskellDepends = [ - array base QuickCheck random semigroupoids - ]; - description = "Check properties on standard classes and data structures"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "checkers_0_5_0" = callPackage - ({ mkDerivation, array, base, QuickCheck, random, semigroupoids }: - mkDerivation { - pname = "checkers"; version = "0.5.0"; sha256 = "1kbn71blf67jfncv4gia8ygyzh4bngq36vapq2vqrqrzhap3mqi7"; libraryHaskellDepends = [ @@ -49570,7 +49128,6 @@ self: { ]; description = "Check properties on standard classes and data structures"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "checkmate" = callPackage @@ -49792,6 +49349,8 @@ self: { libraryToolDepends = [ c2hs ]; description = "Haskell bindings for Chipmunk2D physics engine"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "chitauri" = callPackage @@ -50155,6 +49714,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "chronos_1_0_7" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, clock + , criterion, deepseq, doctest, hashable, HUnit, old-locale + , primitive, QuickCheck, semigroups, test-framework + , test-framework-hunit, test-framework-quickcheck2, text, thyme + , time, torsor, vector + }: + mkDerivation { + pname = "chronos"; + version = "1.0.7"; + sha256 = "0yqk43ax20sk3rpxd5s857ivbgigvd5qdq4axawzmqr2na6jlikx"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring clock hashable primitive + semigroups text torsor vector + ]; + testHaskellDepends = [ + attoparsec base bytestring doctest HUnit QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 text torsor + ]; + benchmarkHaskellDepends = [ + attoparsec base bytestring criterion deepseq old-locale QuickCheck + text thyme time vector + ]; + description = "A performant time library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "chronos-bench" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, chronos , containers, deepseq, optparse-applicative, process, terminal-size @@ -51203,30 +50790,31 @@ self: { }) {}; "classify-frog" = callPackage - ({ mkDerivation, array, audacity, base, bifunctors, Cabal, carray + ({ mkDerivation, array, audacity, base, bifunctors, carray , comfort-array, concurrent-split, containers, deepseq , explicit-exception, fft, filemanip, gnuplot, hmm-lapack, lapack , lazy-csv, llvm-extra, llvm-tf, non-empty, numeric-prelude , optparse-applicative, parallel, pathtype, pooled-io, semigroups - , soxlib, storable-record, storablevector, storablevector-carray - , synthesizer-core, synthesizer-llvm, tagchup, text, time - , transformers, utility-ht, xml-basic + , shell-utility, soxlib, storable-record, storablevector + , storablevector-carray, synthesizer-core, synthesizer-llvm + , tagchup, text, time, transformers, utility-ht, xml-basic }: mkDerivation { pname = "classify-frog"; - version = "0.2.4.2"; - sha256 = "1q1jr4q1a27wscznrkr04fxlaac2xp7l02rzspmf8bpkadfp3wfw"; + version = "0.2.4.3"; + sha256 = "0pba3a2vj9s5x8mm878q8vl0a57vrm2c4s79n0vc2pggbkb6dybc"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ - array audacity base bifunctors Cabal carray comfort-array + array audacity base bifunctors carray comfort-array concurrent-split containers deepseq explicit-exception fft filemanip gnuplot hmm-lapack lapack lazy-csv llvm-extra llvm-tf non-empty numeric-prelude optparse-applicative parallel pathtype - pooled-io semigroups soxlib storable-record storablevector - storablevector-carray synthesizer-core synthesizer-llvm tagchup - text time transformers utility-ht xml-basic + pooled-io semigroups shell-utility soxlib storable-record + storablevector storablevector-carray synthesizer-core + synthesizer-llvm tagchup text time transformers utility-ht + xml-basic ]; description = "Classify sounds produced by Xenopus laevis"; license = stdenv.lib.licenses.bsd3; @@ -52041,18 +51629,6 @@ self: { }) {}; "clock" = callPackage - ({ mkDerivation, base, tasty, tasty-quickcheck }: - mkDerivation { - pname = "clock"; - version = "0.7.2"; - sha256 = "07v91s20halsqjmziqb1sqjp2sjpckl9by7y28aaklwqi2bh2rl8"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base tasty tasty-quickcheck ]; - description = "High-resolution clock functions: monotonic, realtime, cputime"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "clock_0_8" = callPackage ({ mkDerivation, base, criterion, tasty, tasty-quickcheck }: mkDerivation { pname = "clock"; @@ -52063,7 +51639,6 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "High-resolution clock functions: monotonic, realtime, cputime"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clock-extras" = callPackage @@ -52543,23 +52118,6 @@ self: { }: mkDerivation { pname = "cmark"; - version = "0.5.6.3"; - sha256 = "09vzb6hsh20ykr7z7vb5af1m68w0aj0yah39kjqkwbahsq2y5qpf"; - libraryHaskellDepends = [ base bytestring text ]; - testHaskellDepends = [ base HUnit text ]; - benchmarkHaskellDepends = [ - base blaze-html cheapskate criterion discount markdown sundown text - ]; - description = "Fast, accurate CommonMark (Markdown) parser and renderer"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "cmark_0_6" = callPackage - ({ mkDerivation, base, blaze-html, bytestring, cheapskate - , criterion, discount, HUnit, markdown, sundown, text - }: - mkDerivation { - pname = "cmark"; version = "0.6"; sha256 = "1p41z6z8dqxk62287lvhhg4ayy9laai9ljh4azsnzb029v6mbv0d"; libraryHaskellDepends = [ base bytestring text ]; @@ -52569,7 +52127,6 @@ self: { ]; description = "Fast, accurate CommonMark (Markdown) parser and renderer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cmark-gfm" = callPackage @@ -52578,23 +52135,6 @@ self: { }: mkDerivation { pname = "cmark-gfm"; - version = "0.1.8"; - sha256 = "0z5zkhax975b3ih71x846n09zrhqb7j4pn6rmfv6p4q8gncrrv9l"; - libraryHaskellDepends = [ base bytestring text ]; - testHaskellDepends = [ base HUnit text ]; - benchmarkHaskellDepends = [ - base blaze-html cheapskate criterion discount markdown sundown text - ]; - description = "Fast, accurate GitHub Flavored Markdown parser and renderer"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "cmark-gfm_0_2_0" = callPackage - ({ mkDerivation, base, blaze-html, bytestring, cheapskate - , criterion, discount, HUnit, markdown, sundown, text - }: - mkDerivation { - pname = "cmark-gfm"; version = "0.2.0"; sha256 = "03xflrkyw84qv3yjly5iks9311bqv5cmrmsylr763v4ph0fn7rjq"; libraryHaskellDepends = [ base bytestring text ]; @@ -52604,7 +52144,6 @@ self: { ]; description = "Fast, accurate GitHub Flavored Markdown parser and renderer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cmark-highlight" = callPackage @@ -52621,6 +52160,8 @@ self: { ]; description = "Code highlighting for cmark"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cmark-lucid" = callPackage @@ -52645,6 +52186,8 @@ self: { libraryHaskellDepends = [ base cmark ]; description = "Pattern synonyms for cmark"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cmark-sections" = callPackage @@ -52839,6 +52382,20 @@ self: { broken = true; }) {cmph = null;}; + "cmptype" = callPackage + ({ mkDerivation, base, ghc, magic-tyfams, should-not-typecheck }: + mkDerivation { + pname = "cmptype"; + version = "0.2.0.0"; + sha256 = "0pkflrrwrwks7qjw3rpqnrk1k3p1dw4dq75cqzq12m356m3a2fpc"; + libraryHaskellDepends = [ base ghc magic-tyfams ]; + testHaskellDepends = [ + base ghc magic-tyfams should-not-typecheck + ]; + description = "Compare types of any kinds"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cmt" = callPackage ({ mkDerivation, attoparsec, base, classy-prelude, containers , directory, file-embed, filepath, process, tasty, tasty-discover @@ -52945,31 +52502,6 @@ self: { }) {}; "co-log" = callPackage - ({ mkDerivation, ansi-terminal, base, bytestring, co-log-core - , containers, contravariant, directory, filepath, markdown-unlit - , mtl, stm, text, time, transformers, typerep-map - }: - mkDerivation { - pname = "co-log"; - version = "0.2.0"; - sha256 = "1xd83srrm659nf2s2xrm3zjg6zhrmhvj6s6mwx4axrgvnxf2lbjr"; - revision = "1"; - editedCabalFile = "0np7g6sqm6iyjyrypwlgrz67n0vhasvgp1k6cwrcj2lnmvjcrmvl"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - ansi-terminal base bytestring co-log-core containers contravariant - directory filepath mtl stm text time transformers typerep-map - ]; - executableHaskellDepends = [ base text typerep-map ]; - executableToolDepends = [ markdown-unlit ]; - description = "Composable Contravariant Comonadic Logging Library"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "co-log_0_3_0_0" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, chronos , co-log-core, containers, contravariant, directory, filepath , hedgehog, markdown-unlit, mtl, stm, text, transformers @@ -53000,18 +52532,6 @@ self: { }) {}; "co-log-core" = callPackage - ({ mkDerivation, base, doctest }: - mkDerivation { - pname = "co-log-core"; - version = "0.1.1"; - sha256 = "00qkkycxm4dmqpacbhi50kk9dyhd96b0d6csxs75pm4xy337205w"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest ]; - description = "Composable Contravariant Comonadic Logging Library"; - license = stdenv.lib.licenses.mpl20; - }) {}; - - "co-log-core_0_2_0_0" = callPackage ({ mkDerivation, base, doctest, Glob }: mkDerivation { pname = "co-log-core"; @@ -53021,7 +52541,6 @@ self: { testHaskellDepends = [ base doctest Glob ]; description = "Composable Contravariant Comonadic Logging Library"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "co-log-polysemy" = callPackage @@ -53366,6 +52885,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "coercion-extras" = callPackage + ({ mkDerivation, base, containers }: + mkDerivation { + pname = "coercion-extras"; + version = "0.1.0.0"; + sha256 = "051gh93yncgclmi5i16rm07wg7v0zqz7s1q40h50vny39glsgwc7"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base containers ]; + description = "Extra utilities for manipulating nominal and representational coercions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cofunctor" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -53643,6 +53174,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Collection+JSON—Hypermedia Type Tools"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "collections" = callPackage @@ -55559,22 +55092,6 @@ self: { }: mkDerivation { pname = "concurrency"; - version = "1.6.2.0"; - sha256 = "004h1wxdgqpxpk9vcvds759pn5qdp873b4bidakffxgh35nkxr68"; - libraryHaskellDepends = [ - array atomic-primops base exceptions monad-control mtl stm - transformers - ]; - description = "Typeclasses, functions, and data types for concurrency and STM"; - license = stdenv.lib.licenses.mit; - }) {}; - - "concurrency_1_7_0_0" = callPackage - ({ mkDerivation, array, atomic-primops, base, exceptions - , monad-control, mtl, stm, transformers - }: - mkDerivation { - pname = "concurrency"; version = "1.7.0.0"; sha256 = "16zg4c2x2ym7crvrimzp8jr3mw6qlbdzkfmv1h6smjp3bn8qxf06"; libraryHaskellDepends = [ @@ -55583,7 +55100,6 @@ self: { ]; description = "Typeclasses, functions, and data types for concurrency and STM"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "concurrency-benchmarks" = callPackage @@ -55658,8 +55174,8 @@ self: { }: mkDerivation { pname = "concurrent-dns-cache"; - version = "0.1.2"; - sha256 = "1hczxqvlnp5nxcx3mdpv9cm7mv66823jhyw9pibfklpy94syiz5a"; + version = "0.1.3"; + sha256 = "1qq8zj39sw1jl44v3midxv0xnmn5p5v6k4j8a2s5cgkjimdwwbz3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -55673,6 +55189,8 @@ self: { testHaskellDepends = [ async base dns hspec ]; description = "Concurrent DNS cache"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "concurrent-extra" = callPackage @@ -55721,22 +55239,6 @@ self: { }: mkDerivation { pname = "concurrent-output"; - version = "1.10.9"; - sha256 = "0mwf155w89nbbkjln7hhbn8k3f8p0ylcvgrg31cm7ijpx4499i4c"; - libraryHaskellDepends = [ - ansi-terminal async base directory exceptions process stm - terminal-size text transformers unix - ]; - description = "Ungarble output from several threads or commands"; - license = stdenv.lib.licenses.bsd2; - }) {}; - - "concurrent-output_1_10_10" = callPackage - ({ mkDerivation, ansi-terminal, async, base, directory, exceptions - , process, stm, terminal-size, text, transformers, unix - }: - mkDerivation { - pname = "concurrent-output"; version = "1.10.10"; sha256 = "1wnjxnwbc3l853kiiijagzjyb6fmhz3lmkwls24plbximl1qrr22"; libraryHaskellDepends = [ @@ -55745,7 +55247,6 @@ self: { ]; description = "Ungarble output from several threads or commands"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "concurrent-rpc" = callPackage @@ -56198,34 +55699,6 @@ self: { }: mkDerivation { pname = "conduit-extra"; - version = "1.3.3"; - sha256 = "037k62w01iskzkg0mw4rk8dp2szshzwskgsc3shffhbkqk654ksm"; - libraryHaskellDepends = [ - async attoparsec base bytestring conduit directory filepath network - primitive process resourcet stm streaming-commons text transformers - typed-process unliftio-core - ]; - testHaskellDepends = [ - async attoparsec base bytestring bytestring-builder conduit - directory exceptions filepath hspec process QuickCheck resourcet - stm streaming-commons text transformers transformers-base - ]; - benchmarkHaskellDepends = [ - base bytestring bytestring-builder conduit gauge transformers - ]; - description = "Batteries included conduit: adapters for common libraries"; - license = stdenv.lib.licenses.mit; - }) {}; - - "conduit-extra_1_3_4" = callPackage - ({ mkDerivation, async, attoparsec, base, bytestring - , bytestring-builder, conduit, directory, exceptions, filepath - , gauge, hspec, network, primitive, process, QuickCheck, resourcet - , stm, streaming-commons, text, transformers, transformers-base - , typed-process, unliftio-core - }: - mkDerivation { - pname = "conduit-extra"; version = "1.3.4"; sha256 = "1d853d39vj5pb8yxfcsnjwdzqzkm34ixzbnba8bslpihb7182wxi"; libraryHaskellDepends = [ @@ -56243,7 +55716,6 @@ self: { ]; description = "Batteries included conduit: adapters for common libraries"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "conduit-find" = callPackage @@ -56527,41 +55999,6 @@ self: { }: mkDerivation { pname = "confcrypt"; - version = "0.1.0.4"; - sha256 = "1c25xjpnw802pqfjksx5fxjq9ynwfjkkmyad169bvfasry98cdbb"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - amazonka amazonka-kms base base64-bytestring bytestring conduit - containers crypto-pubkey-openssh crypto-pubkey-types cryptonite - deepseq lens megaparsec mtl optparse-applicative parser-combinators - text transformers - ]; - executableHaskellDepends = [ - amazonka amazonka-kms base base64-bytestring bytestring conduit - containers crypto-pubkey-openssh crypto-pubkey-types cryptonite - deepseq lens megaparsec mtl optparse-applicative parser-combinators - text transformers - ]; - testHaskellDepends = [ - amazonka amazonka-kms base base64-bytestring bytestring conduit - containers crypto-pubkey-openssh crypto-pubkey-types cryptonite - deepseq HUnit lens megaparsec memory mtl optparse-applicative - parser-combinators QuickCheck tasty tasty-hunit tasty-quickcheck - text transformers - ]; - license = stdenv.lib.licenses.mit; - }) {}; - - "confcrypt_0_2_3_3" = callPackage - ({ mkDerivation, amazonka, amazonka-kms, base, base64-bytestring - , bytestring, conduit, containers, crypto-pubkey-openssh - , crypto-pubkey-types, cryptonite, deepseq, HUnit, lens, megaparsec - , memory, mtl, optparse-applicative, parser-combinators, QuickCheck - , tasty, tasty-hunit, tasty-quickcheck, text, transformers - }: - mkDerivation { - pname = "confcrypt"; version = "0.2.3.3"; sha256 = "18z0p9bd2ca43a64k3idsywm2f1vv6qh03l8isgnahjh7j96ngih"; isLibrary = true; @@ -56587,6 +56024,7 @@ self: { ]; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "confetti" = callPackage @@ -57021,25 +56459,6 @@ self: { }) {}; "connection" = callPackage - ({ mkDerivation, base, byteable, bytestring, containers - , data-default-class, network, socks, tls, x509, x509-store - , x509-system, x509-validation - }: - mkDerivation { - pname = "connection"; - version = "0.2.8"; - sha256 = "1swkb9w5vx9ph7x55y51dc0srj2z27nd9ibgn8c0qcl6hx7g9cbh"; - revision = "2"; - editedCabalFile = "0bhwcd9dqa2jk23bdz3z3vn2p1gzssinp96dxzznb7af4y5x2gmk"; - libraryHaskellDepends = [ - base byteable bytestring containers data-default-class network - socks tls x509 x509-store x509-system x509-validation - ]; - description = "Simple and easy network connections API"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "connection_0_3_0" = callPackage ({ mkDerivation, base, basement, bytestring, containers , data-default-class, network, socks, tls, x509, x509-store , x509-system, x509-validation @@ -57056,7 +56475,6 @@ self: { ]; description = "Simple and easy network connections API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "connection-pool" = callPackage @@ -57276,8 +56694,6 @@ self: { libraryHaskellDepends = [ base category unconstrained ]; description = "Reified constraints"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "constraint-classes" = callPackage @@ -57313,8 +56729,6 @@ self: { libraryHaskellDepends = [ base category constraint reflection ]; description = "Constraint reflection"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "constraints" = callPackage @@ -58365,6 +57779,8 @@ self: { ]; description = "A stream DSL for writing embedded C programs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "copilot-c99" = callPackage @@ -58429,6 +57845,8 @@ self: { ]; description = "A Haskell-embedded DSL for monitoring hard real-time distributed systems"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "copilot-libraries" = callPackage @@ -58444,6 +57862,8 @@ self: { ]; description = "Libraries for the Copilot language"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "copilot-sbv" = callPackage @@ -58478,6 +57898,8 @@ self: { ]; description = "k-induction for Copilot"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "copr" = callPackage @@ -59076,8 +58498,6 @@ self: { testHaskellDepends = [ base hspec hspec-megaparsec megaparsec ]; description = "Build tool for C"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "cplex-hs" = callPackage @@ -59293,35 +58713,6 @@ self: { "cql-io" = callPackage ({ mkDerivation, async, auto-update, base, bytestring, containers - , cql, cryptohash, data-default-class, Decimal, exceptions - , hashable, HsOpenSSL, iproute, lens, monad-control, mtl - , mwc-random, network, raw-strings-qq, retry, semigroups, stm - , tasty, tasty-hunit, text, time, tinylog, transformers - , transformers-base, unordered-containers, uuid, vector - }: - mkDerivation { - pname = "cql-io"; - version = "1.0.1.1"; - sha256 = "1kdv00fv21s8vbb3dfgzlgsrr0xxl4p2h655ga3q5cg47by564xc"; - libraryHaskellDepends = [ - async auto-update base bytestring containers cql cryptohash - data-default-class exceptions hashable HsOpenSSL iproute lens - monad-control mtl mwc-random network retry semigroups stm text time - tinylog transformers transformers-base unordered-containers uuid - vector - ]; - testHaskellDepends = [ - base containers cql Decimal iproute mtl raw-strings-qq tasty - tasty-hunit text time tinylog uuid - ]; - description = "Cassandra CQL client"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "cql-io_1_1_1" = callPackage - ({ mkDerivation, async, auto-update, base, bytestring, containers , cql, cryptonite, data-default-class, Decimal, exceptions , hashable, HsOpenSSL, iproute, lens, mtl, mwc-random, network , primes, raw-strings-qq, retry, semigroups, stm, tasty @@ -60056,8 +59447,8 @@ self: { }: mkDerivation { pname = "criterion-measurement"; - version = "0.1.1.0"; - sha256 = "0mmbhajphlg32gqxr1lf0w12jkw0qrpjabvx92zpv4ka71lpgy7m"; + version = "0.1.2.0"; + sha256 = "03p71mfnnfjx9dnf0yhrhdcr30zc2nwn5f8lql48cabccpd3793l"; libraryHaskellDepends = [ aeson base base-compat binary containers deepseq vector ]; @@ -60920,6 +60311,8 @@ self: { ]; description = "Cryptol: The Language of Cryptography"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cryptonite" = callPackage @@ -61079,6 +60472,8 @@ self: { ]; description = "Connection-set algebra (CSA) library"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cse-ghc-plugin" = callPackage @@ -61533,26 +60928,6 @@ self: { }: mkDerivation { pname = "cubicbezier"; - version = "0.6.0.5"; - sha256 = "0n17nr20skrds3b9gzy0v86jgnqz8zbds796n9cl0z6rh9bq5jf5"; - revision = "1"; - editedCabalFile = "0dii4z0cl1ylvay1n5z90d6rbvnk9k30q81i6izhgxbgdawwhh33"; - libraryHaskellDepends = [ - base containers fast-math integration matrices microlens - microlens-mtl microlens-th mtl vector vector-space - ]; - testHaskellDepends = [ base parsec tasty tasty-hunit ]; - description = "Efficient manipulating of 2D cubic bezier curves"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "cubicbezier_0_6_0_6" = callPackage - ({ mkDerivation, base, containers, fast-math, integration, matrices - , microlens, microlens-mtl, microlens-th, mtl, parsec, tasty - , tasty-hunit, vector, vector-space - }: - mkDerivation { - pname = "cubicbezier"; version = "0.6.0.6"; sha256 = "0s7s1ak0x89jy3q4yxrcvjzsq9w4yh23ycjcja6i7klj5gggqwss"; libraryHaskellDepends = [ @@ -61562,7 +60937,6 @@ self: { testHaskellDepends = [ base parsec tasty tasty-hunit ]; description = "Efficient manipulating of 2D cubic bezier curves"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cubicspline" = callPackage @@ -61977,8 +61351,8 @@ self: { }: mkDerivation { pname = "cursor"; - version = "0.0.0.1"; - sha256 = "0iq83v3yp7rj1fn82qkwakxi180nri50irzf8p8bzi558c6b3bmr"; + version = "0.1.0.1"; + sha256 = "1ipwk9lnazhkzy4fxdc4y0hqa1vdlgda43jdjnp9j00q5fgrhldz"; libraryHaskellDepends = [ base containers microlens text validity validity-containers validity-text @@ -61987,6 +61361,16 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "cursor-brick" = callPackage + ({ mkDerivation, base, brick, cursor, text }: + mkDerivation { + pname = "cursor-brick"; + version = "0.1.0.0"; + sha256 = "018i8yrdcj69qf00vz1sx7is5cx1a7vn5b8kr9b226n7vxlr3nzd"; + libraryHaskellDepends = [ base brick cursor text ]; + license = stdenv.lib.licenses.mit; + }) {}; + "cursor-gen" = callPackage ({ mkDerivation, base, containers, cursor, genvalidity , genvalidity-containers, genvalidity-hspec @@ -61995,8 +61379,8 @@ self: { }: mkDerivation { pname = "cursor-gen"; - version = "0.0.0.0"; - sha256 = "10jxxy3dx2gsddmq4l95ddim4cj85l7l76lamhgqlhx6zw4j7d52"; + version = "0.1.0.0"; + sha256 = "1f9s1da9vf8sr27aidk3rgvkn594pv94w4gqqyi6ikl5dx8yzqxn"; libraryHaskellDepends = [ base containers cursor genvalidity genvalidity-containers genvalidity-text QuickCheck text @@ -62007,8 +61391,6 @@ self: { ]; description = "Generators for Purely Functional Cursors"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "curve25519" = callPackage @@ -63774,6 +63156,8 @@ self: { ]; description = "Interval datatype, interval arithmetic and interval-based containers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "data-inttrie" = callPackage @@ -64406,8 +63790,6 @@ self: { ]; description = "An efficient implementation of maps from strings to arbitrary values"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "data-structure-inferrer" = callPackage @@ -65810,8 +65192,8 @@ self: { }: mkDerivation { pname = "debian"; - version = "3.95"; - sha256 = "1qbg1kya1a8ysmbls44hcwqlv7kr9cnlpnxwqv4pixamraqhqx1i"; + version = "3.95.1"; + sha256 = "1sfvjq9vilibvvcpm404z6j64ic54bd1s7yri8plfg849miynh95"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -66051,6 +65433,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "decidable_0_2_0_0" = callPackage + ({ mkDerivation, base, functor-products, microlens, singletons + , vinyl + }: + mkDerivation { + pname = "decidable"; + version = "0.2.0.0"; + sha256 = "1b0mnkgk60qm84wim9lq6hlgm2ijxjx0s4gahvd5fjkccdryz2h2"; + libraryHaskellDepends = [ + base functor-products microlens singletons vinyl + ]; + description = "Combinators for manipulating dependently-typed predicates"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "decimal-arithmetic" = callPackage ({ mkDerivation, base, binary, binary-bits, deepseq, doctest, hspec , mtl, QuickCheck @@ -66490,22 +65888,6 @@ self: { }: mkDerivation { pname = "dejafu"; - version = "1.11.0.5"; - sha256 = "18pcjk60r1q798qba285g20fh8v5q2qphgpx3r0a0yy7p1qnjwv2"; - libraryHaskellDepends = [ - base concurrency containers contravariant deepseq exceptions - leancheck profunctors random transformers - ]; - description = "A library for unit-testing concurrent programs"; - license = stdenv.lib.licenses.mit; - }) {}; - - "dejafu_2_1_0_0" = callPackage - ({ mkDerivation, base, concurrency, containers, contravariant - , deepseq, exceptions, leancheck, profunctors, random, transformers - }: - mkDerivation { - pname = "dejafu"; version = "2.1.0.0"; sha256 = "19jvcfkwavmvf08dwsch3izk9qzw8ldrghpvjgv2vh5dxr7wr9xq"; libraryHaskellDepends = [ @@ -66514,7 +65896,6 @@ self: { ]; description = "A library for unit-testing concurrent programs"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "deka" = callPackage @@ -66877,12 +66258,12 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; - "dependent-sum_0_6_1" = callPackage + "dependent-sum_0_6_2_0" = callPackage ({ mkDerivation, base, constraints-extras }: mkDerivation { pname = "dependent-sum"; - version = "0.6.1"; - sha256 = "077pq10kldxk47zlrz022a1m7a5qpr2xa2wapa01xa2hrlgv5xh4"; + version = "0.6.2.0"; + sha256 = "17xj5mfrqbhf614z25l2km5grhrxh1rfhb8h8g677sv2xgxrv82d"; libraryHaskellDepends = [ base constraints-extras ]; description = "Dependent sum type"; license = stdenv.lib.licenses.publicDomain; @@ -67029,23 +66410,6 @@ self: { }) {}; "deque" = callPackage - ({ mkDerivation, base, QuickCheck, quickcheck-instances, rerebase - , tasty, tasty-hunit, tasty-quickcheck - }: - mkDerivation { - pname = "deque"; - version = "0.2.7"; - sha256 = "1wshylwnajw3hhqnnb72rlb05m91br57gf32770xi2h4r0h30lcr"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ - QuickCheck quickcheck-instances rerebase tasty tasty-hunit - tasty-quickcheck - ]; - description = "Double-ended queue"; - license = stdenv.lib.licenses.mit; - }) {}; - - "deque_0_4_2_3" = callPackage ({ mkDerivation, base, mtl, QuickCheck, quickcheck-instances , rerebase, strict-list, tasty, tasty-hunit, tasty-quickcheck }: @@ -67060,7 +66424,6 @@ self: { ]; description = "Double-ended queues"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dequeue" = callPackage @@ -67075,6 +66438,8 @@ self: { testHaskellDepends = [ base Cabal cabal-test-quickcheck ]; description = "A typeclass and an implementation for double-ended queues"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "derangement" = callPackage @@ -67123,6 +66488,8 @@ self: { executableHaskellDepends = [ base ]; description = "A program and library to derive instances for data types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "derive-IG" = callPackage @@ -67691,38 +67058,42 @@ self: { }) {}; "dhall" = callPackage - ({ mkDerivation, ansi-terminal, base, bytestring, case-insensitive - , cborg, containers, contravariant, criterion, cryptonite, deepseq - , Diff, directory, doctest, dotgen, exceptions, filepath, haskeline + ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, base + , bytestring, case-insensitive, cborg, cborg-json, containers + , contravariant, criterion, cryptonite, deepseq, Diff, directory + , doctest, dotgen, exceptions, filepath, foldl, haskeline , http-client, http-client-tls, http-types, lens-family-core , megaparsec, memory, mockery, mtl, optparse-applicative, parsers - , prettyprinter, prettyprinter-ansi-terminal, QuickCheck - , quickcheck-instances, repline, scientific, serialise, tasty - , tasty-hunit, tasty-quickcheck, template-haskell, text - , transformers, unordered-containers, uri-encode, vector + , prettyprinter, prettyprinter-ansi-terminal, profunctors + , QuickCheck, quickcheck-instances, repline, scientific, serialise + , tasty, tasty-hunit, tasty-quickcheck, template-haskell, text + , transformers, transformers-compat, turtle, unordered-containers + , uri-encode, vector }: mkDerivation { pname = "dhall"; - version = "1.19.1"; - sha256 = "14fjfwsirf8l7wirv590ix01liyd0xbhqy4h7pjblyy62m22mlzq"; - revision = "1"; - editedCabalFile = "193h4dmlz1asfr1ldy0saa9spgp64xh60xh3yywzn9lz0hxzbfpg"; + version = "1.24.0"; + sha256 = "1n04jk45qjl00wx7gxzp36j7d1m1ca7h7y4qlp8gxhykpkr6zzv7"; + revision = "2"; + editedCabalFile = "10ki70113z1kgq35xaib7qwrpzjl93hq4qxm0qb62d3pvaf4wp15"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-terminal base bytestring case-insensitive cborg containers - contravariant cryptonite Diff directory dotgen exceptions filepath - haskeline http-client http-client-tls http-types lens-family-core - megaparsec memory mtl optparse-applicative parsers prettyprinter - prettyprinter-ansi-terminal repline scientific serialise - template-haskell text transformers unordered-containers uri-encode - vector + aeson aeson-pretty ansi-terminal base bytestring case-insensitive + cborg cborg-json containers contravariant cryptonite Diff directory + dotgen exceptions filepath haskeline http-client http-client-tls + http-types lens-family-core megaparsec memory mtl + optparse-applicative parsers prettyprinter + prettyprinter-ansi-terminal profunctors repline scientific + serialise template-haskell text transformers transformers-compat + unordered-containers uri-encode vector ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - base containers deepseq directory doctest filepath mockery - prettyprinter QuickCheck quickcheck-instances serialise tasty - tasty-hunit tasty-quickcheck text transformers vector + base bytestring cborg containers deepseq directory doctest filepath + foldl megaparsec mockery prettyprinter QuickCheck + quickcheck-instances serialise tasty tasty-hunit tasty-quickcheck + text transformers turtle vector ]; benchmarkHaskellDepends = [ base bytestring containers criterion directory serialise text @@ -67782,8 +67153,8 @@ self: { }: mkDerivation { pname = "dhall-bash"; - version = "1.0.18"; - sha256 = "036ccz1kwhavl03q5lh14dxic8gjqb5cw14aws6a53gpk6p4vvff"; + version = "1.0.21"; + sha256 = "06rv0wrs1ym6szy78wg3nyfwaqm279vy6m7zny9s90lnpa6dc098"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -67839,30 +67210,35 @@ self: { }) {}; "dhall-json" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring, dhall - , optparse-applicative, tasty, tasty-hunit, text - , unordered-containers, vector, yaml + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers + , dhall, exceptions, lens, libyaml, optparse-applicative + , scientific, tasty, tasty-hunit, text, unordered-containers + , vector, yaml }: mkDerivation { pname = "dhall-json"; - version = "1.2.6"; - sha256 = "0f18kn15v8pzkdayj2hql28fbba9i75msbi41yscik40lw2sg2cr"; + version = "1.3.0"; + sha256 = "176i30shaklranbhmb4m4zqn13cn9hd6lqiqdjv9qmckkapbkjpi"; revision = "1"; - editedCabalFile = "1x6dgsqcgd8mvqwqq53aj8xgnfin6c66wn8vc7ikxiy0gilp686x"; + editedCabalFile = "101xfp3zg9i7qyibknjpcdhha8sc024xmylphiwb509h3fjy3yks"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base dhall optparse-applicative text unordered-containers + aeson aeson-pretty base bytestring containers dhall exceptions lens + libyaml optparse-applicative scientific text unordered-containers + vector yaml ]; executableHaskellDepends = [ - aeson aeson-pretty base bytestring dhall optparse-applicative text - vector yaml + aeson aeson-pretty base bytestring dhall exceptions + optparse-applicative text ]; testHaskellDepends = [ aeson base bytestring dhall tasty tasty-hunit text ]; - description = "Compile Dhall to JSON or YAML"; + description = "Convert between Dhall and JSON or YAML"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dhall-json_1_4_0" = callPackage @@ -67893,6 +67269,7 @@ self: { description = "Convert between Dhall and JSON or YAML"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dhall-lex" = callPackage @@ -69242,6 +68619,8 @@ self: { ]; description = "Happstack backend for the digestive-functors library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "digestive-functors-heist" = callPackage @@ -69340,6 +68719,8 @@ self: { ]; description = "A data-type representing digits 0-9 and other combinations"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "digitalocean-kzs" = callPackage @@ -69991,6 +69372,8 @@ self: { executableHaskellDepends = [ base text ]; description = "Write bots for Discord in Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "discord-hs" = callPackage @@ -71204,10 +70587,8 @@ self: { ({ mkDerivation, base, Cabal, deepseq, QuickCheck }: mkDerivation { pname = "dlist"; - version = "0.8.0.6"; - sha256 = "0gy70df86pfmqwbmnafdw2w5jnflvn5mca8npxzfg23f3p4ll2vq"; - revision = "1"; - editedCabalFile = "0f3r78gjdrhg5zg693dgdfx78ds6vbp5bg1sws1y1vbamraa65sf"; + version = "0.8.0.7"; + sha256 = "0b5spkzvj2kx8pk86xz0djkxs13j7dryf5fl16dk4mlp1wh6mh53"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base Cabal QuickCheck ]; description = "Difference lists"; @@ -71289,6 +70670,8 @@ self: { ]; description = "AVAYA DMCC API bindings and WebSockets server for AVAYA"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dmenu" = callPackage @@ -71366,31 +70749,6 @@ self: { }) {}; "dns" = callPackage - ({ mkDerivation, async, attoparsec, auto-update, base - , base64-bytestring, binary, bytestring, containers, cryptonite - , doctest, hspec, iproute, mtl, network, psqueues, QuickCheck, safe - , time, word8 - }: - mkDerivation { - pname = "dns"; - version = "3.0.4"; - sha256 = "1aa4zb9zkk244rndimrq8maxj9qrmz3rb13v9n8jblmp6ssk6d3v"; - revision = "1"; - editedCabalFile = "15jafrm919w4p23m7kpmyc1yvzpy88jcccycc00dza69d119zjdr"; - libraryHaskellDepends = [ - async attoparsec auto-update base base64-bytestring binary - bytestring containers cryptonite iproute mtl network psqueues safe - time - ]; - testHaskellDepends = [ - base bytestring doctest hspec iproute network QuickCheck word8 - ]; - testTarget = "spec"; - description = "DNS library in Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "dns_4_0_0" = callPackage ({ mkDerivation, array, async, attoparsec, auto-update, base , base16-bytestring, base64-bytestring, bytestring, Cabal , cabal-doctest, containers, cryptonite, doctest, hourglass, hspec @@ -71412,7 +70770,6 @@ self: { testTarget = "spec"; description = "DNS library in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dnscache" = callPackage @@ -71602,6 +70959,8 @@ self: { ]; description = "An API client for docker written in Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "docker-build-cacher" = callPackage @@ -71754,35 +71113,6 @@ self: { ({ mkDerivation, base, base-compat, code-page, deepseq, directory , filepath, ghc, ghc-paths, hspec, HUnit, mockery, process , QuickCheck, setenv, silently, stringbuilder, syb, transformers - , with-location - }: - mkDerivation { - pname = "doctest"; - version = "0.16.0.1"; - sha256 = "106pc4rs4cfym7754gzdgy36dm9aidwmnqpjm9k7yq1hfd4pallv"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base base-compat code-page deepseq directory filepath ghc ghc-paths - process syb transformers - ]; - executableHaskellDepends = [ - base base-compat code-page deepseq directory filepath ghc ghc-paths - process syb transformers - ]; - testHaskellDepends = [ - base base-compat code-page deepseq directory filepath ghc ghc-paths - hspec HUnit mockery process QuickCheck setenv silently - stringbuilder syb transformers with-location - ]; - description = "Test interactive Haskell examples"; - license = stdenv.lib.licenses.mit; - }) {}; - - "doctest_0_16_1" = callPackage - ({ mkDerivation, base, base-compat, code-page, deepseq, directory - , filepath, ghc, ghc-paths, hspec, HUnit, mockery, process - , QuickCheck, setenv, silently, stringbuilder, syb, transformers }: mkDerivation { pname = "doctest"; @@ -71805,7 +71135,6 @@ self: { ]; description = "Test interactive Haskell examples"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "doctest-discover" = callPackage @@ -71936,8 +71265,6 @@ self: { ]; description = "Client bindings for the DocuSign API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "docusign-example" = callPackage @@ -72212,39 +71539,11 @@ self: { executableHaskellDepends = [ base containers graphviz hxt text ]; description = "Converter from GraphViz .dot format to yEd GraphML"; license = stdenv.lib.licenses.bsd3; - }) {}; - - "dotenv" = callPackage - ({ mkDerivation, base, base-compat, containers, directory - , exceptions, hspec, hspec-megaparsec, megaparsec - , optparse-applicative, process, text, transformers, yaml - }: - mkDerivation { - pname = "dotenv"; - version = "0.8.0.0"; - sha256 = "0b1pz7wh5kf0sjkig0y4ks6i2z5yzpvlnd6hgzl0sj4j6w2j35ly"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base base-compat containers directory exceptions megaparsec process - text transformers yaml - ]; - executableHaskellDepends = [ - base base-compat megaparsec optparse-applicative process text - transformers yaml - ]; - testHaskellDepends = [ - base base-compat containers directory exceptions hspec - hspec-megaparsec megaparsec process text transformers yaml - ]; - description = "Loads environment variables from dotenv files"; - license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; - "dotenv_0_8_0_2" = callPackage + "dotenv" = callPackage ({ mkDerivation, base, base-compat, containers, directory , exceptions, hspec, hspec-megaparsec, megaparsec , optparse-applicative, process, text, transformers, yaml @@ -72424,6 +71723,8 @@ self: { testToolDepends = [ tasty-discover ]; description = "A proof assistant for Magic: The Gathering puzzles"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dow" = callPackage @@ -73799,8 +73100,6 @@ self: { ]; description = "Draw and update graphs in real time with OpenGL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "dynamic-graphs" = callPackage @@ -74365,6 +73664,8 @@ self: { ]; description = "A handy tool for uploading unikernels to Amazon's EC2"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "eccrypto" = callPackage @@ -75116,12 +74417,13 @@ self: { }) {}; "either-both" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, smallcheck, tasty, tasty-smallcheck }: mkDerivation { pname = "either-both"; - version = "0.1.0.0"; - sha256 = "1lbvahbbmhz6cazl5s4wkf66h1l20cg7380g027h53v5pjpvpdpl"; + version = "0.1.1.1"; + sha256 = "1cm6g0wvwqlm405y8svv2fi49kpxqs7hffwd4gnsvlk2rfxng93f"; libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ]; description = "Either or both"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -75230,6 +74532,8 @@ self: { ]; description = "An ekg backend for Amazon Cloudwatch"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ekg-core" = callPackage @@ -75354,6 +74658,8 @@ self: { testHaskellDepends = [ base ]; description = "Easily expose your EKG metrics to Prometheus"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ekg-push" = callPackage @@ -75514,25 +74820,12 @@ self: { ({ mkDerivation, base, binary, bytestring, containers, hspec }: mkDerivation { pname = "elf"; - version = "0.29"; - sha256 = "1b4g98fk1p8mk0zdh6fwzm3vnzcrhvpysx4g4ahcbgbr4bqhjra2"; - libraryHaskellDepends = [ base binary bytestring ]; - testHaskellDepends = [ base bytestring containers hspec ]; - description = "An Elf parser"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "elf_0_30" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, hspec }: - mkDerivation { - pname = "elf"; version = "0.30"; sha256 = "16gfpqsqfwlq4qprh0nswa4br1rz7rj7in7v803cqggkxz7s5c4p"; libraryHaskellDepends = [ base binary bytestring ]; testHaskellDepends = [ base bytestring containers hspec ]; description = "An Elf parser"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "eliminators" = callPackage @@ -75569,6 +74862,31 @@ self: { broken = true; }) {}; + "elliptic-curve" = callPackage + ({ mkDerivation, arithmoi, base, criterion, galois-field + , MonadRandom, protolude, tasty, tasty-hunit, tasty-quickcheck + , text, wl-pprint-text + }: + mkDerivation { + pname = "elliptic-curve"; + version = "0.2.2"; + sha256 = "082q01xqfqa73c0wasmh8v0hgf76gsfg8jzd78n9vgrp69zali1n"; + libraryHaskellDepends = [ + base galois-field MonadRandom protolude tasty-quickcheck text + wl-pprint-text + ]; + testHaskellDepends = [ + arithmoi base galois-field MonadRandom protolude tasty tasty-hunit + tasty-quickcheck text wl-pprint-text + ]; + benchmarkHaskellDepends = [ + base criterion galois-field MonadRandom protolude tasty-quickcheck + text wl-pprint-text + ]; + description = "Elliptic curve library"; + license = stdenv.lib.licenses.mit; + }) {}; + "elm-bridge" = callPackage ({ mkDerivation, aeson, base, containers, hspec, QuickCheck , template-haskell, text @@ -76032,6 +75350,8 @@ self: { testHaskellDepends = [ base directory filepath tasty tasty-hunit ]; description = "A tiny language for understanding the lambda-calculus"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "emacs-keys" = callPackage @@ -76566,8 +75886,6 @@ self: { ]; description = "An @engine-io@ @ServerAPI@ that is compatible with @Wai@"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "engine-io-yesod" = callPackage @@ -76686,22 +76004,6 @@ self: { }: mkDerivation { pname = "enum-text"; - version = "0.5.0.0"; - sha256 = "0yg7rkbw1swr1mwkkkybrbs9prx1jj72af4rsx7jcb1zpzzarfs4"; - libraryHaskellDepends = [ - array base bytestring fmt hashable possibly text time - unordered-containers - ]; - description = "A text rendering and parsing toolkit for enumerated types"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "enum-text_0_5_1_0" = callPackage - ({ mkDerivation, array, base, bytestring, fmt, hashable, possibly - , text, time, unordered-containers - }: - mkDerivation { - pname = "enum-text"; version = "0.5.1.0"; sha256 = "0v48hmxbpzjpclg1q0avrc1dp4giglbxy2rkqnbj4f0sprp03kff"; libraryHaskellDepends = [ @@ -76710,7 +76012,6 @@ self: { ]; description = "A text rendering and parsing toolkit for enumerated types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "enum-text-rio" = callPackage @@ -76727,8 +76028,6 @@ self: { ]; description = "Making fmt available with rio"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "enum-types" = callPackage @@ -76922,26 +76221,6 @@ self: { }: mkDerivation { pname = "enummapset"; - version = "0.6.0.1"; - sha256 = "0nljpb5fxk4piwl5mh1v23ps9bzhxxcybfhd8mmb66k20gxxxf7q"; - libraryHaskellDepends = [ base containers deepseq semigroups ]; - testHaskellDepends = [ - array base containers deepseq ghc-prim HUnit QuickCheck semigroups - test-framework test-framework-hunit test-framework-quickcheck2 - ]; - description = "IntMap and IntSet with Enum keys/elements"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "enummapset_0_6_0_2" = callPackage - ({ mkDerivation, array, base, containers, deepseq, ghc-prim, HUnit - , QuickCheck, semigroups, test-framework, test-framework-hunit - , test-framework-quickcheck2 - }: - mkDerivation { - pname = "enummapset"; version = "0.6.0.2"; sha256 = "0476rzarcfpp4qm4qsz6wdnhr11nlfhqgrnbni591kbmngqlld1v"; libraryHaskellDepends = [ base containers deepseq semigroups ]; @@ -76951,8 +76230,6 @@ self: { ]; description = "IntMap and IntSet with Enum keys/elements"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "enummapset-th" = callPackage @@ -76986,6 +76263,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "enumset_0_0_5" = callPackage + ({ mkDerivation, base, data-accessor, semigroups, storable-record + }: + mkDerivation { + pname = "enumset"; + version = "0.0.5"; + sha256 = "0d9lnl7mmcwydfhb4iazh6gcdbxvdh7b3gar3c9l1k5xmc4r8qii"; + libraryHaskellDepends = [ + base data-accessor semigroups storable-record + ]; + description = "Sets of enumeration values represented by machine words"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "env-locale" = callPackage ({ mkDerivation, base, old-locale, time }: mkDerivation { @@ -77072,25 +76364,6 @@ self: { }: mkDerivation { pname = "envy"; - version = "1.5.1.0"; - sha256 = "1r2181n5ayww1ycg7vvz5pp5cyxs6asljf4kir7g80qnj2wwpjid"; - libraryHaskellDepends = [ - base bytestring containers mtl text time transformers - ]; - testHaskellDepends = [ - base bytestring hspec mtl QuickCheck quickcheck-instances text time - transformers - ]; - description = "An environmentally friendly way to deal with environment variables"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "envy_2_0_0_0" = callPackage - ({ mkDerivation, base, bytestring, containers, hspec, mtl - , QuickCheck, quickcheck-instances, text, time, transformers - }: - mkDerivation { - pname = "envy"; version = "2.0.0.0"; sha256 = "0l3rg9kvx5pp8ly1wl86g0nfp4161vdbf1cavpm2s84hahq9wg0z"; libraryHaskellDepends = [ @@ -77102,7 +76375,6 @@ self: { ]; description = "An environmentally friendly way to deal with environment variables"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "epanet-haskell" = callPackage @@ -77926,8 +77198,8 @@ self: { }: mkDerivation { pname = "esqueleto"; - version = "2.6.0"; - sha256 = "1asbvcjmbyd44rfs8a645cvfqmf95b6hnb3l7lqd56kv32km69nn"; + version = "3.0.0"; + sha256 = "187c098h2xyf2nhifkdy2bqfl6iap7a93mzwd2kirl5yyicpc9zy"; libraryHaskellDepends = [ base blaze-html bytestring conduit monad-logger persistent resourcet tagged text time transformers unliftio @@ -77944,29 +77216,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "esqueleto_3_0_0" = callPackage - ({ mkDerivation, base, blaze-html, bytestring, conduit, containers - , hspec, monad-logger, mysql, mysql-simple, persistent - , persistent-mysql, persistent-postgresql, persistent-sqlite - , persistent-template, postgresql-libpq, postgresql-simple - , resourcet, tagged, text, time, transformers, unliftio - , unordered-containers + "esqueleto_3_1_0" = callPackage + ({ mkDerivation, aeson, base, blaze-html, bytestring, conduit + , containers, exceptions, hspec, monad-logger, mysql, mysql-simple + , persistent, persistent-mysql, persistent-postgresql + , persistent-sqlite, persistent-template, postgresql-libpq + , postgresql-simple, resourcet, tagged, text, time, transformers + , unliftio, unordered-containers, vector }: mkDerivation { pname = "esqueleto"; - version = "3.0.0"; - sha256 = "187c098h2xyf2nhifkdy2bqfl6iap7a93mzwd2kirl5yyicpc9zy"; + version = "3.1.0"; + sha256 = "0x3hrh5ymv19l52634q18hsmxjranngc32ig6b2lbd5lz8d6iigy"; libraryHaskellDepends = [ - base blaze-html bytestring conduit monad-logger persistent + aeson base blaze-html bytestring conduit monad-logger persistent resourcet tagged text time transformers unliftio unordered-containers ]; testHaskellDepends = [ - base blaze-html bytestring conduit containers hspec monad-logger - mysql mysql-simple persistent persistent-mysql + aeson base blaze-html bytestring conduit containers exceptions + hspec monad-logger mysql mysql-simple persistent persistent-mysql persistent-postgresql persistent-sqlite persistent-template postgresql-libpq postgresql-simple resourcet tagged text time - transformers unliftio unordered-containers + transformers unliftio unordered-containers vector ]; description = "Type-safe EDSL for SQL queries on persistent backends"; license = stdenv.lib.licenses.bsd3; @@ -78413,6 +77685,8 @@ self: { ]; description = "Euler tour trees"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "euphoria" = callPackage @@ -78833,6 +78107,8 @@ self: { ]; description = "Provides common test specification for Store implementation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "eventsource-stub-store" = callPackage @@ -78854,6 +78130,8 @@ self: { ]; description = "An in-memory stub store implementation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "eventsourced" = callPackage @@ -78881,43 +78159,6 @@ self: { ({ mkDerivation, aeson, array, async, base, bifunctors, bytestring , cereal, clock, connection, containers, dns, dotnet-timespan , ekg-core, exceptions, fast-logger, file-embed, hashable - , http-client, interpolate, lifted-async, lifted-base, machines - , monad-control, monad-logger, mono-traversable, mtl, protobuf - , random, safe, safe-exceptions, semigroups, stm, stm-chans - , streaming, tasty, tasty-hspec, tasty-hunit, text, time - , transformers-base, unordered-containers, uuid, vector - }: - mkDerivation { - pname = "eventstore"; - version = "1.2.4"; - sha256 = "057nxlq78v3fzby9b0506gb85rlsv3j7q98y5asnv92n5i2barxm"; - libraryHaskellDepends = [ - aeson array base bifunctors bytestring cereal clock connection - containers dns dotnet-timespan ekg-core exceptions fast-logger - hashable http-client interpolate lifted-async lifted-base machines - monad-control monad-logger mono-traversable mtl protobuf random - safe safe-exceptions semigroups stm stm-chans streaming text time - transformers-base unordered-containers uuid vector - ]; - testHaskellDepends = [ - aeson async base bytestring cereal connection containers - dotnet-timespan exceptions fast-logger file-embed hashable - lifted-async lifted-base monad-control mono-traversable protobuf - safe safe-exceptions semigroups stm stm-chans streaming tasty - tasty-hspec tasty-hunit text time transformers-base - unordered-containers uuid vector - ]; - description = "EventStore TCP Client"; - license = stdenv.lib.licenses.bsd3; - platforms = [ "x86_64-darwin" "x86_64-linux" ]; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "eventstore_1_3_0" = callPackage - ({ mkDerivation, aeson, array, async, base, bifunctors, bytestring - , cereal, clock, connection, containers, dns, dotnet-timespan - , ekg-core, exceptions, fast-logger, file-embed, hashable , http-client, interpolate, lifted-async, lifted-base , monad-control, monad-logger, mono-traversable, mtl, protobuf , random, safe, safe-exceptions, semigroups, stm, stm-chans @@ -79907,12 +79148,12 @@ self: { ({ mkDerivation, base, leancheck, template-haskell }: mkDerivation { pname = "express"; - version = "0.1.0"; - sha256 = "1bm2bzkkjnwrzf67g7291pw7cvlxg86mz69fnlrigmlxcx3kxbn4"; + version = "0.1.1"; + sha256 = "0zx5wdrw506lb3himzbyr7bgw4l12fmn9rbl0w95njrgm67h6667"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base leancheck ]; benchmarkHaskellDepends = [ base leancheck ]; - description = "Express"; + description = "Dynamically-typed expressions involving applications and variables"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -79942,8 +79183,6 @@ self: { testHaskellDepends = [ base singletons text ]; description = "Expressions and Formulae a la carte"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "expressions-z3" = callPackage @@ -80177,6 +79416,8 @@ self: { testToolDepends = [ tasty-discover ]; description = "Message passing concurrency as extensible-effect"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "extensible-exceptions" = callPackage @@ -80296,6 +79537,8 @@ self: { ]; description = "API Client for ExtraLife team and user data"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "extrapolate" = callPackage @@ -80312,14 +79555,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "extrapolate_0_4_0" = callPackage + "extrapolate_0_4_1" = callPackage ({ mkDerivation, base, express, leancheck, speculate , template-haskell }: mkDerivation { pname = "extrapolate"; - version = "0.4.0"; - sha256 = "0qlpgpwzdvc2my332krjs8pqwzrhpkw9l3irfx6gx8fpmgasfd8n"; + version = "0.4.1"; + sha256 = "1rhwgbx8skq8hl1h5hnv28qavy3v1p71vdlib1kwbdp1r7niwp8l"; libraryHaskellDepends = [ base express leancheck speculate template-haskell ]; @@ -80433,8 +79676,6 @@ self: { ]; description = "Rational arithmetic in an irrational world"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "facts" = callPackage @@ -80852,6 +80093,27 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "fast-builder_0_1_1_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , deepseq, ghc-prim, process, QuickCheck, scientific, stm + , template-haskell, text, true-name, unordered-containers, vector + }: + mkDerivation { + pname = "fast-builder"; + version = "0.1.1.0"; + sha256 = "024n5q1zsmd1va662sjdnc42w4qj6pmqg64fsfcn0jx5zvmg62d9"; + libraryHaskellDepends = [ base bytestring ghc-prim ]; + testHaskellDepends = [ base bytestring process QuickCheck stm ]; + benchmarkHaskellDepends = [ + aeson base bytestring containers criterion deepseq ghc-prim + scientific template-haskell text true-name unordered-containers + vector + ]; + description = "Fast ByteString Builder"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fast-combinatorics" = callPackage ({ mkDerivation, base, Cabal, composition-prelude, criterion , directory, hspec, http-client, http-client-tls, tar, zlib @@ -81232,6 +80494,8 @@ self: { executableHaskellDepends = [ base mtl optparse-applicative split ]; description = "A compiler for Fay, a Haskell subset that compiles to JavaScript"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fay-base" = callPackage @@ -81244,6 +80508,8 @@ self: { libraryHaskellDepends = [ base fay ]; description = "The base package for Fay"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fay-builder" = callPackage @@ -81277,6 +80543,8 @@ self: { libraryHaskellDepends = [ fay-base ]; description = "DOM FFI wrapper library for Fay"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fay-geoposition" = callPackage @@ -81289,6 +80557,8 @@ self: { libraryHaskellDepends = [ fay-base fay-text ]; description = "W3C compliant implementation of GeoPosition API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fay-hsx" = callPackage @@ -81315,6 +80585,8 @@ self: { libraryHaskellDepends = [ fay-base fay-text ]; description = "jQuery bindings for Fay"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fay-ref" = callPackage @@ -81327,6 +80599,8 @@ self: { libraryHaskellDepends = [ fay-base ]; description = "Like IORef but for Fay"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fay-simplejson" = callPackage @@ -81355,6 +80629,8 @@ self: { libraryHaskellDepends = [ fay fay-base text ]; description = "Fay Text type represented as JavaScript strings"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fay-uri" = callPackage @@ -81367,6 +80643,8 @@ self: { libraryHaskellDepends = [ fay-base ]; description = "Persistent FFI bindings for using jsUri in Fay"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fay-websockets" = callPackage @@ -81379,38 +80657,11 @@ self: { libraryHaskellDepends = [ fay-base ]; description = "Websockets FFI library for Fay"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fb" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base16-bytestring - , base64-bytestring, bytestring, cereal, conduit, conduit-extra - , containers, crypto-api, cryptohash, cryptohash-cryptoapi - , data-default, hspec, http-client, http-conduit, http-types, HUnit - , monad-logger, old-locale, QuickCheck, resourcet, text, time - , transformers, transformers-base, unliftio, unliftio-core - , unordered-containers - }: - mkDerivation { - pname = "fb"; - version = "1.2.1"; - sha256 = "05ax0pd9j6c64n48r9q03k5pg2axkmv11cz6azjg7k72cfkp1mm9"; - libraryHaskellDepends = [ - aeson attoparsec base base16-bytestring base64-bytestring - bytestring cereal conduit conduit-extra crypto-api cryptohash - cryptohash-cryptoapi data-default http-client http-conduit - http-types monad-logger old-locale resourcet text time transformers - transformers-base unliftio unliftio-core unordered-containers - ]; - testHaskellDepends = [ - aeson base bytestring conduit containers data-default hspec - http-conduit HUnit QuickCheck resourcet text time transformers - unliftio - ]; - description = "Bindings to Facebook's API"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "fb_2_0_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, conduit , conduit-extra, containers, cryptonite, data-default, hspec , http-client, http-conduit, http-types, HUnit, memory @@ -81434,7 +80685,6 @@ self: { ]; description = "Bindings to Facebook's API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fb-persistent" = callPackage @@ -81750,23 +81000,6 @@ self: { }) {}; "fedora-haskell-tools" = callPackage - ({ mkDerivation, base, csv, directory, filepath, HTTP, process - , time, unix - }: - mkDerivation { - pname = "fedora-haskell-tools"; - version = "0.6"; - sha256 = "06yr6hyksdqz0nksw0m23cqik51jjr74241xx96979pvw07zcym4"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base csv directory filepath HTTP process time unix - ]; - description = "Building and maintenance tools for Fedora Haskell"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "fedora-haskell-tools_0_8" = callPackage ({ mkDerivation, base, csv, directory, fedora-dists, filepath, HTTP , optparse-applicative, process, simple-cmd, simple-cmd-args, split , time, unix @@ -81786,6 +81019,7 @@ self: { description = "Building and maintenance tools for Fedora Haskell"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fedora-img-dl" = callPackage @@ -81857,32 +81091,6 @@ self: { }: mkDerivation { pname = "feed"; - version = "1.0.1.0"; - sha256 = "076krkyvbh24s50chdw3nz6w2svwchys65ppjzlm8gy42ddhbgc7"; - revision = "1"; - editedCabalFile = "10xjd3syr70g3blnjy7xvd6s21y68vxsi69f6bmizpsylbfb0245"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base base-compat bytestring old-locale old-time safe text time - time-locale-compat utf8-string xml-conduit xml-types - ]; - testHaskellDepends = [ - base base-compat HUnit old-time test-framework test-framework-hunit - text time xml-conduit xml-types - ]; - testToolDepends = [ markdown-unlit ]; - description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds."; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "feed_1_2_0_0" = callPackage - ({ mkDerivation, base, base-compat, bytestring, HUnit - , markdown-unlit, old-locale, old-time, safe, test-framework - , test-framework-hunit, text, time, time-locale-compat, utf8-string - , xml-conduit, xml-types - }: - mkDerivation { - pname = "feed"; version = "1.2.0.0"; sha256 = "0cakrlq1ra2gwyqmdhss4clkj0xxrwy3pc4xjzgqz4w3yd1czjg7"; enableSeparateDataOutput = true; @@ -81897,7 +81105,6 @@ self: { testToolDepends = [ markdown-unlit ]; description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "feed-cli" = callPackage @@ -82462,8 +81669,6 @@ self: { libraryHaskellDepends = [ base-noprelude integer-gmp semirings ]; description = "fibonacci algebra"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "fibon" = callPackage @@ -83035,8 +82240,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "filtrable"; - version = "0.1.1.0"; - sha256 = "0g1ngsbxrydbwa637sk8zvpvygppr6abj9hh87maf56ily4ki9fn"; + version = "0.1.2.0"; + sha256 = "1bgy3pydi7paiia63kygrg7fjjs7fm73jqfmlmw4szcbjmv8xq8k"; libraryHaskellDepends = [ base ]; description = "Class of filtrable containers"; license = stdenv.lib.licenses.bsd3; @@ -83048,27 +82253,12 @@ self: { }: mkDerivation { pname = "fin"; - version = "0.0.3"; - sha256 = "1g8fsl8hbh39g4r29597rjjh9000i3gwx38asa6pvmmnx7glqb2f"; - libraryHaskellDepends = [ base dec deepseq hashable ]; - testHaskellDepends = [ base inspection-testing tagged ]; - description = "Nat and Fin: peano naturals and finite numbers"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "fin_0_1" = callPackage - ({ mkDerivation, base, dec, deepseq, hashable, inspection-testing - , tagged - }: - mkDerivation { - pname = "fin"; version = "0.1"; sha256 = "17nv26cznhslrfb1ajcgxa9g3zacvk3prmncr7f8d7rvh42g2gnn"; libraryHaskellDepends = [ base dec deepseq hashable ]; testHaskellDepends = [ base inspection-testing tagged ]; description = "Nat and Fin: peano naturals and finite numbers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "final" = callPackage @@ -83352,26 +82542,12 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "first-class-families"; - version = "0.3.0.1"; - sha256 = "07291dj197230kq8vxqdgs52zl428w12sgy18y0n5lk18g5isxib"; - revision = "1"; - editedCabalFile = "1gybi18yw6dzp3r82x0xq9364m3isqq31gvaa1agf6hk9c9szfl2"; - libraryHaskellDepends = [ base ]; - description = "First class type families"; - license = stdenv.lib.licenses.mit; - }) {}; - - "first-class-families_0_5_0_0" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "first-class-families"; version = "0.5.0.0"; sha256 = "03skw4axj6zk593zi8fwynzjyiq6s7apjqmjqv6rxpxhj17vqwpj"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "First class type families"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "first-class-patterns" = callPackage @@ -83425,8 +82601,6 @@ self: { ]; description = "Calculates file-size frequency-distribution"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "fit" = callPackage @@ -83471,6 +82645,8 @@ self: { ]; description = "Parse FITS files"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fitsio" = callPackage @@ -83556,23 +82732,11 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "fixed"; - version = "0.2.1.1"; - sha256 = "1qhmwx8iqshns0crmr9d2f8hm65jxbcp3dvv0c39v34ra7if3a94"; - libraryHaskellDepends = [ base ]; - description = "Signed 15.16 precision fixed point arithmetic"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "fixed_0_3" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "fixed"; version = "0.3"; sha256 = "10l2sh179xarb774q92cff2gkb20rsrlilfwp1fk61rzmz9yn64j"; libraryHaskellDepends = [ base ]; description = "Signed 15.16 precision fixed point arithmetic"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fixed-length" = callPackage @@ -83678,6 +82842,8 @@ self: { libraryHaskellDepends = [ async base clock time ]; description = "Pure Haskell library to repeat an action at a specific frequency"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fixed-vector" = callPackage @@ -83983,33 +83149,6 @@ self: { }) {}; "flac" = callPackage - ({ mkDerivation, base, bytestring, containers, data-default-class - , directory, exceptions, filepath, FLAC, hspec, mtl, temporary - , text, transformers, vector, wave - }: - mkDerivation { - pname = "flac"; - version = "0.1.2"; - sha256 = "0adc88h5dmazf9m2xah0qkcav3pm0l3jiy8wbg9fxjv1qpgv74jn"; - revision = "5"; - editedCabalFile = "0rwwq8qrxd497rd5m0kidz4v69frj72ds7a6zrdqigj5f5471rhd"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base bytestring containers data-default-class directory exceptions - filepath mtl text transformers vector wave - ]; - librarySystemDepends = [ FLAC ]; - testHaskellDepends = [ - base bytestring data-default-class directory filepath hspec - temporary transformers vector wave - ]; - description = "Complete high-level binding to libFLAC"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {FLAC = null;}; - - "flac_0_2_0" = callPackage ({ mkDerivation, base, bytestring, containers, directory , exceptions, filepath, FLAC, hspec, hspec-discover, mtl, temporary , text, transformers, vector, wave @@ -84988,23 +84127,11 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "fmlist"; - version = "0.9.2"; - sha256 = "02868865hqm189h5wjd916abvqwkhbrx5b0119s1dwp70ifvbi4g"; - libraryHaskellDepends = [ base ]; - description = "FoldMap lists"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "fmlist_0_9_3" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "fmlist"; version = "0.9.3"; sha256 = "1w9nhm2zybdx4c1lalkajwqr8wcs731lfjld2r8gknd7y96x8pwf"; libraryHaskellDepends = [ base ]; description = "FoldMap lists"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fmt" = callPackage @@ -85043,8 +84170,6 @@ self: { libraryHaskellDepends = [ base enum-text-rio ]; description = "Adaptor for getting fmt to work with rio"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "fmt-terminal-colors" = callPackage @@ -85140,6 +84265,8 @@ self: { ]; description = "Lists with a focused element"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fold-debounce" = callPackage @@ -86021,6 +85148,8 @@ self: { testHaskellDepends = [ base doctest hspec ]; description = "Interactive terminal prompt"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "forward-chan" = callPackage @@ -86108,21 +85237,6 @@ self: { ({ mkDerivation, base, basement, gauge, ghc-prim }: mkDerivation { pname = "foundation"; - version = "0.0.23"; - sha256 = "0g043cqgzn082jfg5q5y1mi4c4pa3is00j01gvggvz8937v3cq52"; - revision = "1"; - editedCabalFile = "1zdlh81dii11p3bw3ffm3sr69l7nlhj622mca81swj59klgmaxwh"; - libraryHaskellDepends = [ base basement ghc-prim ]; - testHaskellDepends = [ base basement ]; - benchmarkHaskellDepends = [ base basement gauge ]; - description = "Alternative prelude with batteries and no dependencies"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "foundation_0_0_24" = callPackage - ({ mkDerivation, base, basement, gauge, ghc-prim }: - mkDerivation { - pname = "foundation"; version = "0.0.24"; sha256 = "1yygliyg5dh06n7iyyrvy4iz2328hgb5igjp832wxrfa529pwqdk"; libraryHaskellDepends = [ base basement ghc-prim ]; @@ -86130,7 +85244,6 @@ self: { benchmarkHaskellDepends = [ base basement gauge ]; description = "Alternative prelude with batteries and no dependencies"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "foundation-edge" = callPackage @@ -87276,6 +86389,8 @@ self: { ]; description = "A reactive frontend web framework"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "frontmatter" = callPackage @@ -87616,6 +86731,8 @@ self: { executableHaskellDepends = [ base mtl parsec ]; description = "implementation accompanying a WFLP'19 submission"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ftdi" = callPackage @@ -87652,6 +86769,8 @@ self: { testHaskellDepends = [ base ]; description = "Transfer files with FTP and FTPS"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ftp-client-conduit" = callPackage @@ -87668,6 +86787,8 @@ self: { testHaskellDepends = [ base ]; description = "Transfer file with FTP and FTPS with Conduit"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ftp-conduit" = callPackage @@ -88174,6 +87295,19 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "functor-products" = callPackage + ({ mkDerivation, base, microlens, singletons, text, vinyl }: + mkDerivation { + pname = "functor-products"; + version = "0.1.0.0"; + sha256 = "18yxsqah4afyvhcgi9fp6zmn511kgnw8cx02ig2kaypl2j4bnsxp"; + libraryHaskellDepends = [ base microlens singletons text vinyl ]; + description = "General functor products for various Foldable instances"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "functor-utils" = callPackage ({ mkDerivation, base, ghc-prim, lens }: mkDerivation { @@ -88320,6 +87454,8 @@ self: { benchmarkHaskellDepends = [ base criterion hscolour ipprint ]; description = "funnyPrint function to colorize GHCi output"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "funpat" = callPackage @@ -88370,20 +87506,6 @@ self: { }) {}; "fused-effects" = callPackage - ({ mkDerivation, base, deepseq, doctest, hspec, MonadRandom - , QuickCheck, random - }: - mkDerivation { - pname = "fused-effects"; - version = "0.1.2.1"; - sha256 = "00lr52zfi1k52z0iqg8wb2a40x80kpwhbvmasp8c4s8c8jx4s9yn"; - libraryHaskellDepends = [ base deepseq MonadRandom random ]; - testHaskellDepends = [ base doctest hspec QuickCheck ]; - description = "A fast, flexible, fused effect system"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "fused-effects_0_5_0_0" = callPackage ({ mkDerivation, base, criterion, deepseq, doctest, hspec , inspection-testing, MonadRandom, QuickCheck, random, transformers , unliftio-core @@ -88401,7 +87523,6 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "A fast, flexible, fused effect system"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fused-effects-exceptions" = callPackage @@ -88417,8 +87538,6 @@ self: { ]; description = "Handle exceptions thrown in IO with fused-effects"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "fused-effects-lens" = callPackage @@ -88608,26 +87727,6 @@ self: { }: mkDerivation { pname = "fuzzyset"; - version = "0.1.0.8"; - sha256 = "096izffsa3fgdi8qiz7n6l2fl2rbiq6kv5h1xljmq0nkaig5m5wv"; - libraryHaskellDepends = [ - base base-unicode-symbols data-default lens text text-metrics - unordered-containers vector - ]; - testHaskellDepends = [ - base base-unicode-symbols hspec ieee754 lens text - unordered-containers - ]; - description = "Fuzzy set for approximate string matching"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "fuzzyset_0_1_1" = callPackage - ({ mkDerivation, base, base-unicode-symbols, data-default, hspec - , ieee754, lens, text, text-metrics, unordered-containers, vector - }: - mkDerivation { - pname = "fuzzyset"; version = "0.1.1"; sha256 = "1r23xp3c4f1y0kx0kcg4z83rfxl6swciysb3cy7z6yv35fs8bs4q"; libraryHaskellDepends = [ @@ -88640,7 +87739,6 @@ self: { ]; description = "Fuzzy set for approximate string matching"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fuzzytime" = callPackage @@ -88858,6 +87956,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "galois-field_0_4_1" = callPackage + ({ mkDerivation, base, criterion, integer-gmp, MonadRandom, poly + , protolude, semirings, tasty, tasty-quickcheck, vector + , wl-pprint-text + }: + mkDerivation { + pname = "galois-field"; + version = "0.4.1"; + sha256 = "1q577m518gb3q7z7l84pf2ghw786p86sjx7b5mr3xhrvplwdvhcl"; + libraryHaskellDepends = [ + base integer-gmp MonadRandom poly protolude semirings + tasty-quickcheck vector wl-pprint-text + ]; + testHaskellDepends = [ + base integer-gmp MonadRandom poly protolude semirings tasty + tasty-quickcheck vector wl-pprint-text + ]; + benchmarkHaskellDepends = [ + base criterion integer-gmp MonadRandom poly protolude semirings + tasty-quickcheck vector wl-pprint-text + ]; + description = "Galois field library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "game-of-life" = callPackage ({ mkDerivation, array, base, hscurses, hspec, random, text }: mkDerivation { @@ -89801,22 +88925,6 @@ self: { }) {}; "generic-data" = callPackage - ({ mkDerivation, base, base-orphans, contravariant - , show-combinators, tasty, tasty-hunit - }: - mkDerivation { - pname = "generic-data"; - version = "0.3.0.0"; - sha256 = "0n53z9vmwfmb8h1x86wm9lcqrkfi1lvlfvm6kcw79d2xxx6l90jc"; - libraryHaskellDepends = [ - base base-orphans contravariant show-combinators - ]; - testHaskellDepends = [ base tasty tasty-hunit ]; - description = "Utilities for GHC.Generics"; - license = stdenv.lib.licenses.mit; - }) {}; - - "generic-data_0_7_0_0" = callPackage ({ mkDerivation, base, base-orphans, contravariant, criterion , deepseq, generic-lens, one-liner, show-combinators, tasty , tasty-hunit @@ -89834,7 +88942,6 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq ]; description = "Deriving instances with GHC.Generics and related utilities"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "generic-data-surgery" = callPackage @@ -90175,23 +89282,11 @@ self: { ({ mkDerivation, base, containers, mtl, template-haskell }: mkDerivation { pname = "generics-mrsop"; - version = "1.2.2"; - sha256 = "0xlvvcnmv24f0j3j4jaaymhdgz7klfdx15lxi9214d4ak4fnxjyv"; - libraryHaskellDepends = [ base containers mtl template-haskell ]; - description = "Generic Programming with Mutually Recursive Sums of Products"; - license = stdenv.lib.licenses.mit; - }) {}; - - "generics-mrsop_2_1_0" = callPackage - ({ mkDerivation, base, containers, mtl, template-haskell }: - mkDerivation { - pname = "generics-mrsop"; version = "2.1.0"; sha256 = "1ynzwpwry6fqzjmz3n0iwdp5ra3c402jg1g8sdf7vbpaw9ilyrng"; libraryHaskellDepends = [ base containers mtl template-haskell ]; description = "Generic Programming with Mutually Recursive Sums of Products"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "generics-sop" = callPackage @@ -90237,23 +89332,11 @@ self: { ({ mkDerivation, base, generics-sop, lens }: mkDerivation { pname = "generics-sop-lens"; - version = "0.1.3"; - sha256 = "1dk2v2ax2cryxpmgdv0bbawdfd30is3b5vzylhy9rr7bb5727vay"; - libraryHaskellDepends = [ base generics-sop lens ]; - description = "Lenses for types in generics-sop"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "generics-sop-lens_0_2" = callPackage - ({ mkDerivation, base, generics-sop, lens }: - mkDerivation { - pname = "generics-sop-lens"; version = "0.2"; sha256 = "0cm3xnz5h1pxhvbgl8mm16fg8y339m6wvm6nlqmsm0jh37gvqc2a"; libraryHaskellDepends = [ base generics-sop lens ]; description = "Lenses for types in generics-sop"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genericserialize" = callPackage @@ -90441,8 +89524,8 @@ self: { pname = "geniplate-mirror"; version = "0.7.6"; sha256 = "1y0m0bw5zpm1y1y6d9qmxj3swl8j8hlw1shxbr5awycf6k884ssb"; - revision = "1"; - editedCabalFile = "1pyz2vdkr5w9wadmb5v4alx408dqamny3mkvl4x8v2pf549qn37k"; + revision = "2"; + editedCabalFile = "03fg4vfm1wgq4mylggawdx0bfvbbjmdn700sqx7v3hk1bx0kjfzh"; libraryHaskellDepends = [ base mtl template-haskell ]; description = "Use Template Haskell to generate Uniplate-like functions"; license = stdenv.lib.licenses.bsd3; @@ -90502,25 +89585,12 @@ self: { ({ mkDerivation, base, hspec, hspec-core, QuickCheck, validity }: mkDerivation { pname = "genvalidity"; - version = "0.7.0.2"; - sha256 = "1yjvbpf75xrllmn7kzfjysw6rdv190bvgclzs5lapa9cakbsigyv"; - libraryHaskellDepends = [ base QuickCheck validity ]; - testHaskellDepends = [ base hspec hspec-core QuickCheck ]; - description = "Testing utilities for the validity library"; - license = stdenv.lib.licenses.mit; - }) {}; - - "genvalidity_0_8_0_0" = callPackage - ({ mkDerivation, base, hspec, hspec-core, QuickCheck, validity }: - mkDerivation { - pname = "genvalidity"; version = "0.8.0.0"; sha256 = "0w38aq9hfyymidncgkrs6yvja7j573d9sap5qfg5rz910fhsij9a"; libraryHaskellDepends = [ base QuickCheck validity ]; testHaskellDepends = [ base hspec hspec-core QuickCheck ]; description = "Testing utilities for the validity library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-aeson" = callPackage @@ -90531,28 +89601,6 @@ self: { }: mkDerivation { pname = "genvalidity-aeson"; - version = "0.2.0.2"; - sha256 = "1c77lbw4y6fmrsdzxwm38la161n6k3zvjwisg17ssz0a1bm4y96i"; - libraryHaskellDepends = [ - aeson base genvalidity genvalidity-scientific genvalidity-text - genvalidity-unordered-containers genvalidity-vector QuickCheck - validity validity-aeson - ]; - testHaskellDepends = [ - aeson base genvalidity genvalidity-hspec hspec - ]; - description = "GenValidity support for aeson"; - license = stdenv.lib.licenses.mit; - }) {}; - - "genvalidity-aeson_0_3_0_0" = callPackage - ({ mkDerivation, aeson, base, genvalidity, genvalidity-hspec - , genvalidity-scientific, genvalidity-text - , genvalidity-unordered-containers, genvalidity-vector, hspec - , QuickCheck, validity, validity-aeson - }: - mkDerivation { - pname = "genvalidity-aeson"; version = "0.3.0.0"; sha256 = "0l8n7k9v32izir9x0qrsnk4zkv3qhpghjzzpig4mk861cgycd42h"; libraryHaskellDepends = [ @@ -90565,7 +89613,6 @@ self: { ]; description = "GenValidity support for aeson"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-bytestring" = callPackage @@ -90575,26 +89622,6 @@ self: { }: mkDerivation { pname = "genvalidity-bytestring"; - version = "0.3.0.1"; - sha256 = "1jc3hd5aad5vblb1mmb1xzgfdcnk37w50vxyznr1m16rdfg1xrz8"; - libraryHaskellDepends = [ - base bytestring genvalidity QuickCheck validity validity-bytestring - ]; - testHaskellDepends = [ - base bytestring deepseq genvalidity genvalidity-hspec hspec - QuickCheck validity - ]; - description = "GenValidity support for ByteString"; - license = stdenv.lib.licenses.mit; - }) {}; - - "genvalidity-bytestring_0_5_0_0" = callPackage - ({ mkDerivation, base, bytestring, deepseq, genvalidity - , genvalidity-hspec, hspec, QuickCheck, validity - , validity-bytestring - }: - mkDerivation { - pname = "genvalidity-bytestring"; version = "0.5.0.0"; sha256 = "0lcgkq9dlf0k687ccg07jan9f1ba1iag6l8yc9xbnf7vignqz0ma"; libraryHaskellDepends = [ @@ -90606,7 +89633,6 @@ self: { ]; description = "GenValidity support for ByteString"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-containers" = callPackage @@ -90615,24 +89641,6 @@ self: { }: mkDerivation { pname = "genvalidity-containers"; - version = "0.5.1.1"; - sha256 = "1z7bmbwi07nylkgm3dysmnv57z1iww2sjy2zv88jpg6nvq9r9ffg"; - libraryHaskellDepends = [ - base containers genvalidity QuickCheck validity validity-containers - ]; - testHaskellDepends = [ - base containers genvalidity genvalidity-hspec hspec validity - ]; - description = "GenValidity support for containers"; - license = stdenv.lib.licenses.mit; - }) {}; - - "genvalidity-containers_0_6_0_0" = callPackage - ({ mkDerivation, base, containers, genvalidity, genvalidity-hspec - , hspec, QuickCheck, validity, validity-containers - }: - mkDerivation { - pname = "genvalidity-containers"; version = "0.6.0.0"; sha256 = "1ql8fmy6vpp0w52kkihfc3xzqsm4gdfm1j7mshirdw8vwa7y441q"; libraryHaskellDepends = [ @@ -90643,7 +89651,6 @@ self: { ]; description = "GenValidity support for containers"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-hspec" = callPackage @@ -90652,26 +89659,6 @@ self: { }: mkDerivation { pname = "genvalidity-hspec"; - version = "0.6.2.3"; - sha256 = "12j603wz8g9vadh613amvqz45zg2w8lwlflf8c7gds8gp0x44b26"; - libraryHaskellDepends = [ - base genvalidity genvalidity-property hspec hspec-core QuickCheck - transformers validity - ]; - testHaskellDepends = [ - base doctest genvalidity genvalidity-property hspec hspec-core - QuickCheck validity - ]; - description = "Standard spec's for GenValidity instances"; - license = stdenv.lib.licenses.mit; - }) {}; - - "genvalidity-hspec_0_7_0_0" = callPackage - ({ mkDerivation, base, doctest, genvalidity, genvalidity-property - , hspec, hspec-core, QuickCheck, transformers, validity - }: - mkDerivation { - pname = "genvalidity-hspec"; version = "0.7.0.0"; sha256 = "0cp0scxrkqmpscndxa68a1ij26i86qvblvb5fipwwyky76xhjsgg"; libraryHaskellDepends = [ @@ -90684,7 +89671,6 @@ self: { ]; description = "Standard spec's for GenValidity instances"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-hspec-aeson" = callPackage @@ -90695,28 +89681,6 @@ self: { }: mkDerivation { pname = "genvalidity-hspec-aeson"; - version = "0.3.0.1"; - sha256 = "0x5ja3d6vab2gmcqif3cvvbvmdpxp4hrc4ygzns5pw91nlrf5lm2"; - libraryHaskellDepends = [ - aeson base bytestring deepseq genvalidity genvalidity-hspec hspec - QuickCheck - ]; - testHaskellDepends = [ - aeson base doctest genvalidity genvalidity-aeson genvalidity-hspec - genvalidity-property genvalidity-text hspec text validity - ]; - description = "Standard spec's for aeson-related instances"; - license = stdenv.lib.licenses.mit; - }) {}; - - "genvalidity-hspec-aeson_0_3_1_0" = callPackage - ({ mkDerivation, aeson, base, bytestring, deepseq, doctest - , genvalidity, genvalidity-aeson, genvalidity-hspec - , genvalidity-property, genvalidity-text, hspec, QuickCheck, text - , validity - }: - mkDerivation { - pname = "genvalidity-hspec-aeson"; version = "0.3.1.0"; sha256 = "0ainmqs2i2q1bgcy8k3h2j4gm3730ll3b56p5pkydrgxhkdkxk9b"; libraryHaskellDepends = [ @@ -90729,7 +89693,6 @@ self: { ]; description = "Standard spec's for aeson-related instances"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-hspec-binary" = callPackage @@ -90859,22 +89822,6 @@ self: { }: mkDerivation { pname = "genvalidity-property"; - version = "0.3.0.0"; - sha256 = "03cpmkqmfqypj9kydrdzs0pyix0ffwrlx8idzvgyrqiyhg03rsis"; - libraryHaskellDepends = [ - base genvalidity hspec QuickCheck validity - ]; - testHaskellDepends = [ base directory doctest filepath ]; - description = "Standard properties for functions on `Validity` types"; - license = stdenv.lib.licenses.mit; - }) {}; - - "genvalidity-property_0_4_0_0" = callPackage - ({ mkDerivation, base, directory, doctest, filepath, genvalidity - , hspec, QuickCheck, validity - }: - mkDerivation { - pname = "genvalidity-property"; version = "0.4.0.0"; sha256 = "0zayycx62226w54rvkxwhvqhznsr33dk3ds55yyqrfqbnhvph1s9"; libraryHaskellDepends = [ @@ -90883,7 +89830,6 @@ self: { testHaskellDepends = [ base directory doctest filepath ]; description = "Standard properties for functions on `Validity` types"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-scientific" = callPackage @@ -90910,24 +89856,6 @@ self: { }: mkDerivation { pname = "genvalidity-text"; - version = "0.5.1.0"; - sha256 = "0j7fx2zzv6ljqk87148h1rq3yg6vvy0dsl7kfl3f2p6ghnz7wggg"; - libraryHaskellDepends = [ - array base genvalidity QuickCheck text validity validity-text - ]; - testHaskellDepends = [ - base genvalidity genvalidity-hspec hspec QuickCheck text - ]; - description = "GenValidity support for Text"; - license = stdenv.lib.licenses.mit; - }) {}; - - "genvalidity-text_0_6_0_0" = callPackage - ({ mkDerivation, array, base, genvalidity, genvalidity-hspec, hspec - , QuickCheck, text, validity, validity-text - }: - mkDerivation { - pname = "genvalidity-text"; version = "0.6.0.0"; sha256 = "01684mmf2vk4kvk4nanrlsa237jlx1713cqrsgrnwvb1n8x0z2ja"; libraryHaskellDepends = [ @@ -90938,7 +89866,6 @@ self: { ]; description = "GenValidity support for Text"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-time" = callPackage @@ -90964,27 +89891,6 @@ self: { }: mkDerivation { pname = "genvalidity-unordered-containers"; - version = "0.2.0.4"; - sha256 = "0rkvwm5imbgl8cx5pdk16dc4wzhcndw6g3wwxs0blykiri32wl3q"; - libraryHaskellDepends = [ - base genvalidity hashable QuickCheck unordered-containers validity - validity-unordered-containers - ]; - testHaskellDepends = [ - base genvalidity genvalidity-hspec hspec unordered-containers - validity - ]; - description = "GenValidity support for unordered-containers"; - license = stdenv.lib.licenses.mit; - }) {}; - - "genvalidity-unordered-containers_0_3_0_0" = callPackage - ({ mkDerivation, base, genvalidity, genvalidity-hspec, hashable - , hspec, QuickCheck, unordered-containers, validity - , validity-unordered-containers - }: - mkDerivation { - pname = "genvalidity-unordered-containers"; version = "0.3.0.0"; sha256 = "0dln4mba85vi8dlw0l7qqvcayazs12jy4a8ri3brf3kz9vhvi9rh"; libraryHaskellDepends = [ @@ -90997,7 +89903,6 @@ self: { ]; description = "GenValidity support for unordered-containers"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-uuid" = callPackage @@ -91024,24 +89929,6 @@ self: { }: mkDerivation { pname = "genvalidity-vector"; - version = "0.2.0.3"; - sha256 = "161w5shgj1k8691mmi9ddhxrnrqhsp502ywln2h0sk55zqcj1i5k"; - libraryHaskellDepends = [ - base genvalidity QuickCheck validity validity-vector vector - ]; - testHaskellDepends = [ - base genvalidity genvalidity-hspec hspec vector - ]; - description = "GenValidity support for vector"; - license = stdenv.lib.licenses.mit; - }) {}; - - "genvalidity-vector_0_3_0_0" = callPackage - ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec - , QuickCheck, validity, validity-vector, vector - }: - mkDerivation { - pname = "genvalidity-vector"; version = "0.3.0.0"; sha256 = "11qvacfhf60rdya2v5c7j94jgvyinz7ydhl5f8l0h1xrlw2n7w3h"; libraryHaskellDepends = [ @@ -91052,7 +89939,6 @@ self: { ]; description = "GenValidity support for vector"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "geo-resolver" = callPackage @@ -91201,29 +90087,6 @@ self: { "geojson" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, deepseq , hlint, lens, scientific, semigroups, tasty, tasty-hspec - , tasty-quickcheck, text, transformers, validation - }: - mkDerivation { - pname = "geojson"; - version = "3.0.4"; - sha256 = "0dnk9cb7y8wgnx8wzzln635r9pijljd9h5rinl0s9g4bjhw0rcw5"; - revision = "1"; - editedCabalFile = "1dp2hmnh77il2nx809bbkhhq4bz7ycy38ai5bhyklagc4k5bxl1c"; - libraryHaskellDepends = [ - aeson base containers deepseq lens scientific semigroups text - transformers validation - ]; - testHaskellDepends = [ - aeson base bytestring containers hlint tasty tasty-hspec - tasty-quickcheck text validation - ]; - description = "A thin GeoJSON Layer above the aeson library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "geojson_4_0_1" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, deepseq - , hlint, lens, scientific, semigroups, tasty, tasty-hspec , tasty-quickcheck, text, transformers, validation, vector }: mkDerivation { @@ -91241,6 +90104,7 @@ self: { description = "A thin GeoJSON Layer above the aeson library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "geojson-types" = callPackage @@ -91296,8 +90160,8 @@ self: { }: mkDerivation { pname = "geos"; - version = "0.2.1"; - sha256 = "15dhxhqswi9h8zas0x27hma7pz4c7rn40pppjraax29pi4alaiq9"; + version = "0.2.2"; + sha256 = "15mmgn5c2ls87ajpz11zybv5i3nzva60snws2gxjh19prkhydl5c"; libraryHaskellDepends = [ base bytestring mtl transformers vector ]; @@ -91439,8 +90303,6 @@ self: { ]; description = "Github Standard Labeler"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "gh-pocket-knife" = callPackage @@ -91750,29 +90612,6 @@ self: { }: mkDerivation { pname = "ghc-exactprint"; - version = "0.5.8.2"; - sha256 = "18wlhvgpbk7ym1vbi8fkdwbjhcplgr7zcqm328yi4v7rilbxw7cn"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring containers directory filepath free ghc ghc-boot - ghc-paths mtl syb - ]; - testHaskellDepends = [ - base bytestring containers Diff directory filemanip filepath ghc - ghc-boot ghc-paths HUnit mtl silently syb - ]; - description = "ExactPrint for GHC"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ghc-exactprint_0_6_1" = callPackage - ({ mkDerivation, base, bytestring, containers, Diff, directory - , filemanip, filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl - , silently, syb - }: - mkDerivation { - pname = "ghc-exactprint"; version = "0.6.1"; sha256 = "12nqpqmi9c57a3hgpfy8q073zryz66ylmcvf29hyffpj7vmmnvhl"; isLibrary = true; @@ -91787,7 +90626,6 @@ self: { ]; description = "ExactPrint for GHC"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-gc-tune" = callPackage @@ -91833,8 +90671,6 @@ self: { testHaskellDepends = [ base deepseq ]; description = "Extract the heap representation of Haskell values and thunks"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ghc-hotswap" = callPackage @@ -91929,6 +90765,31 @@ self: { }: mkDerivation { pname = "ghc-lib"; + version = "8.8.0.20190424"; + sha256 = "03f1racabmixc4jk3mn6k6cnhapaplswa8fbb9yajrzj56ag16wm"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base binary bytestring containers deepseq directory filepath + ghc-lib-parser ghc-prim hpc pretty process time transformers unix + ]; + libraryToolDepends = [ alex happy ]; + executableHaskellDepends = [ + array base bytestring containers deepseq directory filepath + ghc-prim haskeline process time transformers unix + ]; + description = "The GHC API, decoupled from GHC versions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "ghc-lib_8_8_0_20190723" = callPackage + ({ mkDerivation, alex, array, base, binary, bytestring, containers + , deepseq, directory, filepath, ghc-lib-parser, ghc-prim, happy + , haskeline, hpc, pretty, process, time, transformers, unix + }: + mkDerivation { + pname = "ghc-lib"; version = "8.8.0.20190723"; sha256 = "161qmm41vayks22vxbji436by1rfbx0x5m2zm4cc11pjcjrd4p63"; isLibrary = true; @@ -91945,6 +90806,7 @@ self: { ]; description = "The GHC API, decoupled from GHC versions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-lib-parser" = callPackage @@ -91954,6 +90816,25 @@ self: { }: mkDerivation { pname = "ghc-lib-parser"; + version = "8.8.0.20190424"; + sha256 = "12gsh994pr13bsybwlravmi21la66dyw74pk74yfw2pnz682wv10"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base binary bytestring containers deepseq directory filepath + ghc-prim hpc pretty process time transformers unix + ]; + libraryToolDepends = [ alex happy ]; + description = "The GHC API, decoupled from GHC versions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "ghc-lib-parser_8_8_0_20190723" = callPackage + ({ mkDerivation, alex, array, base, binary, bytestring, containers + , deepseq, directory, filepath, ghc-prim, happy, hpc, pretty + , process, time, transformers, unix + }: + mkDerivation { + pname = "ghc-lib-parser"; version = "8.8.0.20190723"; sha256 = "0szrv98h2c1db3400cbb7vbhqnwagqncgpllzd9jiw74rq6y8mjq"; enableSeparateDataOutput = true; @@ -91964,6 +90845,7 @@ self: { libraryToolDepends = [ alex happy ]; description = "The GHC API, decoupled from GHC versions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-make" = callPackage @@ -92620,18 +91502,6 @@ self: { }) {}; "ghci-hexcalc" = callPackage - ({ mkDerivation, base, doctest, QuickCheck }: - mkDerivation { - pname = "ghci-hexcalc"; - version = "0.1.0.2"; - sha256 = "134nby24044l0nxdss004325scca315dsa31101b9qcbwq2hd3fv"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest QuickCheck ]; - description = "GHCi as a Hex Calculator interactive"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ghci-hexcalc_0_1_1_0" = callPackage ({ mkDerivation, base, binary, doctest, QuickCheck }: mkDerivation { pname = "ghci-hexcalc"; @@ -92641,7 +91511,6 @@ self: { testHaskellDepends = [ base binary doctest QuickCheck ]; description = "GHCi as a Hex Calculator interactive"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghci-history-parser" = callPackage @@ -92728,32 +91597,6 @@ self: { }: mkDerivation { pname = "ghcid"; - version = "0.7.4"; - sha256 = "1wd278xligp0qj98zhqp3lkxdzpgb8k7yy0vhva6cs1ch6032gpp"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - ansi-terminal base cmdargs directory extra filepath process time - ]; - executableHaskellDepends = [ - ansi-terminal base cmdargs containers directory extra filepath - fsnotify process terminal-size time unix - ]; - testHaskellDepends = [ - ansi-terminal base cmdargs containers directory extra filepath - fsnotify process tasty tasty-hunit terminal-size time unix - ]; - description = "GHCi based bare bones IDE"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ghcid_0_7_5" = callPackage - ({ mkDerivation, ansi-terminal, base, cmdargs, containers - , directory, extra, filepath, fsnotify, process, tasty, tasty-hunit - , terminal-size, time, unix - }: - mkDerivation { - pname = "ghcid"; version = "0.7.5"; sha256 = "0ics4ibkr9p8pd81hfr7wk1wi10rjbsmwqcln8sda61p9v46pdh4"; isLibrary = true; @@ -92771,7 +91614,6 @@ self: { ]; description = "GHCi based bare bones IDE"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghcjs-ajax" = callPackage @@ -93138,25 +91980,6 @@ self: { }: mkDerivation { pname = "gi-atk"; - version = "2.0.18"; - sha256 = "15lh4pxif4gw3b7lly5135wabj9156jxsylrwsdppkcfcvxlbp26"; - setupHaskellDepends = [ base Cabal haskell-gi ]; - libraryHaskellDepends = [ - base bytestring containers gi-glib gi-gobject haskell-gi - haskell-gi-base haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ atk ]; - description = "Atk bindings"; - license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) atk;}; - - "gi-atk_2_0_21" = callPackage - ({ mkDerivation, atk, base, bytestring, Cabal, containers, gi-glib - , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading - , text, transformers - }: - mkDerivation { - pname = "gi-atk"; version = "2.0.21"; sha256 = "0npcz82l5ssbrgzr99a94nlirmfdy9z5p2k0nrk7357bawpiv7sk"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; @@ -93167,7 +91990,6 @@ self: { libraryPkgconfigDepends = [ atk ]; description = "Atk bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) atk;}; "gi-cairo" = callPackage @@ -93177,30 +91999,6 @@ self: { }: mkDerivation { pname = "gi-cairo"; - version = "1.0.17"; - sha256 = "1ax7aly9ahvb18m3zjmy0dk47qfdx5yl15q52c3wp4wa0c5aggax"; - setupHaskellDepends = [ base Cabal haskell-gi ]; - libraryHaskellDepends = [ - base bytestring containers haskell-gi haskell-gi-base - haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ cairo ]; - doHaddock = false; - preCompileBuildDriver = '' - PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig" - setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" - ''; - description = "Cairo bindings"; - license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) cairo;}; - - "gi-cairo_1_0_23" = callPackage - ({ mkDerivation, base, bytestring, Cabal, cairo, containers - , haskell-gi, haskell-gi-base, haskell-gi-overloading, text - , transformers - }: - mkDerivation { - pname = "gi-cairo"; version = "1.0.23"; sha256 = "1y479ll6pzf5qjf18ziqgvfi6zq4jyajkq9zlggmh9pjhxpwj8nh"; setupHaskellDepends = [ base Cabal haskell-gi ]; @@ -93215,7 +92013,6 @@ self: { ''; description = "Cairo bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) cairo;}; "gi-cairo-again" = callPackage @@ -93286,8 +92083,6 @@ self: { libraryPkgconfigDepends = [ libdbusmenu ]; description = "Dbusmenu bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) libdbusmenu;}; "gi-dbusmenugtk3" = callPackage @@ -93312,8 +92107,6 @@ self: { libraryPkgconfigDepends = [ gtk3 libdbusmenu-gtk3 ]; description = "DbusmenuGtk bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) gtk3; inherit (pkgs) libdbusmenu-gtk3;}; "gi-gdk" = callPackage @@ -93324,9 +92117,12 @@ self: { }: mkDerivation { pname = "gi-gdk"; - version = "3.0.16"; - sha256 = "0jp3d3zfm20b4ax1g5k1wzh8fxxzsw4ssw7zqx0d13167m4smc3y"; - setupHaskellDepends = [ base Cabal haskell-gi ]; + version = "3.0.22"; + sha256 = "0a6qkikk31n5qc85zp8l8kcaf0804c52gp02hban3c8a9rbq1lgr"; + setupHaskellDepends = [ + base Cabal gi-cairo gi-gdkpixbuf gi-gio gi-glib gi-gobject gi-pango + haskell-gi + ]; libraryHaskellDepends = [ base bytestring containers gi-cairo gi-gdkpixbuf gi-gio gi-glib gi-gobject gi-pango haskell-gi haskell-gi-base @@ -93369,25 +92165,6 @@ self: { }: mkDerivation { pname = "gi-gdkpixbuf"; - version = "2.0.20"; - sha256 = "1i3z9yk2zb15pwpgijdvyr08q8yc7yzm92jijgscwly9z6nin6x4"; - setupHaskellDepends = [ base Cabal haskell-gi ]; - libraryHaskellDepends = [ - base bytestring containers gi-gio gi-glib gi-gobject haskell-gi - haskell-gi-base haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ gdk-pixbuf ]; - description = "GdkPixbuf bindings"; - license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) gdk-pixbuf;}; - - "gi-gdkpixbuf_2_0_23" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gdk-pixbuf - , gi-gio, gi-glib, gi-gobject, haskell-gi, haskell-gi-base - , haskell-gi-overloading, text, transformers - }: - mkDerivation { - pname = "gi-gdkpixbuf"; version = "2.0.23"; sha256 = "0jphrxqdbls3l73is1k93fizghbxgkf14q57l4w3m559vgk34anp"; setupHaskellDepends = [ @@ -93400,7 +92177,6 @@ self: { libraryPkgconfigDepends = [ gdk-pixbuf ]; description = "GdkPixbuf bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) gdk-pixbuf;}; "gi-gdkx11" = callPackage @@ -93423,8 +92199,6 @@ self: { libraryPkgconfigDepends = [ gtk3 ]; description = "GdkX11 bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) gtk3;}; "gi-ggit" = callPackage @@ -93446,8 +92220,6 @@ self: { libraryPkgconfigDepends = [ libgit2-glib ]; description = "libgit2-glib bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) libgit2-glib;}; "gi-gio" = callPackage @@ -93457,25 +92229,6 @@ self: { }: mkDerivation { pname = "gi-gio"; - version = "2.0.19"; - sha256 = "1xyg1hmxp408npri8ydm5iaphfwdq7jdgdhbwgbxiyia2ymxfhqc"; - setupHaskellDepends = [ base Cabal haskell-gi ]; - libraryHaskellDepends = [ - base bytestring containers gi-glib gi-gobject haskell-gi - haskell-gi-base haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ glib ]; - description = "Gio bindings"; - license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) glib;}; - - "gi-gio_2_0_25" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib - , gi-gobject, glib, haskell-gi, haskell-gi-base - , haskell-gi-overloading, text, transformers - }: - mkDerivation { - pname = "gi-gio"; version = "2.0.25"; sha256 = "0w42ls035a69c2wyf050zvqxwyql3ln3ifwn9k4m187icj345qnz"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; @@ -93486,7 +92239,6 @@ self: { libraryPkgconfigDepends = [ glib ]; description = "Gio bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) glib;}; "gi-girepository" = callPackage @@ -93506,8 +92258,6 @@ self: { libraryPkgconfigDepends = [ gobject-introspection ]; description = "GIRepository (gobject-introspection) bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) gobject-introspection;}; "gi-glib" = callPackage @@ -93517,25 +92267,6 @@ self: { }: mkDerivation { pname = "gi-glib"; - version = "2.0.17"; - sha256 = "0rxbkrwlwnjf46z0qpw0vjw1nv9kl91xp7k2098rqs36kl5bwylx"; - setupHaskellDepends = [ base Cabal haskell-gi ]; - libraryHaskellDepends = [ - base bytestring containers haskell-gi haskell-gi-base - haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ glib ]; - description = "GLib bindings"; - license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) glib;}; - - "gi-glib_2_0_23" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, glib - , haskell-gi, haskell-gi-base, haskell-gi-overloading, text - , transformers - }: - mkDerivation { - pname = "gi-glib"; version = "2.0.23"; sha256 = "1wsix558lj58i8mdwikb2q78941dxl3pchhd75xkk5hq8rknp37x"; setupHaskellDepends = [ base Cabal haskell-gi ]; @@ -93546,7 +92277,6 @@ self: { libraryPkgconfigDepends = [ glib ]; description = "GLib bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) glib;}; "gi-gobject" = callPackage @@ -93556,25 +92286,6 @@ self: { }: mkDerivation { pname = "gi-gobject"; - version = "2.0.19"; - sha256 = "1s10417vmrzdbzwkqzxj88c8mvcvicpxgdc9hm1m99c2z132rj23"; - setupHaskellDepends = [ base Cabal haskell-gi ]; - libraryHaskellDepends = [ - base bytestring containers gi-glib haskell-gi haskell-gi-base - haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ glib ]; - description = "GObject bindings"; - license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) glib;}; - - "gi-gobject_2_0_22" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib - , haskell-gi, haskell-gi-base, haskell-gi-overloading, text - , transformers - }: - mkDerivation { - pname = "gi-gobject"; version = "2.0.22"; sha256 = "0c1ia60793dly5y5xd2s1qs5a37f0r3jypzc21r0yswgqdlsi7g6"; setupHaskellDepends = [ base Cabal gi-glib haskell-gi ]; @@ -93585,7 +92296,6 @@ self: { libraryPkgconfigDepends = [ glib ]; description = "GObject bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) glib;}; "gi-graphene" = callPackage @@ -93605,6 +92315,8 @@ self: { libraryPkgconfigDepends = [ graphene-gobject ]; description = "Graphene bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {graphene-gobject = null;}; "gi-gsk" = callPackage @@ -93629,6 +92341,8 @@ self: { libraryPkgconfigDepends = [ gtk4 ]; description = "Gsk bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {gtk4 = null;}; "gi-gst" = callPackage @@ -93648,8 +92362,6 @@ self: { libraryPkgconfigDepends = [ gstreamer ]; description = "GStreamer bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs.gst_all_1) gstreamer;}; "gi-gstaudio" = callPackage @@ -93671,8 +92383,6 @@ self: { libraryPkgconfigDepends = [ gst-plugins-base ]; description = "GStreamerAudio bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs.gst_all_1) gst-plugins-base;}; "gi-gstbase" = callPackage @@ -93694,8 +92404,6 @@ self: { libraryPkgconfigDepends = [ gst-plugins-base ]; description = "GStreamerBase bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs.gst_all_1) gst-plugins-base;}; "gi-gstpbutils" = callPackage @@ -93766,8 +92474,6 @@ self: { libraryPkgconfigDepends = [ gst-plugins-base ]; description = "GStreamerVideo bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs.gst_all_1) gst-plugins-base;}; "gi-gtk" = callPackage @@ -93778,9 +92484,12 @@ self: { }: mkDerivation { pname = "gi-gtk"; - version = "3.0.27"; - sha256 = "1i8xrq56lp8ha87zykr3hgp13yp8amsxal320mknr2s29x6iw1kr"; - setupHaskellDepends = [ base Cabal haskell-gi ]; + version = "3.0.32"; + sha256 = "0div9lqmirys1f3dy6bskvai72hb82g6rvcg0kwg1im974xp5m8l"; + setupHaskellDepends = [ + base Cabal gi-atk gi-cairo gi-gdk gi-gdkpixbuf gi-gio gi-glib + gi-gobject gi-pango haskell-gi + ]; libraryHaskellDepends = [ base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf gi-gio gi-glib gi-gobject gi-pango haskell-gi haskell-gi-base @@ -93789,8 +92498,6 @@ self: { libraryPkgconfigDepends = [ gtk3 ]; description = "Gtk bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) gtk3;}; "gi-gtk_4_0_1" = callPackage @@ -93816,7 +92523,6 @@ self: { description = "Gtk bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {gtk4 = null;}; "gi-gtk-declarative" = callPackage @@ -93871,25 +92577,6 @@ self: { }: mkDerivation { pname = "gi-gtk-hs"; - version = "0.3.6.3"; - sha256 = "0xnrssnfaz57akrkgpf1cm3d4lg3cmlh0b8yp6w9pdsbp0lld2ay"; - libraryHaskellDepends = [ - base base-compat containers gi-gdk gi-gdkpixbuf gi-glib gi-gobject - gi-gtk haskell-gi-base mtl text transformers - ]; - description = "A wrapper for gi-gtk, adding a few more idiomatic API parts on top"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "gi-gtk-hs_0_3_8_0" = callPackage - ({ mkDerivation, base, base-compat, containers, gi-gdk - , gi-gdkpixbuf, gi-glib, gi-gobject, gi-gtk, haskell-gi-base, mtl - , text, transformers - }: - mkDerivation { - pname = "gi-gtk-hs"; version = "0.3.8.0"; sha256 = "0cpykq24fjpidxb1hh6qi74xv5lh6nrz8q1l4iqy8jx26qlzri5l"; libraryHaskellDepends = [ @@ -93898,8 +92585,6 @@ self: { ]; description = "A wrapper for gi-gtk, adding a few more idiomatic API parts on top"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "gi-gtkosxapplication" = callPackage @@ -93933,30 +92618,6 @@ self: { }: mkDerivation { pname = "gi-gtksource"; - version = "3.0.16"; - sha256 = "0fm5bnyq4f9icyhxkyxf42mmanmc2klbdgin75dcdq5r92gipfcp"; - setupHaskellDepends = [ base Cabal haskell-gi ]; - libraryHaskellDepends = [ - base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf - gi-gio gi-glib gi-gobject gi-gtk gi-pango haskell-gi - haskell-gi-base haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ gtksourceview3 ]; - doHaddock = false; - description = "GtkSource bindings"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {inherit (pkgs) gtksourceview3;}; - - "gi-gtksource_3_0_22" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk - , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject - , gi-gtk, gi-pango, gtksourceview3, haskell-gi, haskell-gi-base - , haskell-gi-overloading, text, transformers - }: - mkDerivation { - pname = "gi-gtksource"; version = "3.0.22"; sha256 = "08b3ffjdgyr5xapx37kkwx3z8fsd42ydvdwk3nvh2ysfq9q86cjh"; setupHaskellDepends = [ @@ -93971,8 +92632,6 @@ self: { libraryPkgconfigDepends = [ gtksourceview3 ]; description = "GtkSource bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) gtksourceview3;}; "gi-handy" = callPackage @@ -94008,27 +92667,6 @@ self: { }: mkDerivation { pname = "gi-javascriptcore"; - version = "4.0.16"; - sha256 = "0kihq9sp42k2k9j8qrwgja62i5pzwhc1z1yy6h19n56aikddfc2z"; - setupHaskellDepends = [ base Cabal haskell-gi ]; - libraryHaskellDepends = [ - base bytestring containers gi-glib gi-gobject haskell-gi - haskell-gi-base haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ webkitgtk ]; - doHaddock = false; - description = "JavaScriptCore bindings"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) webkitgtk;}; - - "gi-javascriptcore_4_0_21" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib - , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading - , text, transformers, webkitgtk - }: - mkDerivation { - pname = "gi-javascriptcore"; version = "4.0.21"; sha256 = "0zl2lanysqir9qhndai7v4yp6sq671115mi5k9q58rwkmvkm6w04"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; @@ -94085,8 +92723,6 @@ self: { description = "OSTree bindings"; license = stdenv.lib.licenses.lgpl21; platforms = [ "i686-linux" "x86_64-linux" ]; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) ostree;}; "gi-pango" = callPackage @@ -94096,29 +92732,6 @@ self: { }: mkDerivation { pname = "gi-pango"; - version = "1.0.19"; - sha256 = "1zrxqi5w9w3lgnmw64pah36y1iwp96vsgnzxwzjizmxc03waaf98"; - setupHaskellDepends = [ base Cabal haskell-gi ]; - libraryHaskellDepends = [ - base bytestring containers gi-glib gi-gobject haskell-gi - haskell-gi-base haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ cairo pango ]; - preCompileBuildDriver = '' - PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig" - setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" - ''; - description = "Pango bindings"; - license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) cairo; inherit (pkgs) pango;}; - - "gi-pango_1_0_22" = callPackage - ({ mkDerivation, base, bytestring, Cabal, cairo, containers - , gi-glib, gi-gobject, haskell-gi, haskell-gi-base - , haskell-gi-overloading, pango, text, transformers - }: - mkDerivation { - pname = "gi-pango"; version = "1.0.22"; sha256 = "09dz13wai7cyp24vhc6wxyyg2g89dsqq40r80j56xgpyvfki8yf2"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; @@ -94133,7 +92746,6 @@ self: { ''; description = "Pango bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) cairo; inherit (pkgs) pango;}; "gi-pangocairo" = callPackage @@ -94160,8 +92772,6 @@ self: { ''; description = "PangoCairo bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) cairo; inherit (pkgs) pango;}; "gi-poppler" = callPackage @@ -94206,8 +92816,6 @@ self: { libraryPkgconfigDepends = [ libsecret ]; description = "Libsecret bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) libsecret;}; "gi-soup" = callPackage @@ -94229,8 +92837,6 @@ self: { libraryPkgconfigDepends = [ libsoup ]; description = "Libsoup bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) libsoup;}; "gi-vte" = callPackage @@ -94241,29 +92847,6 @@ self: { }: mkDerivation { pname = "gi-vte"; - version = "2.91.19"; - sha256 = "1hnhidjr7jh7i826lj6kdn264i592sfl5kwvymnpiycmcb37dd4y"; - setupHaskellDepends = [ base Cabal haskell-gi ]; - libraryHaskellDepends = [ - base bytestring containers gi-atk gi-gdk gi-gio gi-glib gi-gobject - gi-gtk gi-pango haskell-gi haskell-gi-base haskell-gi-overloading - text transformers - ]; - libraryPkgconfigDepends = [ vte_291 ]; - description = "Vte bindings"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {vte_291 = pkgs.vte;}; - - "gi-vte_2_91_25" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk - , gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk, gi-pango, haskell-gi - , haskell-gi-base, haskell-gi-overloading, text, transformers - , vte_291 - }: - mkDerivation { - pname = "gi-vte"; version = "2.91.25"; sha256 = "0h6kqbbdr7zgpq6sfqs2pfx99c7wj1aabpzna9fryn6zhaha8j3c"; setupHaskellDepends = [ @@ -94278,8 +92861,6 @@ self: { libraryPkgconfigDepends = [ vte_291 ]; description = "Vte bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {vte_291 = pkgs.vte;}; "gi-webkit" = callPackage @@ -94397,8 +92978,6 @@ self: { libraryPkgconfigDepends = [ xlibsWrapper ]; description = "xlib bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) xlibsWrapper;}; "giak" = callPackage @@ -94463,8 +93042,6 @@ self: { ]; description = "An implementation of the Jinja2 template language in Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "gingersnap" = callPackage @@ -94578,6 +93155,8 @@ self: { ]; description = "Giphy HTTP API wrapper and CLI search tool"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gist" = callPackage @@ -94712,6 +93291,24 @@ self: { inherit (pkgs) perl; inherit (pkgs) rsync; inherit (pkgs) wget; inherit (pkgs) which;}; + "git-brunch" = callPackage + ({ mkDerivation, base, brick, microlens, process, vector, vty }: + mkDerivation { + pname = "git-brunch"; + version = "1.0.2.0"; + sha256 = "1rjihw0fgd3np5gny9sv5nmk1cra7jhw39m8igp8izcish3yqggl"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base brick microlens process vector vty + ]; + executableHaskellDepends = [ + base brick microlens process vector vty + ]; + testHaskellDepends = [ base brick microlens process vector vty ]; + license = stdenv.lib.licenses.bsd3; + }) {}; + "git-checklist" = callPackage ({ mkDerivation, base, directory, filepath, optparse-applicative , parsec, pretty, process @@ -95044,8 +93641,6 @@ self: { testToolDepends = [ git ]; description = "A framework for pre-commit checks"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "gitHUD" = callPackage @@ -95152,8 +93747,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Access to the GitHub API, v3"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "github-backup" = callPackage @@ -95367,8 +93960,8 @@ self: { }: mkDerivation { pname = "githud"; - version = "3.0.0"; - sha256 = "1zr7d5h0x1fsnwb2pg9vn34ir0m144h1vnlh0avickazz2ljx2xr"; + version = "3.0.1"; + sha256 = "12ilxa52yib3ck80mr7djy59pzszb2l73npmpygcdwpcy46jq4p8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -95733,6 +94326,8 @@ self: { ]; description = "CLI Giphy search tool with previews in iTerm 2"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gjk" = callPackage @@ -95759,27 +94354,6 @@ self: { }) {}; "gl" = callPackage - ({ mkDerivation, base, Cabal, containers, directory, filepath - , fixed, half, hxt, libGL, transformers - }: - mkDerivation { - pname = "gl"; - version = "0.8.0"; - sha256 = "0f8l1ra05asqjnk97sliqb3wqvr6lic18rfs1f9dm1kw2lw2hkda"; - revision = "3"; - editedCabalFile = "0q8d4237ds78y4p35xl2arlmmpgs2ag7krw9chby6q9dcs00zxrl"; - setupHaskellDepends = [ - base Cabal containers directory filepath hxt transformers - ]; - libraryHaskellDepends = [ - base containers fixed half transformers - ]; - librarySystemDepends = [ libGL ]; - description = "Complete OpenGL raw bindings"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) libGL;}; - - "gl_0_9" = callPackage ({ mkDerivation, base, containers, fixed, half, libGL, transformers }: mkDerivation { @@ -95794,7 +94368,6 @@ self: { librarySystemDepends = [ libGL ]; description = "Complete OpenGL raw bindings"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libGL;}; "gl-capture" = callPackage @@ -95815,26 +94388,6 @@ self: { }: mkDerivation { pname = "glabrous"; - version = "1.0.1"; - sha256 = "11s7fhlv3aq80h20jf2l447bmxy95dy7dqvzqfp0myy4hgsasks3"; - libraryHaskellDepends = [ - aeson aeson-pretty attoparsec base bytestring cereal cereal-text - either text unordered-containers - ]; - testHaskellDepends = [ - base directory either hspec text unordered-containers - ]; - description = "A template DSL library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "glabrous_2_0_0" = callPackage - ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring - , cereal, cereal-text, directory, either, hspec, text - , unordered-containers - }: - mkDerivation { - pname = "glabrous"; version = "2.0.0"; sha256 = "001w81x2xmmd4vwp0m0142xgwyx60pr3mjx76czbc3by6iv41l5b"; libraryHaskellDepends = [ @@ -95846,7 +94399,6 @@ self: { ]; description = "A template DSL library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "glade" = callPackage @@ -96740,8 +95292,8 @@ self: { }: mkDerivation { pname = "gnome-keyring"; - version = "0.3.1"; - sha256 = "08fayi4ixqyzin7lxyx2s3yap377y6nrdf4fmv7bi895j2k642l8"; + version = "0.3.1.1"; + sha256 = "044bbgy8cssi1jc8wwb0kvxpw6d7pwxackkzvw7p9r8ybmgv4d0b"; libraryHaskellDepends = [ base bytestring text time ]; librarySystemDepends = [ gnome-keyring ]; libraryPkgconfigDepends = [ libgnome-keyring ]; @@ -99344,6 +97896,8 @@ self: { ]; description = "Bindings to the Google Geocoding API (formerly Maps Geocoding API)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "google-oauth2" = callPackage @@ -99473,6 +98027,8 @@ self: { ]; description = "Bindings to the Google Maps Static API (formerly Static Maps API)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "google-translate" = callPackage @@ -99784,6 +98340,25 @@ self: { broken = true; }) {}; + "gothic" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, connection + , exceptions, hashable, http-client, http-client-tls, http-conduit + , http-types, lens, lens-aeson, scientific, text, unix + , unordered-containers, vector + }: + mkDerivation { + pname = "gothic"; + version = "0.1.1"; + sha256 = "0bm8m77lcvi9c8smv0z4n23f6gw3aw47g0q47aqjcpipwmjcqvhm"; + libraryHaskellDepends = [ + aeson base binary bytestring connection exceptions hashable + http-client http-client-tls http-conduit http-types lens lens-aeson + scientific text unix unordered-containers vector + ]; + description = "A Haskell Vault KVv2 secret engine client"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "gotta-go-fast" = callPackage ({ mkDerivation, base, brick, cmdargs, directory, random, text , time, vty, word-wrap @@ -99942,6 +98517,8 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Applicative non-linear consumption"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "grab-form" = callPackage @@ -99954,6 +98531,8 @@ self: { testHaskellDepends = [ base containers hedgehog text ]; description = "Applicative parsers for form parameter lists"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "graceful" = callPackage @@ -99974,6 +98553,19 @@ self: { broken = true; }) {}; + "grafana" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, text }: + mkDerivation { + pname = "grafana"; + version = "0.1"; + sha256 = "0k8a8bwyn9hvn4j3wn4crqdjg2xh36zxlka0ddx3qj6fmbfl1lps"; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring text + ]; + description = "grafana datatypes for dashboards"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "graflog" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hspec, mtl , test-fixture, text, text-conversions @@ -100595,6 +99187,8 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq ]; description = "Graphs and networks library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "graphmod" = callPackage @@ -100639,8 +99233,8 @@ self: { }: mkDerivation { pname = "graphql"; - version = "0.4.0.0"; - sha256 = "03y8wn0a1zbrsl3i5g5zy5awmlgsncnksskd4gcx8wzfl14120g0"; + version = "0.5.0.0"; + sha256 = "01466hfw3mkiz557r5ch3rn01w6wys38n580hdqmkhsqysgsqzqa"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base megaparsec text transformers unordered-containers @@ -100651,6 +99245,8 @@ self: { ]; description = "Haskell GraphQL implementation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "graphql-api" = callPackage @@ -100676,19 +99272,19 @@ self: { ]; description = "GraphQL API"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "graphql-w-persistent" = callPackage ({ mkDerivation, base, containers, json, text }: mkDerivation { pname = "graphql-w-persistent"; - version = "0.4.0.0"; - sha256 = "01k8h0fz0x8dfsg01d6xj9b43jaj47a6vb378f5y6zhf0s9ixzj1"; + version = "0.5.0.0"; + sha256 = "12z4fws4vz88j8xj1xvzl8jv6s4i3vnca7xln2q4ssn23a025fcg"; libraryHaskellDepends = [ base containers json text ]; - description = "Haskell GraphQL query parser-interpreter-data processor"; + description = "GraphQL interface middleware for (SQL) databases"; license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "graphs" = callPackage @@ -101571,6 +100167,8 @@ self: { libraryHaskellDepends = [ base proto-lens proto-lens-runtime ]; description = "Generated messages and instances for etcd gRPC"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "grpc-etcd-client" = callPackage @@ -102004,8 +100602,6 @@ self: { ]; description = "A standalone StatusNotifierItem/AppIndicator tray"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) gtk3;}; "gtk-strut" = callPackage @@ -102017,8 +100613,6 @@ self: { libraryHaskellDepends = [ base gi-gdk gi-gtk text transformers ]; description = "Libary for creating strut windows with gi-gtk"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "gtk-toggle-button-list" = callPackage @@ -102813,55 +101407,6 @@ self: { }: mkDerivation { pname = "hOpenPGP"; - version = "2.7.4.1"; - sha256 = "0fcm87rkf1c94w68ad2zkd3r2pbxzqa82kh3d2ky87rc1wqnia0s"; - libraryHaskellDepends = [ - aeson asn1-encoding attoparsec base base16-bytestring - base64-bytestring bifunctors binary binary-conduit bytestring bzlib - conduit conduit-extra containers crypto-cipher-types cryptonite - errors hashable incremental-parser ixset-typed lens memory - monad-loops nettle network-uri newtype openpgp-asciiarmor - prettyprinter resourcet semigroups split text time - time-locale-compat transformers unliftio-core unordered-containers - zlib - ]; - testHaskellDepends = [ - aeson asn1-encoding attoparsec base base16-bytestring bifunctors - binary binary-conduit bytestring bzlib conduit conduit-extra - containers crypto-cipher-types cryptonite errors hashable - incremental-parser ixset-typed lens memory monad-loops nettle - network network-uri newtype prettyprinter QuickCheck - quickcheck-instances resourcet semigroups split tasty tasty-hunit - tasty-quickcheck text time time-locale-compat transformers - unliftio-core unordered-containers zlib - ]; - benchmarkHaskellDepends = [ - aeson base base16-bytestring base64-bytestring bifunctors binary - binary-conduit bytestring bzlib conduit conduit-extra containers - criterion crypto-cipher-types cryptonite errors hashable - incremental-parser ixset-typed lens memory monad-loops nettle - network network-uri newtype openpgp-asciiarmor prettyprinter - resourcet semigroups split text time time-locale-compat - transformers unliftio-core unordered-containers zlib - ]; - description = "native Haskell implementation of OpenPGP (RFC4880)"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hOpenPGP_2_8" = callPackage - ({ mkDerivation, aeson, asn1-encoding, attoparsec, base - , base16-bytestring, base64-bytestring, bifunctors, binary - , binary-conduit, bytestring, bzlib, conduit, conduit-extra - , containers, criterion, crypto-cipher-types, cryptonite, errors - , hashable, incremental-parser, ixset-typed, lens, memory - , monad-loops, nettle, network, network-uri, newtype - , openpgp-asciiarmor, prettyprinter, QuickCheck - , quickcheck-instances, resourcet, semigroups, split, tasty - , tasty-hunit, tasty-quickcheck, text, time, time-locale-compat - , transformers, unliftio-core, unordered-containers, zlib - }: - mkDerivation { - pname = "hOpenPGP"; version = "2.8"; sha256 = "1n6cpwgg934ii3b4ap2gp347q3k4b64dc9x37d4bj51hs6910pmw"; libraryHaskellDepends = [ @@ -102895,7 +101440,6 @@ self: { ]; description = "native Haskell implementation of OpenPGP (RFC4880)"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hPDB" = callPackage @@ -104586,6 +103130,8 @@ self: { ]; description = "Mailgun REST api interface for Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hailgun-send" = callPackage @@ -104618,6 +103164,8 @@ self: { ]; description = "Easy-to-use wrapper for the hailgun package"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hails" = callPackage @@ -104840,6 +103388,8 @@ self: { testToolDepends = [ utillinux ]; description = "A static website compiler library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) utillinux;}; "hakyll-R" = callPackage @@ -105035,6 +103585,8 @@ self: { ]; description = "Allow Hakyll to create hierarchical menues from directories"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hakyll-elm" = callPackage @@ -105063,6 +103615,8 @@ self: { executableHaskellDepends = [ base hakyll ]; testHaskellDepends = [ base ]; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hakyll-filestore" = callPackage @@ -105088,10 +103642,8 @@ self: { }: mkDerivation { pname = "hakyll-images"; - version = "0.4.2"; - sha256 = "0la1c25jlqw0y0zfcskkj4mlmkpamr2psqfnsrgz52zvmhy2ha2p"; - revision = "1"; - editedCabalFile = "1kmvb0cxvphmx0f1bgjq636yga58n4g2lqrg2xg5xfpwf8r956qf"; + version = "0.4.4"; + sha256 = "0d837i2nsg6drwfsrxfnpzmzmzxqxvabjlrlml38z99pyp7m3h9b"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base binary bytestring hakyll JuicyPixels JuicyPixels-extra @@ -105102,6 +103654,8 @@ self: { ]; description = "Hakyll utilities to work with images"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hakyll-ogmarkup" = callPackage @@ -105130,6 +103684,8 @@ self: { ]; description = "Hakyll SASS compiler over hsass"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hakyll-series" = callPackage @@ -105141,6 +103697,8 @@ self: { libraryHaskellDepends = [ base containers hakyll ]; description = "Adds series functionality to hakyll"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hakyll-shakespeare" = callPackage @@ -105158,6 +103716,8 @@ self: { ]; description = "Hakyll Hamlet compiler"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hakyll-shortcode" = callPackage @@ -105880,37 +104440,6 @@ self: { }: mkDerivation { pname = "hapistrano"; - version = "0.3.9.2"; - sha256 = "04a0r5q6vlwxkp1gwp10fmi22brb77w02psz44zbvqbm02jf7vhd"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson base filepath formatting gitrev mtl path process stm time - transformers typed-process - ]; - executableHaskellDepends = [ - aeson async base formatting gitrev optparse-applicative path - path-io stm yaml - ]; - testHaskellDepends = [ - base directory filepath hspec mtl path path-io process QuickCheck - silently temporary - ]; - description = "A deployment library for Haskell applications"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "hapistrano_0_3_9_3" = callPackage - ({ mkDerivation, aeson, async, base, directory, filepath - , formatting, gitrev, hspec, mtl, optparse-applicative, path - , path-io, process, QuickCheck, silently, stm, temporary, time - , transformers, typed-process, yaml - }: - mkDerivation { - pname = "hapistrano"; version = "0.3.9.3"; sha256 = "1kp2gdr0xjzr0qi584lqiqh7hjk8vymz04af2zcgdhbw68brj2cx"; isLibrary = true; @@ -106276,6 +104805,8 @@ self: { ]; description = "Happstack extension for use with FastCGI"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "happstack-fay" = callPackage @@ -106401,6 +104932,8 @@ self: { ]; description = "Support for using HSP templates in Happstack"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "happstack-hstringtemplate" = callPackage @@ -106536,6 +105069,8 @@ self: { ]; description = "Web related tools and services"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "happstack-server-tls" = callPackage @@ -106554,6 +105089,8 @@ self: { librarySystemDepends = [ openssl ]; description = "extend happstack-server with https:// support (TLS/SSL)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) openssl;}; "happstack-server-tls-cryptonite" = callPackage @@ -106610,6 +105147,8 @@ self: { ]; description = "Support for static URL routing with overlap detection for Happstack"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "happstack-util" = callPackage @@ -107081,18 +105620,16 @@ self: { "hasbolt" = callPackage ({ mkDerivation, base, binary, bytestring, connection, containers - , data-binary-ieee754, data-default, hex, hspec, network - , QuickCheck, text, transformers + , data-binary-ieee754, data-default, hex, hspec, mtl, network + , QuickCheck, text }: mkDerivation { pname = "hasbolt"; - version = "0.1.3.3"; - sha256 = "1l1p9iz9k8i1car5cd6cfd2bpidkrfbr2354hxvg8gpnw1i5jsbb"; - revision = "1"; - editedCabalFile = "0v4ksld4qs1ll5a5c6x5kvrcb584yskhbda7zv9r9lrqvcsjwg5i"; + version = "0.1.3.4"; + sha256 = "06z47djpg6sar1cadzrn86cmn092jhf7cwnjv402sx00i4r2v5dh"; libraryHaskellDepends = [ base binary bytestring connection containers data-binary-ieee754 - data-default network text transformers + data-default mtl network text ]; testHaskellDepends = [ base bytestring containers hex hspec QuickCheck text @@ -107298,6 +105835,8 @@ self: { ]; description = "Hash as cache"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hash-tree" = callPackage @@ -107432,8 +105971,8 @@ self: { pname = "hashable-time"; version = "0.2.0.2"; sha256 = "1q7y4plqqwy5286hhx2fygn12h8lqk0y047b597sbdckskxzfqgs"; - revision = "1"; - editedCabalFile = "1d43ia3cg9j9k1yam0w2a8b60df7xw4zydrdvk1m868ara3nlr58"; + revision = "2"; + editedCabalFile = "006phc5y9rrvsshdcmjmhxzxh8dpgs685mpqbkjm9c40xb1ydjbz"; libraryHaskellDepends = [ base hashable time ]; description = "Hashable instances for Data.Time"; license = stdenv.lib.licenses.bsd3; @@ -107596,8 +106135,8 @@ self: { ({ mkDerivation, base, ghc-prim, hashable, primitive, vector }: mkDerivation { pname = "hashtables"; - version = "1.2.3.3"; - sha256 = "00rp3844z2kan1mdhxb8iw39hhjpirv6mhnwc32byfqjsvx8a3ny"; + version = "1.2.3.4"; + sha256 = "1rjmxnr30g4hygiywkpz5p9sanh0abs7ap4zc1kgd8zv04kycp0j"; libraryHaskellDepends = [ base ghc-prim hashable primitive vector ]; @@ -108175,8 +106714,6 @@ self: { ]; description = "Core Types for NLP"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "haskell-course-preludes" = callPackage @@ -108431,29 +106968,6 @@ self: { }: mkDerivation { pname = "haskell-gi"; - version = "0.21.5"; - sha256 = "1rvi9bmgxq7q6js8yb5yb156yxmnm9px9amgjwzxmr7sxz31dl8j"; - revision = "1"; - editedCabalFile = "144knmzybslqz8w9cwgl5s4sk1crs9qhynwiqv68wdq67q0s4k80"; - libraryHaskellDepends = [ - attoparsec base bytestring Cabal containers directory filepath - haskell-gi-base mtl pretty-show process regex-tdfa safe text - transformers xdg-basedir xml-conduit - ]; - libraryPkgconfigDepends = [ glib gobject-introspection ]; - testHaskellDepends = [ base doctest process ]; - description = "Generate Haskell bindings for GObject Introspection capable libraries"; - license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;}; - - "haskell-gi_0_23_0" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, Cabal, containers - , directory, doctest, filepath, glib, gobject-introspection - , haskell-gi-base, mtl, pretty-show, process, regex-tdfa, safe - , text, transformers, xdg-basedir, xml-conduit - }: - mkDerivation { - pname = "haskell-gi"; version = "0.23.0"; sha256 = "04d2lxmbbq7g0yrc5rz9n7zscza9g63vvbz0qv3427y7hbq1xn4a"; libraryHaskellDepends = [ @@ -108465,32 +106979,18 @@ self: { testHaskellDepends = [ base doctest process ]; description = "Generate Haskell bindings for GObject Introspection capable libraries"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;}; "haskell-gi-base" = callPackage ({ mkDerivation, base, bytestring, containers, glib, text }: mkDerivation { pname = "haskell-gi-base"; - version = "0.21.5"; - sha256 = "1pxnwljicxyxr83c7d8xvla7zbp2krv1n6fp4i2zh8bqwln3fkgh"; - libraryHaskellDepends = [ base bytestring containers text ]; - libraryPkgconfigDepends = [ glib ]; - description = "Foundation for libraries generated by haskell-gi"; - license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) glib;}; - - "haskell-gi-base_0_23_0" = callPackage - ({ mkDerivation, base, bytestring, containers, glib, text }: - mkDerivation { - pname = "haskell-gi-base"; version = "0.23.0"; sha256 = "1f22d4pvmyy52w9hqa36b6psw34j562rayqgk052ng1ax9yvwzn0"; libraryHaskellDepends = [ base bytestring containers text ]; libraryPkgconfigDepends = [ glib ]; description = "Foundation for libraries generated by haskell-gi"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) glib;}; "haskell-gi-overloading_0_0" = callPackage @@ -108601,6 +107101,8 @@ self: { executableHaskellDepends = [ base ]; description = "create haskell import graph for graphviz"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskell-in-space" = callPackage @@ -108651,38 +107153,6 @@ self: { }) {}; "haskell-lsp" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, data-default - , directory, filepath, hashable, haskell-lsp-types, hslogger, hspec - , lens, mtl, network-uri, parsec, sorted-list, stm, text, time - , transformers, unordered-containers, vector, yi-rope - }: - mkDerivation { - pname = "haskell-lsp"; - version = "0.8.2.0"; - sha256 = "18qkrybwvmyz5h03xj9wjigpqs6s6rw9wi1lqcla4ppg1pkd5zyd"; - revision = "1"; - editedCabalFile = "0m6kprfsgxcmif0mmb1vpc46jyr0kjk6fqv3k1sqfvpjpldh0mvy"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring containers data-default directory filepath - hashable haskell-lsp-types hslogger lens mtl network-uri parsec - sorted-list stm text time unordered-containers yi-rope - ]; - executableHaskellDepends = [ - aeson base bytestring containers data-default directory filepath - hslogger lens mtl network-uri parsec stm text time transformers - unordered-containers vector yi-rope - ]; - testHaskellDepends = [ - aeson base bytestring containers data-default directory filepath - hashable hspec lens network-uri sorted-list stm text yi-rope - ]; - description = "Haskell library for the Microsoft Language Server Protocol"; - license = stdenv.lib.licenses.mit; - }) {}; - - "haskell-lsp_0_15_0_0" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring , containers, data-default, directory, filepath, hashable , haskell-lsp-types, hslogger, hspec, hspec-discover, lens, mtl @@ -108709,7 +107179,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Haskell library for the Microsoft Language Server Protocol"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-lsp-client" = callPackage @@ -108735,25 +107204,6 @@ self: { }) {}; "haskell-lsp-types" = callPackage - ({ mkDerivation, aeson, base, bytestring, data-default, filepath - , hashable, lens, network-uri, scientific, text - , unordered-containers - }: - mkDerivation { - pname = "haskell-lsp-types"; - version = "0.8.2.0"; - sha256 = "13pgjm1pm1hp7bln115cn75ig6w3mj7g7rvnvpszlrg9lzmk3ip7"; - revision = "1"; - editedCabalFile = "0gmfxhjn92kzbpd9kzq5n3707lcpkxhnzxgg7lk34jhayiw5kyzj"; - libraryHaskellDepends = [ - aeson base bytestring data-default filepath hashable lens - network-uri scientific text unordered-containers - ]; - description = "Haskell library for the Microsoft Language Server Protocol, data types"; - license = stdenv.lib.licenses.mit; - }) {}; - - "haskell-lsp-types_0_15_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, data-default, deepseq , filepath, hashable, lens, network-uri, scientific, text , unordered-containers @@ -108768,7 +107218,6 @@ self: { ]; description = "Haskell library for the Microsoft Language Server Protocol, data types"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-menu" = callPackage @@ -108855,29 +107304,6 @@ self: { }: mkDerivation { pname = "haskell-names"; - version = "0.9.4"; - sha256 = "0dbf5rxysm57jn018wd3dfz3m621n0347mbpgv7q2yb77cwrlg8y"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson base bytestring containers data-lens-light filepath - haskell-src-exts mtl transformers traverse-with-class uniplate - ]; - testHaskellDepends = [ - base containers filemanip filepath haskell-src-exts mtl pretty-show - tasty tasty-golden traverse-with-class - ]; - description = "Name resolution library for Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "haskell-names_0_9_6" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers - , data-lens-light, filemanip, filepath, haskell-src-exts, mtl - , pretty-show, tasty, tasty-golden, transformers - , traverse-with-class, uniplate - }: - mkDerivation { - pname = "haskell-names"; version = "0.9.6"; sha256 = "06g1h1dvsh31hm18v3hkx2s4bcrv2h49kgc2x9k1xk6532a9503w"; enableSeparateDataOutput = true; @@ -108891,7 +107317,6 @@ self: { ]; description = "Name resolution library for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-neo4j-client" = callPackage @@ -109095,6 +107520,29 @@ self: { broken = true; }) {libpostal = null;}; + "haskell-postgis" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, bytestring-lexing + , cpu, data-binary-ieee754, hspec, mtl, placeholders, text + , unordered-containers, vector + }: + mkDerivation { + pname = "haskell-postgis"; + version = "0.1.0.2"; + sha256 = "0p3zdrzfsz3qj3rcx3yihg7vffa261ig5lywrfls5qvqihw62m41"; + libraryHaskellDepends = [ + aeson base binary bytestring bytestring-lexing cpu + data-binary-ieee754 mtl placeholders text unordered-containers + vector + ]; + testHaskellDepends = [ + aeson base binary bytestring bytestring-lexing cpu + data-binary-ieee754 hspec mtl placeholders text + unordered-containers vector + ]; + description = "A haskell library for PostGIS geometry types"; + license = stdenv.lib.licenses.mit; + }) {}; + "haskell-proxy-list" = callPackage ({ mkDerivation, base, base64-string, bytestring, lens, random , regex-base, regex-posix, text, wreq @@ -109248,26 +107696,6 @@ self: { }: mkDerivation { pname = "haskell-src-exts"; - version = "1.20.3"; - sha256 = "1a74s4zarxdvhnflkxy13pawbfcdhyrb6gkdx0si8spv66knhgj3"; - libraryHaskellDepends = [ array base ghc-prim pretty ]; - libraryToolDepends = [ happy ]; - testHaskellDepends = [ - base containers directory filepath mtl pretty-show smallcheck tasty - tasty-golden tasty-smallcheck - ]; - doCheck = false; - description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "haskell-src-exts_1_21_0" = callPackage - ({ mkDerivation, array, base, containers, directory, filepath - , ghc-prim, happy, mtl, pretty, pretty-show, smallcheck, tasty - , tasty-golden, tasty-smallcheck - }: - mkDerivation { - pname = "haskell-src-exts"; version = "1.21.0"; sha256 = "1wwzd6m5mm76fq7ql7k49b7ghg8ibq5qhqr3d8xs5psfha3w3nlm"; libraryHaskellDepends = [ array base ghc-prim pretty ]; @@ -109279,7 +107707,6 @@ self: { doCheck = false; description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-src-exts-observe" = callPackage @@ -109354,8 +107781,6 @@ self: { libraryHaskellDepends = [ base haskell-src-exts ]; description = "A simplified view on the haskell-src-exts AST"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "haskell-src-exts-util" = callPackage @@ -110695,32 +109120,6 @@ self: { }: mkDerivation { pname = "haskoin-core"; - version = "0.8.4"; - sha256 = "0hpabz26wyxvpkvc2xv1xscmbvn0yfj2nnd41ysaf4xgfnh4c9sw"; - libraryHaskellDepends = [ - aeson array base base16-bytestring bytestring cereal conduit - containers cryptonite entropy hashable memory mtl murmur3 network - QuickCheck scientific secp256k1-haskell split string-conversions - text time transformers unordered-containers vector - ]; - testHaskellDepends = [ - aeson base bytestring cereal containers hspec HUnit mtl QuickCheck - safe split string-conversions text unordered-containers vector - ]; - testToolDepends = [ hspec-discover ]; - description = "Bitcoin & Bitcoin Cash library for Haskell"; - license = stdenv.lib.licenses.publicDomain; - }) {}; - - "haskoin-core_0_9_0" = callPackage - ({ mkDerivation, aeson, array, base, base16-bytestring, bytestring - , cereal, conduit, containers, cryptonite, entropy, hashable, hspec - , hspec-discover, HUnit, memory, mtl, murmur3, network, QuickCheck - , safe, scientific, secp256k1-haskell, split, string-conversions - , text, time, transformers, unordered-containers, vector - }: - mkDerivation { - pname = "haskoin-core"; version = "0.9.0"; sha256 = "1kwk3ycb4hjybsj43fg5khg2i5rgfrlwcmp7hknyzgzyshmwj1bx"; libraryHaskellDepends = [ @@ -110736,7 +109135,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Bitcoin & Bitcoin Cash library for Haskell"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskoin-crypto" = callPackage @@ -110851,8 +109249,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.16.6"; - sha256 = "03214p8xqf062grgpkbfchrm4awm0zrq41j77z8s31iin9d0qzp9"; + version = "0.17.1"; + sha256 = "19vzwxy27xkkkx3lmq554kkyh6iclrxdhbp901vb0rh9v8l3cc74"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -111561,6 +109959,8 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq QuickCheck ]; description = "Variant and EADT"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskus-web" = callPackage @@ -111704,34 +110104,6 @@ self: { "hasql" = callPackage ({ mkDerivation, attoparsec, base, base-prelude, bug, bytestring , bytestring-strict-builder, contravariant, contravariant-extras - , criterion, data-default-class, dlist, hashable, hashtables - , loch-th, mtl, placeholders, postgresql-binary, postgresql-libpq - , profunctors, QuickCheck, quickcheck-instances, rebase, rerebase - , tasty, tasty-hunit, tasty-quickcheck, text, text-builder - , transformers, vector - }: - mkDerivation { - pname = "hasql"; - version = "1.3.0.6"; - sha256 = "01kp8ajg7mw3j6g6d13fsygcbbw7gyrqh3hdllhb1jv53mr7fgb3"; - libraryHaskellDepends = [ - attoparsec base base-prelude bytestring bytestring-strict-builder - contravariant contravariant-extras data-default-class dlist - hashable hashtables loch-th mtl placeholders postgresql-binary - postgresql-libpq profunctors text text-builder transformers vector - ]; - testHaskellDepends = [ - bug data-default-class QuickCheck quickcheck-instances rebase - rerebase tasty tasty-hunit tasty-quickcheck - ]; - benchmarkHaskellDepends = [ bug criterion rerebase ]; - description = "An efficient PostgreSQL driver and a flexible mapping API"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hasql_1_4" = callPackage - ({ mkDerivation, attoparsec, base, base-prelude, bug, bytestring - , bytestring-strict-builder, contravariant, contravariant-extras , criterion, dlist, hashable, hashtables, loch-th, mtl , placeholders, postgresql-binary, postgresql-libpq, profunctors , QuickCheck, quickcheck-instances, rebase, rerebase, tasty @@ -111755,7 +110127,6 @@ self: { benchmarkHaskellDepends = [ bug criterion rerebase ]; description = "An efficient PostgreSQL driver with a flexible mapping API"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hasql-backend" = callPackage @@ -111839,8 +110210,6 @@ self: { ]; description = "An abstraction for simultaneous fetching from multiple PostgreSQL cursors"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hasql-dynamic-statements" = callPackage @@ -111931,23 +110300,6 @@ self: { }: mkDerivation { pname = "hasql-optparse-applicative"; - version = "0.3.0.4"; - sha256 = "0pna4cmpm2chb3ax0i11wgkdx64zchdi4ivz0a0sgklrwq614pmx"; - libraryHaskellDepends = [ - base-prelude hasql hasql-pool optparse-applicative - ]; - description = "\"optparse-applicative\" parsers for \"hasql\""; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "hasql-optparse-applicative_0_3_0_5" = callPackage - ({ mkDerivation, base-prelude, hasql, hasql-pool - , optparse-applicative - }: - mkDerivation { - pname = "hasql-optparse-applicative"; version = "0.3.0.5"; sha256 = "0q5ggbx3xlzq0lv6i6wac9zsf0x4k91cf1n5rg6q96wg90f0dxxq"; libraryHaskellDepends = [ @@ -112065,24 +110417,6 @@ self: { }: mkDerivation { pname = "hasql-transaction"; - version = "0.7.1"; - sha256 = "02isgjzx3dhp5a7zgz2pbvm6fwmgbnwbqz7k01argf4pawckb8s9"; - libraryHaskellDepends = [ - base bytestring bytestring-tree-builder contravariant - contravariant-extras hasql mtl transformers - ]; - testHaskellDepends = [ async hasql rebase ]; - description = "A composable abstraction over the retryable transactions for Hasql"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hasql-transaction_0_7_2" = callPackage - ({ mkDerivation, async, base, bytestring, bytestring-tree-builder - , contravariant, contravariant-extras, hasql, mtl, rebase - , transformers - }: - mkDerivation { - pname = "hasql-transaction"; version = "0.7.2"; sha256 = "13d5zisr34bdbiypvpcb114d4c9yi6pyb9wnhigqpwd90vzpzsb5"; libraryHaskellDepends = [ @@ -112092,7 +110426,6 @@ self: { testHaskellDepends = [ async hasql rebase ]; description = "A composable abstraction over the retryable transactions for Hasql"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hastache" = callPackage @@ -112461,8 +110794,6 @@ self: { ]; description = "Recursively retrieve maven dependencies"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "haverer" = callPackage @@ -112549,32 +110880,6 @@ self: { }: mkDerivation { pname = "haxl"; - version = "2.0.1.1"; - sha256 = "1wfnwi3impv4cv359a65yh50c6kdfxhvbwycf5h76w3cvqdhvwsr"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base binary bytestring containers deepseq exceptions filepath - ghc-prim hashable pretty stm text time transformers - unordered-containers vector - ]; - testHaskellDepends = [ - aeson base binary bytestring containers deepseq filepath hashable - HUnit test-framework test-framework-hunit text time - unordered-containers - ]; - description = "A Haskell library for efficient, concurrent, and concise data access"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "haxl_2_1_2_0" = callPackage - ({ mkDerivation, aeson, base, binary, bytestring, containers - , deepseq, exceptions, filepath, ghc-prim, hashable, HUnit, pretty - , stm, test-framework, test-framework-hunit, text, time - , transformers, unordered-containers, vector - }: - mkDerivation { - pname = "haxl"; version = "2.1.2.0"; sha256 = "1lwm9rs9r0qs32n3nw49j3sz41qzq2wxv0a9gpiziaw0sjlk00jy"; isLibrary = true; @@ -112591,7 +110896,6 @@ self: { ]; description = "A Haskell library for efficient, concurrent, and concise data access"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haxl-amazonka" = callPackage @@ -113673,8 +111977,8 @@ self: { }: mkDerivation { pname = "hdocs"; - version = "0.5.3.1"; - sha256 = "0nxvkmhxpxx3500sy7kzpqyp45rq83hjm6gkj10vglxgjk32vzp4"; + version = "0.5.3.2"; + sha256 = "0x899pa5dw1jrc0vcw8aa1f3cx2xz8z0zqhplivji81lpjnajfgv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -113949,6 +112253,8 @@ self: { ]; description = "heavy-logger compatibility with amazonka-core logging"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "heavy-logger-instances" = callPackage @@ -114020,34 +112326,6 @@ self: { "hedgehog" = callPackage ({ mkDerivation, ansi-terminal, async, base, bytestring - , concurrent-output, containers, directory, exceptions - , lifted-async, mmorph, monad-control, mtl, pretty-show, primitive - , random, resourcet, semigroups, stm, template-haskell, text - , th-lift, time, transformers, transformers-base, unix - , wl-pprint-annotated - }: - mkDerivation { - pname = "hedgehog"; - version = "0.6.1"; - sha256 = "0xz10ycdm5vk9nrcym1fi83k19frfwqz18bz8bnpzwvaj0j41yfj"; - revision = "5"; - editedCabalFile = "0kwmxjb1y3gk85njacw5wcvmq3bzp1649dbjzgzpiba2w342f7il"; - libraryHaskellDepends = [ - ansi-terminal async base bytestring concurrent-output containers - directory exceptions lifted-async mmorph monad-control mtl - pretty-show primitive random resourcet semigroups stm - template-haskell text th-lift time transformers transformers-base - unix wl-pprint-annotated - ]; - testHaskellDepends = [ - base containers pretty-show semigroups text transformers - ]; - description = "Hedgehog will eat all your bugs"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hedgehog_1_0" = callPackage - ({ mkDerivation, ansi-terminal, async, base, bytestring , concurrent-output, containers, directory, exceptions, fail , lifted-async, mmorph, monad-control, mtl, pretty-show, primitive , random, resourcet, semigroups, stm, template-haskell, text, time @@ -114071,7 +112349,6 @@ self: { ]; description = "Release with confidence"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hedgehog-checkers" = callPackage @@ -114105,19 +112382,21 @@ self: { }) {}; "hedgehog-classes" = callPackage - ({ mkDerivation, aeson, base, binary, containers, hedgehog + ({ mkDerivation, aeson, base, binary, comonad, containers, hedgehog , pretty-show, semirings, silently, transformers , wl-pprint-annotated }: mkDerivation { pname = "hedgehog-classes"; - version = "0.2.2"; - sha256 = "072w697nc7dv9yi700g5ap4h49ichpw1srzkq07sz637022l19wl"; + version = "0.2.3"; + sha256 = "0ww1ll557iapbxg6rwhimf5fh8gngk15zlm4mlrh3p3j3xx9f22p"; libraryHaskellDepends = [ - aeson base binary containers hedgehog pretty-show semirings + aeson base binary comonad containers hedgehog pretty-show semirings silently transformers wl-pprint-annotated ]; - testHaskellDepends = [ aeson base binary containers hedgehog ]; + testHaskellDepends = [ + aeson base binary comonad containers hedgehog + ]; description = "Hedgehog will eat your typeclass bugs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -114148,8 +112427,6 @@ self: { ]; description = "Function generation for `hedgehog`"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hedgehog-gen-json" = callPackage @@ -114187,6 +112464,8 @@ self: { libraryHaskellDepends = [ base hedgehog ]; description = "GHC Generics automatically derived hedgehog generators"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hedgehog-quickcheck" = callPackage @@ -114198,8 +112477,6 @@ self: { libraryHaskellDepends = [ base hedgehog QuickCheck transformers ]; description = "Use QuickCheck generators in Hedgehog and vice versa"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hedis" = callPackage @@ -114210,34 +112487,8 @@ self: { }: mkDerivation { pname = "hedis"; - version = "0.10.10"; - sha256 = "0hbjhccipvg2i1cyinvhlk4jgscam9y5897ib1fh6rc0qwnlblhs"; - revision = "1"; - editedCabalFile = "0fcpf0jqga8wh0ikbpkma8sw7f5376wbc9w9rsiqp51q8f23x04h"; - libraryHaskellDepends = [ - async base bytestring bytestring-lexing deepseq errors HTTP mtl - network network-uri resource-pool scanner stm text time tls - unordered-containers vector - ]; - testHaskellDepends = [ - async base bytestring doctest HUnit mtl stm test-framework - test-framework-hunit text time - ]; - benchmarkHaskellDepends = [ base mtl time ]; - description = "Client library for the Redis datastore: supports full command set, pipelining"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hedis_0_12_6" = callPackage - ({ mkDerivation, async, base, bytestring, bytestring-lexing - , deepseq, doctest, errors, HTTP, HUnit, mtl, network, network-uri - , resource-pool, scanner, stm, test-framework, test-framework-hunit - , text, time, tls, unordered-containers, vector - }: - mkDerivation { - pname = "hedis"; - version = "0.12.6"; - sha256 = "1lx7lwh282ijp63yfy6ybb6zc5zil09abnrsbm052ghdlnz3sfk1"; + version = "0.12.7"; + sha256 = "1q59g99mv4axwm77f8m5fmlnq04qy04c6s1aj57jvfq7p31iq05a"; libraryHaskellDepends = [ async base bytestring bytestring-lexing deepseq errors HTTP mtl network network-uri resource-pool scanner stm text time tls @@ -114250,7 +112501,6 @@ self: { benchmarkHaskellDepends = [ base mtl time ]; description = "Client library for the Redis datastore: supports full command set, pipelining"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hedis-config" = callPackage @@ -114967,8 +113217,8 @@ self: { }: mkDerivation { pname = "heredocs"; - version = "0.1.4"; - sha256 = "0vy5d7z58vspjgncfiy10nalm70xqqdhy8ba1rkqzn9l5w79p1rz"; + version = "0.1.5"; + sha256 = "1bmih3jwmx8dv128rb9w1682fp3w0f6i7hhyyakswy7a04q34ryi"; libraryHaskellDepends = [ base bytestring doctest parsec template-haskell text ]; @@ -115764,6 +114014,8 @@ self: { ]; description = "Heyting and Boolean algebras"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hfann" = callPackage @@ -116235,6 +114487,8 @@ self: { testHaskellDepends = [ base QuickCheck ]; description = "Haskell interface to GMP"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hgom" = callPackage @@ -116413,8 +114667,6 @@ self: { testHaskellDepends = [ base binary bytestring hspec rio vector ]; description = "Parser for GHC's hi files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hi3status" = callPackage @@ -116617,7 +114869,7 @@ self: { "hierarchical-spectral-clustering" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, cassava - , clustering, containers, directory, eigen, fgl, filepath + , clustering, containers, directory, fgl, filepath , hierarchical-clustering, hmatrix, lens, managed, modularity, mtl , optparse-generic, safe, sparse-linear-algebra , spectral-clustering, streaming, streaming-bytestring @@ -116626,12 +114878,12 @@ self: { }: mkDerivation { pname = "hierarchical-spectral-clustering"; - version = "0.4.1.1"; - sha256 = "0wi1yw0mhszalixay7sd1n7i8xjmb3m6v7h3kn09ih5vn3bxj26f"; + version = "0.4.1.2"; + sha256 = "1yx366z7fnmxdb424b2n8bgfwcbhm85bha020p481wbq74nqfc6d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base cassava clustering containers eigen fgl + aeson base cassava clustering containers fgl hierarchical-clustering hmatrix managed modularity mtl safe sparse-linear-algebra spectral-clustering streaming streaming-bytestring streaming-cassava streaming-with text tree-fun @@ -116722,6 +114974,8 @@ self: { ]; description = "Partial types as a type constructor"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "highWaterMark" = callPackage @@ -117265,26 +115519,6 @@ self: { }) {}; "hint" = callPackage - ({ mkDerivation, base, directory, exceptions, extensible-exceptions - , filepath, ghc, ghc-boot, ghc-paths, HUnit, mtl, random, temporary - , unix - }: - mkDerivation { - pname = "hint"; - version = "0.9.0"; - sha256 = "1g7q4clzc2pdnbvmm265dindjpynabsykd088qjjzlk6590sy9bl"; - libraryHaskellDepends = [ - base directory exceptions filepath ghc ghc-boot ghc-paths mtl - random temporary unix - ]; - testHaskellDepends = [ - base directory exceptions extensible-exceptions filepath HUnit unix - ]; - description = "Runtime Haskell interpreter (GHC API wrapper)"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hint_0_9_0_1" = callPackage ({ mkDerivation, base, containers, directory, exceptions , extensible-exceptions, filepath, ghc, ghc-boot, ghc-paths, HUnit , mtl, random, temporary, unix @@ -117303,7 +115537,6 @@ self: { ]; description = "Runtime Haskell interpreter (GHC API wrapper)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hint-server" = callPackage @@ -117367,6 +115600,8 @@ self: { ]; description = "Haskell / Erlang interoperability library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hinvaders" = callPackage @@ -117962,8 +116197,8 @@ self: { }: mkDerivation { pname = "hjugement-cli"; - version = "0.0.0.20190721"; - sha256 = "1fgl9yjjmwd8y2hcmva0fh3d6qwvj8papdm0v50s85b9s8cwn6ll"; + version = "0.0.0.20190815"; + sha256 = "1ard95f5zs5bkj24qk3wwkgcz99xkwjqs35gfrslf3yd14davy2w"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -117988,8 +116223,8 @@ self: { }: mkDerivation { pname = "hjugement-protocol"; - version = "0.0.4.20190711"; - sha256 = "0r4g8n1a8c0azdk307mq1q2dv1h4xf251fjrmldcws7b0vrla5ri"; + version = "0.0.7.20190815"; + sha256 = "0b356pi6s3ih47d42ns50irgwsblwd9hvasav6sswzww3qlrnbrz"; libraryHaskellDepends = [ aeson base base64-bytestring binary bytestring containers cryptonite deepseq memory random reflection text transformers @@ -118055,8 +116290,6 @@ self: { ]; description = "Simple Hackage release workflow for package maintainers"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hkt" = callPackage @@ -118235,6 +116468,8 @@ self: { ]; description = "Web API server for the hledger accounting tool"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hledger-chart" = callPackage @@ -118635,6 +116870,8 @@ self: { ]; description = "Client library for the Apache Livy REST API"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hlogger" = callPackage @@ -118792,27 +117029,6 @@ self: { }: mkDerivation { pname = "hmatrix"; - version = "0.19.0.0"; - sha256 = "10jd69nby29dggghcyjk6ykyr5wrn97nrv1dkpyrp0y5xm12xssj"; - revision = "1"; - editedCabalFile = "0krx0ds5mcj28y6zpg0r50lljn8681wi4c5lqcdz2c71nhixfq8h"; - configureFlags = [ "-fdisable-default-paths" "-fopenblas" ]; - libraryHaskellDepends = [ - array base binary bytestring deepseq random semigroups split - storable-complex vector - ]; - librarySystemDepends = [ openblasCompat ]; - description = "Numeric Linear Algebra"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) openblasCompat;}; - - "hmatrix_0_20_0_0" = callPackage - ({ mkDerivation, array, base, binary, bytestring, deepseq - , openblasCompat, random, semigroups, split, storable-complex - , vector - }: - mkDerivation { - pname = "hmatrix"; version = "0.20.0.0"; sha256 = "1sqy1aci5zfagkb34mz3xdil7cl96z4b4cx28cha54vc5sx1lhpg"; configureFlags = [ "-fdisable-default-paths" "-fopenblas" ]; @@ -118823,7 +117039,6 @@ self: { librarySystemDepends = [ openblasCompat ]; description = "Numeric Linear Algebra"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) openblasCompat;}; "hmatrix-backprop" = callPackage @@ -118846,6 +117061,8 @@ self: { ]; description = "hmatrix operations lifted for backprop"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hmatrix-banded" = callPackage @@ -119085,6 +117302,8 @@ self: { benchmarkHaskellDepends = [ base criterion hmatrix vector ]; description = "SVDLIBC bindings for HMatrix"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hmatrix-syntax" = callPackage @@ -119442,6 +117661,8 @@ self: { testSystemDepends = [ netcdf ]; description = "Haskell NetCDF library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) netcdf;}; "hnix" = callPackage @@ -119506,6 +117727,8 @@ self: { ]; description = "Haskell implementation of the Nix language"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hnix-store-core" = callPackage @@ -119556,6 +117779,8 @@ self: { ]; description = "Remote hnix store"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hnn" = callPackage @@ -119673,8 +117898,8 @@ self: { }: mkDerivation { pname = "hoauth2"; - version = "1.8.7"; - sha256 = "0x99dh6k6njhsab5vk9q9q4jd5l4yq4cb9c08shvsv0xghsnlh4z"; + version = "1.8.8"; + sha256 = "0ji9887m11k3dh7n36g0m9q1gy4d4729ygvapdzqfa3vi501ndwa"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -119685,15 +117910,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hoauth2_1_8_8" = callPackage + "hoauth2_1_8_9" = callPackage ({ mkDerivation, aeson, base, bytestring, exceptions, http-conduit , http-types, microlens, text, unordered-containers, uri-bytestring , uri-bytestring-aeson }: mkDerivation { pname = "hoauth2"; - version = "1.8.8"; - sha256 = "0ji9887m11k3dh7n36g0m9q1gy4d4729ygvapdzqfa3vi501ndwa"; + version = "1.8.9"; + sha256 = "03yggs3if14saxiz5m02p17crl7askh8qjky6h1jqpxric49alv7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -120737,6 +118962,8 @@ self: { executableToolDepends = [ alex happy ]; description = "hOpenPGP-based command-line tools"; license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hopenssl" = callPackage @@ -121400,6 +119627,8 @@ self: { ]; description = "hpack's dhalling"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hpaco" = callPackage @@ -121698,6 +119927,8 @@ self: { ]; description = "Monads for GPIO in Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hplayground" = callPackage @@ -121855,6 +120086,8 @@ self: { executableToolDepends = [ alex ]; description = "Parse Google Protocol Buffer specifications"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hprotoc-fork" = callPackage @@ -123379,6 +121612,8 @@ self: { testHaskellDepends = [ base tasty tasty-hspec ]; description = "A preprocessor that helps with writing Haskell bindings to C code"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hsc3" = callPackage @@ -124075,7 +122310,7 @@ self: { broken = true; }) {}; - "hsdev_0_3_3_2" = callPackage + "hsdev_0_3_3_4" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, async, attoparsec , base, bytestring, Cabal, containers, cpphs, data-default, deepseq , direct-sqlite, directory, exceptions, filepath, fsnotify, ghc @@ -124089,8 +122324,8 @@ self: { }: mkDerivation { pname = "hsdev"; - version = "0.3.3.2"; - sha256 = "1qx5ppj1l871pm9qhqwd4297p3cp0v0fv64fkw4cdbpjza798x1i"; + version = "0.3.3.4"; + sha256 = "1hj2krdq4ybs1vcy9gw6p56sznzi7wrhkaaya4560kjyijvvfdml"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -124153,23 +122388,6 @@ self: { ({ mkDerivation, adns, base, containers, network }: mkDerivation { pname = "hsdns"; - version = "1.7.1"; - sha256 = "0i50p31zxsrkx9hv3mqcl2042lf922b1fsswmd99d66ybkl01kag"; - revision = "1"; - editedCabalFile = "0w4hrmj7ph5dgarl82xpa0g77ncjdqk0wc9wp771pry98xxihzl8"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base containers network ]; - librarySystemDepends = [ adns ]; - description = "Asynchronous DNS Resolver"; - license = stdenv.lib.licenses.lgpl3; - maintainers = with stdenv.lib.maintainers; [ peti ]; - }) {inherit (pkgs) adns;}; - - "hsdns_1_8" = callPackage - ({ mkDerivation, adns, base, containers, network }: - mkDerivation { - pname = "hsdns"; version = "1.8"; sha256 = "0jxnfgzsshhaf3n8ywhxy84l6ldhz5cdwaayr61v26iqgm3c3qk0"; revision = "1"; @@ -124180,7 +122398,6 @@ self: { librarySystemDepends = [ adns ]; description = "Asynchronous DNS Resolver"; license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ peti ]; }) {inherit (pkgs) adns;}; @@ -124229,19 +122446,6 @@ self: { }) {}; "hsemail" = callPackage - ({ mkDerivation, base, doctest, hspec, mtl, old-time, parsec }: - mkDerivation { - pname = "hsemail"; - version = "2"; - sha256 = "1nd8pzsdan6zxddm96xswcm67g43zkbj1rm3m3wx3as4jj3qmw7m"; - libraryHaskellDepends = [ base mtl old-time parsec ]; - testHaskellDepends = [ base doctest hspec mtl old-time parsec ]; - description = "Parsec parsers for the RFC2822 Internet Message format"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ peti ]; - }) {}; - - "hsemail_2_2_0" = callPackage ({ mkDerivation, base, hspec, parsec, time, time-compat }: mkDerivation { pname = "hsemail"; @@ -124251,7 +122455,6 @@ self: { testHaskellDepends = [ base hspec parsec time ]; description = "Parsec parsers for the Internet Message format (e-mail)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; @@ -125176,21 +123379,6 @@ self: { }: mkDerivation { pname = "hspec"; - version = "2.6.1"; - sha256 = "1jkfqhdymr62rzqmlmc22mpla23p67rnls3v3zs30ggxbgs4dxlb"; - libraryHaskellDepends = [ - base hspec-core hspec-discover hspec-expectations QuickCheck - ]; - description = "A Testing Framework for Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hspec_2_7_1" = callPackage - ({ mkDerivation, base, hspec-core, hspec-discover - , hspec-expectations, QuickCheck - }: - mkDerivation { - pname = "hspec"; version = "2.7.1"; sha256 = "1x8rcr7j1azcaw0fg1xzp8j0gr4ias36z09aj24i4xp8pnyfp341"; libraryHaskellDepends = [ @@ -125198,7 +123386,6 @@ self: { ]; description = "A Testing Framework for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-attoparsec" = callPackage @@ -125253,33 +123440,6 @@ self: { }: mkDerivation { pname = "hspec-core"; - version = "2.6.1"; - sha256 = "0xg43kan7p6ahi5827qwcyiic6bq0bp8n0n8h3j4kh87qhdl4avv"; - libraryHaskellDepends = [ - ansi-terminal array base call-stack clock deepseq directory - filepath hspec-expectations HUnit QuickCheck quickcheck-io random - setenv stm tf-random transformers - ]; - testHaskellDepends = [ - ansi-terminal array base call-stack clock deepseq directory - filepath hspec-expectations hspec-meta HUnit process QuickCheck - quickcheck-io random setenv silently stm temporary tf-random - transformers - ]; - testToolDepends = [ hspec-meta ]; - testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'"; - description = "A Testing Framework for Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hspec-core_2_7_1" = callPackage - ({ mkDerivation, ansi-terminal, array, base, call-stack, clock - , deepseq, directory, filepath, hspec-expectations, hspec-meta - , HUnit, process, QuickCheck, quickcheck-io, random, setenv - , silently, stm, temporary, tf-random, transformers - }: - mkDerivation { - pname = "hspec-core"; version = "2.7.1"; sha256 = "08vk8588lap00hsln8zl64dazbb28lzk4b4h5vnm7xvhg7r21k1c"; libraryHaskellDepends = [ @@ -125297,7 +123457,6 @@ self: { testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'"; description = "A Testing Framework for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-dirstream" = callPackage @@ -125323,25 +123482,6 @@ self: { }: mkDerivation { pname = "hspec-discover"; - version = "2.6.1"; - sha256 = "189gj8drfzdf3j3xm8gbj9hjc1ha95ajhi47s9r440yjhyarlmlx"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base directory filepath ]; - executableHaskellDepends = [ base directory filepath ]; - testHaskellDepends = [ - base directory filepath hspec-meta QuickCheck - ]; - testToolDepends = [ hspec-meta ]; - description = "Automatically discover and run Hspec tests"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hspec-discover_2_7_1" = callPackage - ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck - }: - mkDerivation { - pname = "hspec-discover"; version = "2.7.1"; sha256 = "0r47fm94wa6qrhp8cc1zzkjrxc32rnagfn9m9ga4dm6p6ydw4c8b"; isLibrary = true; @@ -125354,7 +123494,6 @@ self: { testToolDepends = [ hspec-meta ]; description = "Automatically discover and run Hspec tests"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-expectations" = callPackage @@ -125573,24 +123712,6 @@ self: { }: mkDerivation { pname = "hspec-megaparsec"; - version = "2.0.0"; - sha256 = "0c4vb0c2y8yar0jjhh24wkkp1g7pbg2wc8h8nw3avfznbil6zyd8"; - revision = "1"; - editedCabalFile = "15hpf1v1d4dwzdvk7xhgj37yd37pcyj6yzw750k1fcj6j0hk4rb7"; - libraryHaskellDepends = [ - base containers hspec-expectations megaparsec - ]; - testHaskellDepends = [ base hspec hspec-expectations megaparsec ]; - description = "Utility functions for testing Megaparsec parsers with Hspec"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hspec-megaparsec_2_0_1" = callPackage - ({ mkDerivation, base, containers, hspec, hspec-expectations - , megaparsec - }: - mkDerivation { - pname = "hspec-megaparsec"; version = "2.0.1"; sha256 = "0w8nn2rh01lkiwsiyqh3gviklhfmy0245rakj94dmliyljw8skfg"; libraryHaskellDepends = [ @@ -125599,7 +123720,6 @@ self: { testHaskellDepends = [ base hspec hspec-expectations megaparsec ]; description = "Utility functions for testing Megaparsec parsers with Hspec"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-meta" = callPackage @@ -126770,6 +124890,8 @@ self: { ]; description = "HSX (Haskell Source with XML) allows literal XML syntax in Haskell source code"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hsyscall" = callPackage @@ -127356,6 +125478,8 @@ self: { ]; description = "Parser for TOML files"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "htoml-megaparsec" = callPackage @@ -127380,6 +125504,8 @@ self: { doHaddock = false; description = "Parser for TOML files"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "htrace" = callPackage @@ -127503,33 +125629,6 @@ self: { ({ mkDerivation, attoparsec, attoparsec-iso8601, base, base-compat , bytestring, Cabal, cabal-doctest, containers, cookie, directory , doctest, filepath, hashable, hspec, hspec-discover, http-types - , HUnit, nats, QuickCheck, quickcheck-instances, tagged, text, time - , time-locale-compat, unordered-containers, uuid-types - }: - mkDerivation { - pname = "http-api-data"; - version = "0.4"; - sha256 = "12ja2rrs6dvajw300agp4fms21859a7n193m7nicmwixy8wkyzl3"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - attoparsec attoparsec-iso8601 base base-compat bytestring - containers cookie hashable http-types tagged text time - time-locale-compat unordered-containers uuid-types - ]; - testHaskellDepends = [ - base base-compat bytestring cookie directory doctest filepath hspec - HUnit nats QuickCheck quickcheck-instances text time - unordered-containers uuid-types - ]; - testToolDepends = [ hspec-discover ]; - description = "Converting to/from HTTP API data like URL pieces, headers and query parameters"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "http-api-data_0_4_1" = callPackage - ({ mkDerivation, attoparsec, attoparsec-iso8601, base, base-compat - , bytestring, Cabal, cabal-doctest, containers, cookie, directory - , doctest, filepath, hashable, hspec, hspec-discover, http-types , HUnit, nats, QuickCheck, quickcheck-instances, tagged, text , time-compat, unordered-containers, uuid-types }: @@ -127551,7 +125650,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Converting to/from HTTP API data like URL pieces, headers and query parameters"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-attoparsec" = callPackage @@ -127576,35 +125674,6 @@ self: { }: mkDerivation { pname = "http-client"; - version = "0.5.14"; - sha256 = "0irnvrxlsr9f7ybvzbpv24zbq3lhxjzh6bavjnl527020jbl0l4f"; - revision = "1"; - editedCabalFile = "0xw5ac4cvcd4hcwl7j12adi7sgffjryqhk0x992k3qs1cxyv5028"; - libraryHaskellDepends = [ - array base blaze-builder bytestring case-insensitive containers - cookie deepseq exceptions filepath ghc-prim http-types memory - mime-types network network-uri random stm streaming-commons text - time transformers - ]; - testHaskellDepends = [ - async base blaze-builder bytestring case-insensitive containers - deepseq directory hspec http-types monad-control network - network-uri streaming-commons text time transformers zlib - ]; - doCheck = false; - description = "An HTTP client engine"; - license = stdenv.lib.licenses.mit; - }) {}; - - "http-client_0_6_4" = callPackage - ({ mkDerivation, array, async, base, blaze-builder, bytestring - , case-insensitive, containers, cookie, deepseq, directory - , exceptions, filepath, ghc-prim, hspec, http-types, memory - , mime-types, monad-control, network, network-uri, random, stm - , streaming-commons, text, time, transformers, zlib - }: - mkDerivation { - pname = "http-client"; version = "0.6.4"; sha256 = "1n9rnbp8lwkd4whi2anniywi4y1bn9kx6nzfigfvz28d7pn7i4in"; libraryHaskellDepends = [ @@ -127621,7 +125690,6 @@ self: { doCheck = false; description = "An HTTP client engine"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-client-auth" = callPackage @@ -127757,6 +125825,8 @@ self: { ]; description = "restricting the servers that http-client will use"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "http-client-session" = callPackage @@ -127941,8 +126011,6 @@ self: { ]; description = "HTTP downloader tailored for web-crawler needs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "http-date" = callPackage @@ -128025,8 +126093,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Verified downloads with retries"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "http-encodings" = callPackage @@ -128196,28 +126262,6 @@ self: { }: mkDerivation { pname = "http-media"; - version = "0.7.1.3"; - sha256 = "0kqjzvh5y8r6x5rw2kgd816w2963c6cbyw2qjvaj2mv59zxzqkrr"; - revision = "1"; - editedCabalFile = "19py5pspx80gg679p9dzqr3iidflppxc1x4vkldamjkidyi406j8"; - libraryHaskellDepends = [ - base bytestring case-insensitive containers utf8-string - ]; - testHaskellDepends = [ - base bytestring case-insensitive containers QuickCheck - test-framework test-framework-quickcheck2 utf8-string - ]; - description = "Processing HTTP Content-Type and Accept headers"; - license = stdenv.lib.licenses.mit; - }) {}; - - "http-media_0_8_0_0" = callPackage - ({ mkDerivation, base, bytestring, case-insensitive, containers - , QuickCheck, test-framework, test-framework-quickcheck2 - , utf8-string - }: - mkDerivation { - pname = "http-media"; version = "0.8.0.0"; sha256 = "0lww5cxrc9jlvzsysjv99lca33i4rb7cll66p3c0rdpmvz8pk0ir"; revision = "1"; @@ -128231,7 +126275,6 @@ self: { ]; description = "Processing HTTP Content-Type and Accept headers"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-monad" = callPackage @@ -128269,8 +126312,6 @@ self: { ]; description = "A type unsafe http library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "http-pony-serve-wai" = callPackage @@ -128694,26 +126735,9 @@ self: { ]; description = "Types for gRPC over HTTP2 common for client and servers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "httpd-shed" = callPackage - ({ mkDerivation, base, network, network-uri }: - mkDerivation { - pname = "httpd-shed"; - version = "0.4.0.3"; - sha256 = "064jy1mqhnf1hvq6s04wlhmp916rd522x58djb9qixv13vc8gzxh"; - revision = "2"; - editedCabalFile = "12y9qf8s0aq4dc80wrvh14cjvvm4mcygrqq72w4z8w9n8mp8jg9p"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base network network-uri ]; - description = "A simple web-server with an interact style API"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "httpd-shed_0_4_1_1" = callPackage ({ mkDerivation, base, network, network-bsd, network-uri }: mkDerivation { pname = "httpd-shed"; @@ -128724,7 +126748,6 @@ self: { libraryHaskellDepends = [ base network network-bsd network-uri ]; description = "A simple web-server with an interact style API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "https-everywhere-rules" = callPackage @@ -129108,23 +127131,11 @@ self: { ({ mkDerivation, base, dejafu, exceptions, HUnit }: mkDerivation { pname = "hunit-dejafu"; - version = "1.2.1.0"; - sha256 = "075xx6rz1bxyj00plkrfz04wfq1rim8nkn43xj0d7js86qhvqyrc"; - libraryHaskellDepends = [ base dejafu exceptions HUnit ]; - description = "Deja Fu support for the HUnit test framework"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hunit-dejafu_2_0_0_1" = callPackage - ({ mkDerivation, base, dejafu, exceptions, HUnit }: - mkDerivation { - pname = "hunit-dejafu"; version = "2.0.0.1"; sha256 = "0n7npk8ksp14f2ib47navmc50rlnqrcsgdnxmd5qylg431h15sfz"; libraryHaskellDepends = [ base dejafu exceptions HUnit ]; description = "Deja Fu support for the HUnit test framework"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hunit-gui" = callPackage @@ -129318,8 +127329,6 @@ self: { ]; description = "Upload packages or documentation to a hackage server"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hurdle" = callPackage @@ -129487,23 +127496,11 @@ self: { ({ mkDerivation, aeson, base, text, vector }: mkDerivation { pname = "hvega"; - version = "0.1.0.3"; - sha256 = "0hh5izmw6ss4yznr665674p48lwxgzf3kspl86sy4sfrbab5jxqa"; - libraryHaskellDepends = [ aeson base text vector ]; - description = "Create Vega and Vega-Lite visualizations"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hvega_0_3_0_1" = callPackage - ({ mkDerivation, aeson, base, text, vector }: - mkDerivation { - pname = "hvega"; version = "0.3.0.1"; sha256 = "04qrlqzi065r9b83wyw1zymnyjvpy5jhlzxxqd2j6m9zsngh7hl1"; libraryHaskellDepends = [ aeson base text vector ]; description = "Create Vega-Lite visualizations (version 3) in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-aeson" = callPackage @@ -129619,6 +127616,8 @@ self: { doHaddock = false; description = "CI Assistant for Haskell projects"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hw-conduit" = callPackage @@ -129744,26 +127743,6 @@ self: { }) {}; "hw-eliasfano" = callPackage - ({ mkDerivation, base, hspec, hw-bits, hw-int, hw-packed-vector - , hw-prim, QuickCheck, safe, vector - }: - mkDerivation { - pname = "hw-eliasfano"; - version = "0.1.0.1"; - sha256 = "1rj8435fyg882f69cw0p20j8q9j6jlyvf3gshgkbyi2fzv5hnw8l"; - libraryHaskellDepends = [ - base hw-bits hw-int hw-packed-vector hw-prim safe vector - ]; - testHaskellDepends = [ - base hspec hw-bits hw-int hw-prim QuickCheck vector - ]; - description = "Elias-Fano"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "hw-eliasfano_0_1_1_0" = callPackage ({ mkDerivation, base, binary, bytestring, criterion, deepseq , generic-lens, hedgehog, hspec, hspec-discover, hw-bits , hw-hedgehog, hw-hspec-hedgehog, hw-int, hw-packed-vector, hw-prim @@ -129875,20 +127854,6 @@ self: { }) {}; "hw-hspec-hedgehog" = callPackage - ({ mkDerivation, base, call-stack, hedgehog, hspec, HUnit }: - mkDerivation { - pname = "hw-hspec-hedgehog"; - version = "0.1.0.4"; - sha256 = "1vlrrskalip7a477px7imwy9yifvdx7c03zrgk90rlarivwkggaq"; - revision = "2"; - editedCabalFile = "1jh0p4i87c2bn926s0d7qx6ykssjj26fia0d24grlklkd14bnmpq"; - libraryHaskellDepends = [ base call-stack hedgehog hspec HUnit ]; - testHaskellDepends = [ base hedgehog hspec ]; - description = "Interoperability between hspec and hedgehog"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hw-hspec-hedgehog_0_1_0_7" = callPackage ({ mkDerivation, base, call-stack, hedgehog, hspec, hspec-discover , HUnit, transformers }: @@ -129905,7 +127870,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Interoperability between hspec and hedgehog"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-int" = callPackage @@ -129920,35 +127884,43 @@ self: { }) {}; "hw-ip" = callPackage - ({ mkDerivation, appar, base, containers, generic-lens, hedgehog - , hspec, hw-bits, hw-hspec-hedgehog, iproute, text + ({ mkDerivation, appar, base, binary, bytestring, containers + , generic-lens, hedgehog, hspec, hspec-discover, hw-bits + , hw-hspec-hedgehog, iproute, lens, optparse-applicative, text }: mkDerivation { pname = "hw-ip"; - version = "2.0.1.0"; - sha256 = "1r1ck890id7x9b1dpp23h656mvh24bacxdbvxhgkdjiryklrjsqr"; + version = "2.3.1.2"; + sha256 = "1j22dl3739ysg7p88aks19azyzs883drz5lc593m99w057j33wga"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ appar base containers generic-lens hw-bits iproute text ]; + executableHaskellDepends = [ + appar base binary bytestring generic-lens lens optparse-applicative + text + ]; testHaskellDepends = [ appar base generic-lens hedgehog hspec hw-bits hw-hspec-hedgehog text ]; + testToolDepends = [ hspec-discover ]; description = "Library for manipulating IP addresses and CIDR blocks"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; - "hw-ip_2_3_1_2" = callPackage + "hw-ip_2_3_4_1" = callPackage ({ mkDerivation, appar, base, binary, bytestring, containers , generic-lens, hedgehog, hspec, hspec-discover, hw-bits , hw-hspec-hedgehog, iproute, lens, optparse-applicative, text }: mkDerivation { pname = "hw-ip"; - version = "2.3.1.2"; - sha256 = "1j22dl3739ysg7p88aks19azyzs883drz5lc593m99w057j33wga"; + version = "2.3.4.1"; + sha256 = "023wv7dvpyw2nnlrdqhp3nqrbbh9af074fz12y8510br2gfdyamd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -129971,34 +127943,38 @@ self: { "hw-json" = callPackage ({ mkDerivation, ansi-wl-pprint, array, attoparsec, base - , bytestring, containers, criterion, directory, dlist, hspec - , hw-balancedparens, hw-bits, hw-mquery, hw-parser, hw-prim - , hw-rankselect, hw-rankselect-base, lens, mmap - , optparse-applicative, text, vector, word8 + , bits-extra, bytestring, criterion, directory, dlist, generic-lens + , hedgehog, hspec, hspec-discover, hw-balancedparens, hw-bits + , hw-hspec-hedgehog, hw-json-simd, hw-mquery, hw-parser, hw-prim + , hw-rankselect, hw-rankselect-base, hw-simd, lens, mmap + , optparse-applicative, text, transformers, vector, word8 }: mkDerivation { pname = "hw-json"; - version = "0.9.0.1"; - sha256 = "00prvi3jrb02g92vq1ghyxpdpqangj482x1k3l13s385804grgqw"; + version = "1.0.0.2"; + sha256 = "0lb38kfxhamvdhp6z3aw4as57nc6jxf6wj7nr3lmiry6h2gx15js"; + revision = "1"; + editedCabalFile = "1laxwrcjdjrpym4gghnqa39xvdvbxsp2sbpzcc703ac3kj7v2b6h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-wl-pprint array attoparsec base bytestring containers dlist + ansi-wl-pprint array attoparsec base bits-extra bytestring dlist hw-balancedparens hw-bits hw-mquery hw-parser hw-prim hw-rankselect - hw-rankselect-base mmap text vector word8 + hw-rankselect-base hw-simd mmap text vector word8 ]; executableHaskellDepends = [ - base bytestring criterion dlist hw-balancedparens hw-bits hw-mquery - hw-prim hw-rankselect hw-rankselect-base lens mmap + base bytestring dlist generic-lens hw-balancedparens hw-json-simd + hw-mquery hw-prim hw-rankselect hw-rankselect-base lens mmap optparse-applicative vector ]; testHaskellDepends = [ - attoparsec base bytestring containers hspec hw-balancedparens - hw-bits hw-prim hw-rankselect hw-rankselect-base mmap vector + attoparsec base bytestring hedgehog hspec hw-balancedparens hw-bits + hw-hspec-hedgehog hw-prim hw-rankselect hw-rankselect-base + transformers vector ]; + testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ - base bytestring criterion directory hw-balancedparens hw-bits - hw-prim hw-rankselect hw-rankselect-base mmap vector + base bytestring criterion directory mmap ]; description = "Memory efficient JSON parser"; license = stdenv.lib.licenses.bsd3; @@ -130237,33 +128213,6 @@ self: { "hw-mquery" = callPackage ({ mkDerivation, ansi-wl-pprint, base, dlist, hedgehog, hspec - , hspec-discover, hw-hspec-hedgehog, lens, QuickCheck, semigroups - }: - mkDerivation { - pname = "hw-mquery"; - version = "0.1.0.3"; - sha256 = "0i020vl1f2nkk80rd1fmx9ilkrzyggp01ka3bz9n0365mcq5g3s5"; - revision = "1"; - editedCabalFile = "1i5kir4fxv564h01sjj29zs460w23rj7q5ykq98x3cwmynlrkl6l"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - ansi-wl-pprint base dlist lens semigroups - ]; - executableHaskellDepends = [ - ansi-wl-pprint base dlist lens semigroups - ]; - testHaskellDepends = [ - ansi-wl-pprint base dlist hedgehog hspec hw-hspec-hedgehog lens - QuickCheck semigroups - ]; - testToolDepends = [ hspec-discover ]; - description = "Monadic query DSL"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hw-mquery_0_2_0_1" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, dlist, hedgehog, hspec , hspec-discover, hw-hspec-hedgehog, lens, semigroups }: mkDerivation { @@ -130284,22 +128233,27 @@ self: { testToolDepends = [ hspec-discover ]; description = "Monadic query DSL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-packed-vector" = callPackage - ({ mkDerivation, base, bytestring, hspec, hw-bits, hw-int, hw-prim - , hw-string-parse, QuickCheck, safe, vector + ({ mkDerivation, base, bytestring, criterion, deepseq, directory + , hedgehog, hspec, hspec-discover, hw-bits, hw-hedgehog + , hw-hspec-hedgehog, hw-prim, vector }: mkDerivation { pname = "hw-packed-vector"; - version = "0.0.0.1"; - sha256 = "0ca9073b79ifh5rhif6ph6fqq5aad0pk1djbka46xk93rf00m65n"; + version = "0.0.0.3"; + sha256 = "1l021x4sya6fmdhz6nsqh4nvvc3bbb29y30ari0qvn5789nwxzv3"; libraryHaskellDepends = [ - base bytestring hw-bits hw-int hw-prim hw-string-parse safe vector + base bytestring deepseq hw-bits hw-prim vector ]; testHaskellDepends = [ - base bytestring hspec hw-bits hw-prim QuickCheck vector + base bytestring hedgehog hspec hw-bits hw-hedgehog + hw-hspec-hedgehog hw-prim vector + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + base criterion directory hedgehog hspec hw-prim vector ]; description = "Packed Vector"; license = stdenv.lib.licenses.bsd3; @@ -130362,30 +128316,6 @@ self: { "hw-prim" = callPackage ({ mkDerivation, base, bytestring, criterion, directory, exceptions , ghc-prim, hedgehog, hspec, hspec-discover, hw-hspec-hedgehog - , mmap, QuickCheck, semigroups, transformers, vector - }: - mkDerivation { - pname = "hw-prim"; - version = "0.6.2.28"; - sha256 = "13sszlfw4k4vb2zzipjisk3b4qjs19jzmczfjhzs0dap6gw39haz"; - libraryHaskellDepends = [ - base bytestring ghc-prim mmap semigroups transformers vector - ]; - testHaskellDepends = [ - base bytestring directory exceptions hedgehog hspec - hw-hspec-hedgehog mmap QuickCheck semigroups transformers vector - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ - base bytestring criterion mmap semigroups transformers vector - ]; - description = "Primitive functions and data types"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hw-prim_0_6_2_31" = callPackage - ({ mkDerivation, base, bytestring, criterion, directory, exceptions - , ghc-prim, hedgehog, hspec, hspec-discover, hw-hspec-hedgehog , mmap, QuickCheck, semigroups, transformers, unliftio-core, vector }: mkDerivation { @@ -130406,7 +128336,6 @@ self: { ]; description = "Primitive functions and data types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-prim-bits" = callPackage @@ -130431,15 +128360,17 @@ self: { "hw-rankselect" = callPackage ({ mkDerivation, base, bytestring, conduit, criterion, deepseq - , directory, hedgehog, hspec, hw-balancedparens, hw-bits - , hw-hedgehog, hw-hspec-hedgehog, hw-prim, hw-rankselect-base, lens - , mmap, mtl, optparse-applicative, QuickCheck, resourcet - , transformers, vector + , directory, generic-lens, hedgehog, hspec, hspec-discover + , hw-balancedparens, hw-bits, hw-hedgehog, hw-hspec-hedgehog + , hw-prim, hw-rankselect-base, lens, mmap, mtl + , optparse-applicative, QuickCheck, resourcet, transformers, vector }: mkDerivation { pname = "hw-rankselect"; - version = "0.12.0.4"; - sha256 = "0l27pfsqvil9l4p7hk2bvgxsa35z88179w88wbwvmjf4vsmpiqkh"; + version = "0.13.0.0"; + sha256 = "13cdsrg7akizf5gcjvpwr8mwhl6ds9n3y7ql559w52xy5s8viqzv"; + revision = "1"; + editedCabalFile = "17f9zdy7620d36mrrcakpr9rhzzr7rkv8hd5n47cqllmhzvns5mg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -130447,13 +128378,14 @@ self: { vector ]; executableHaskellDepends = [ - base directory hw-bits hw-prim hw-rankselect-base lens mmap mtl - optparse-applicative vector + base directory generic-lens hw-bits hw-prim hw-rankselect-base lens + mmap mtl optparse-applicative vector ]; testHaskellDepends = [ base directory hedgehog hspec hw-bits hw-hedgehog hw-hspec-hedgehog hw-prim hw-rankselect-base mmap QuickCheck transformers vector ]; + testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ base bytestring conduit criterion directory hw-bits hw-prim hw-rankselect-base mmap resourcet vector @@ -131031,23 +128963,11 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "hxt-charproperties"; - version = "9.2.0.1"; - sha256 = "1mml8wglvagqq891rchgli6r8rnkwrqhgsxfl6kb5403pzb18rp4"; - libraryHaskellDepends = [ base ]; - description = "Character properties and classes for XML and Unicode"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hxt-charproperties_9_4_0_0" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "hxt-charproperties"; version = "9.4.0.0"; sha256 = "1bk88hj2pqlvcnyfncqyb9j7w9vvdxcq3cgr0w2l09c0abas23pm"; libraryHaskellDepends = [ base ]; description = "Character properties and classes for XML and Unicode"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hxt-css" = callPackage @@ -131852,28 +129772,6 @@ self: { "hyphenation" = callPackage ({ mkDerivation, base, bytestring, Cabal, cabal-doctest, containers - , doctest, unordered-containers, zlib - }: - mkDerivation { - pname = "hyphenation"; - version = "0.7.1"; - sha256 = "1h5i07v2zlka29dj4zysc47p747j88x6z4zm3zwcr5i8yirm0p52"; - revision = "5"; - editedCabalFile = "00wsp69aqi5i906liqa4sfs0p2yclhr1ihz8y1700b3ymb70lzql"; - enableSeparateDataOutput = true; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - base bytestring containers unordered-containers zlib - ]; - testHaskellDepends = [ - base containers doctest unordered-containers - ]; - description = "Configurable Knuth-Liang hyphenation"; - license = stdenv.lib.licenses.bsd2; - }) {}; - - "hyphenation_0_8" = callPackage - ({ mkDerivation, base, bytestring, Cabal, cabal-doctest, containers , doctest, text, unordered-containers, zlib }: mkDerivation { @@ -131890,7 +129788,6 @@ self: { ]; description = "Configurable Knuth-Liang hyphenation"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hypher" = callPackage @@ -132257,6 +130154,8 @@ self: { testHaskellDepends = [ base ]; description = "Type safe iconv wrapper"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ide-backend" = callPackage @@ -133407,8 +131306,6 @@ self: { ]; description = "A function to post an image to imgur"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "imgurder" = callPackage @@ -133661,6 +131558,8 @@ self: { doHaddock = false; description = "Framework for defaulting superclasses"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "implicit" = callPackage @@ -134467,29 +132366,6 @@ self: { "influxdb" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal , cabal-doctest, clock, containers, doctest, foldl, http-client - , http-types, lens, network, optional-args, scientific, tagged - , template-haskell, text, time, unordered-containers, vector - }: - mkDerivation { - pname = "influxdb"; - version = "1.6.1.3"; - sha256 = "1l03bwmwxb42cha8v3fj616ks927mcklxrmqxrr1ms53m7bsa587"; - isLibrary = true; - isExecutable = true; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - aeson attoparsec base bytestring clock containers foldl http-client - http-types lens network optional-args scientific tagged text time - unordered-containers vector - ]; - testHaskellDepends = [ base doctest template-haskell ]; - description = "Haskell client library for InfluxDB"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "influxdb_1_7_1" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal - , cabal-doctest, clock, containers, doctest, foldl, http-client , http-types, lens, network, optional-args, raw-strings-qq , scientific, tagged, tasty, tasty-hunit, template-haskell, text , time, unordered-containers, vector @@ -134512,7 +132388,6 @@ self: { ]; description = "Haskell client library for InfluxDB"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "informative" = callPackage @@ -134546,21 +132421,6 @@ self: { }) {}; "ini" = callPackage - ({ mkDerivation, attoparsec, base, text, unordered-containers }: - mkDerivation { - pname = "ini"; - version = "0.3.6"; - sha256 = "1n9wsl7nz910bc8jx9ps7pvpql4hlnryjkqbdpfq0phjb9sf7fzw"; - revision = "1"; - editedCabalFile = "0gfikdal67aws20i5r4wg4r0lgn844glykcn3nnmbmyvwsks049l"; - libraryHaskellDepends = [ - attoparsec base text unordered-containers - ]; - description = "Quick and easy configuration files in the INI format"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ini_0_4_1" = callPackage ({ mkDerivation, attoparsec, base, hspec, text , unordered-containers }: @@ -134574,7 +132434,6 @@ self: { testHaskellDepends = [ base hspec unordered-containers ]; description = "Quick and easy configuration files in the INI format"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ini-qq" = callPackage @@ -134589,6 +132448,8 @@ self: { testHaskellDepends = [ base HUnit ini raw-strings-qq text ]; description = "Quasiquoter for INI"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "inilist" = callPackage @@ -134939,8 +132800,6 @@ self: { ]; description = "A simple proxy for debugging plaintext protocols communication"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "inspection-testing" = callPackage @@ -135645,27 +133504,6 @@ self: { }: mkDerivation { pname = "interpolator"; - version = "0.1.2"; - sha256 = "1kzqlwgpbzrq0flr90f9q359j8qjxll5adl9w5r9gp1yj3j7hrrz"; - libraryHaskellDepends = [ - aeson base containers either mono-traversable mtl - product-profunctors profunctors QuickCheck template-haskell text - ]; - testHaskellDepends = [ - aeson base containers either hspec mono-traversable mtl - product-profunctors profunctors QuickCheck template-haskell text - ]; - description = "Runtime interpolation of environment variables in records using profunctors"; - license = stdenv.lib.licenses.mit; - }) {}; - - "interpolator_1_0_0" = callPackage - ({ mkDerivation, aeson, base, containers, either, hspec - , mono-traversable, mtl, product-profunctors, profunctors - , QuickCheck, template-haskell, text - }: - mkDerivation { - pname = "interpolator"; version = "1.0.0"; sha256 = "0kkasycgba525mag4362w8kirnxjydrmh7gjqk5xs6zgcp1ralb7"; libraryHaskellDepends = [ @@ -135678,7 +133516,6 @@ self: { ]; description = "Runtime interpolation of environment variables in records using profunctors"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "interprocess" = callPackage @@ -136265,6 +134102,8 @@ self: { ]; description = "EDSL for concurrent, realtime, embedded programming on top of Ivory"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ioref-stable" = callPackage @@ -136322,33 +134161,6 @@ self: { , deepseq, doctest, hashable, hspec, hspec-discover, HUnit , primitive, QuickCheck, quickcheck-classes, test-framework , test-framework-hunit, test-framework-quickcheck2, text, vector - }: - mkDerivation { - pname = "ip"; - version = "1.4.2.1"; - sha256 = "0661bygbgd2j897hbzs2pgqdk12px2d904r13lfw7bcrp892xja1"; - libraryHaskellDepends = [ - aeson attoparsec base bytestring deepseq hashable primitive text - vector - ]; - testHaskellDepends = [ - attoparsec base bytestring doctest hspec HUnit QuickCheck - quickcheck-classes test-framework test-framework-hunit - test-framework-quickcheck2 text - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ - attoparsec base bytestring criterion text - ]; - description = "Library for IP and MAC addresses"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ip_1_5_1" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion - , deepseq, doctest, hashable, hspec, hspec-discover, HUnit - , primitive, QuickCheck, quickcheck-classes, test-framework - , test-framework-hunit, test-framework-quickcheck2, text, vector , wide-word }: mkDerivation { @@ -136371,6 +134183,7 @@ self: { description = "Library for IP and MAC addresses"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ip-quoter" = callPackage @@ -136640,27 +134453,6 @@ self: { }) {}; "ipython-kernel" = callPackage - ({ mkDerivation, aeson, base, bytestring, cereal, containers - , cryptonite, directory, filepath, memory, mtl, process, temporary - , text, transformers, unordered-containers, uuid, zeromq4-haskell - }: - mkDerivation { - pname = "ipython-kernel"; - version = "0.9.1.0"; - sha256 = "0944riw00i3m8n3cab0g9c14b24xryf9w8ddlddnmxgys4sn8qak"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson base bytestring cereal containers cryptonite directory - filepath memory mtl process temporary text transformers - unordered-containers uuid zeromq4-haskell - ]; - description = "A library for creating kernels for IPython frontends"; - license = stdenv.lib.licenses.mit; - }) {}; - - "ipython-kernel_0_10_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, cereal, cereal-text , containers, cryptonite, directory, filepath, memory, mtl, process , temporary, text, transformers, unordered-containers, uuid @@ -136680,7 +134472,6 @@ self: { ]; description = "A library for creating kernels for IPython frontends"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "irc" = callPackage @@ -136719,26 +134510,6 @@ self: { }: mkDerivation { pname = "irc-client"; - version = "1.1.0.7"; - sha256 = "0vfcf4fsyqwvr6mjf89x368121m3dqscywrsgpn1qm80gpzsncj2"; - libraryHaskellDepends = [ - base bytestring conduit connection containers contravariant - exceptions irc-conduit irc-ctcp mtl network-conduit-tls old-locale - profunctors stm stm-chans text time tls transformers x509 - x509-store x509-validation - ]; - description = "An IRC client library"; - license = stdenv.lib.licenses.mit; - }) {}; - - "irc-client_1_1_1_0" = callPackage - ({ mkDerivation, base, bytestring, conduit, connection, containers - , contravariant, exceptions, irc-conduit, irc-ctcp, mtl - , network-conduit-tls, old-locale, profunctors, stm, stm-chans - , text, time, tls, transformers, x509, x509-store, x509-validation - }: - mkDerivation { - pname = "irc-client"; version = "1.1.1.0"; sha256 = "1f2lqg37ig3f23066c4179vcym6p3ylmxsywqhmb0n078kix6kfb"; libraryHaskellDepends = [ @@ -136749,7 +134520,6 @@ self: { ]; description = "An IRC client library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "irc-colors" = callPackage @@ -137676,6 +135446,8 @@ self: { libraryToolDepends = [ alex happy ]; description = "Safe embedded C programming"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ivory-artifact" = callPackage @@ -137711,6 +135483,8 @@ self: { ]; description = "Ivory C backend"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ivory-bitdata" = callPackage @@ -137749,6 +135523,8 @@ self: { ]; description = "Simple concrete evaluator for Ivory programs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ivory-examples" = callPackage @@ -137771,6 +135547,8 @@ self: { ]; description = "Ivory examples"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ivory-hw" = callPackage @@ -137783,6 +135561,8 @@ self: { libraryHaskellDepends = [ base filepath ivory ivory-artifact ]; description = "Ivory hardware model (STM32F4)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ivory-opts" = callPackage @@ -137799,6 +135579,8 @@ self: { ]; description = "Ivory compiler optimizations"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ivory-quickcheck" = callPackage @@ -137820,6 +135602,8 @@ self: { ]; description = "QuickCheck driver for Ivory"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ivory-serialize" = callPackage @@ -137836,6 +135620,8 @@ self: { ]; description = "Serialization library for Ivory"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ivory-stdlib" = callPackage @@ -137848,6 +135634,8 @@ self: { libraryHaskellDepends = [ base filepath ivory ivory-artifact ]; description = "Ivory standard library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ivy-web" = callPackage @@ -138900,40 +136688,6 @@ self: { , bytestring, concise, containers, cryptonite, hspec, lens, memory , monad-time, mtl, network-uri, QuickCheck, quickcheck-instances , safe, semigroups, tasty, tasty-hspec, tasty-quickcheck - , template-haskell, text, time, unix, unordered-containers, vector - , x509 - }: - mkDerivation { - pname = "jose"; - version = "0.8.0.0"; - sha256 = "027698xq5l8in420x3sc5zqwp16i1jzjcy8rlh546j8acxcvrqc4"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson attoparsec base base64-bytestring bytestring concise - containers cryptonite lens memory monad-time mtl network-uri - QuickCheck quickcheck-instances safe semigroups template-haskell - text time unordered-containers vector x509 - ]; - executableHaskellDepends = [ - aeson base bytestring lens mtl semigroups text unix - ]; - testHaskellDepends = [ - aeson attoparsec base base64-bytestring bytestring concise - containers cryptonite hspec lens memory monad-time mtl network-uri - QuickCheck quickcheck-instances safe semigroups tasty tasty-hspec - tasty-quickcheck template-haskell text time unordered-containers - vector x509 - ]; - description = "Javascript Object Signing and Encryption and JSON Web Token library"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "jose_0_8_1_0" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base64-bytestring - , bytestring, concise, containers, cryptonite, hspec, lens, memory - , monad-time, mtl, network-uri, QuickCheck, quickcheck-instances - , safe, semigroups, tasty, tasty-hspec, tasty-quickcheck , template-haskell, text, time, unordered-containers, vector, x509 }: mkDerivation { @@ -138957,7 +136711,6 @@ self: { ]; description = "Javascript Object Signing and Encryption and JSON Web Token library"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jose-jwt" = callPackage @@ -139306,8 +137059,6 @@ self: { ]; description = "Utilities for generating JSON-API payloads"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "json-api-lib" = callPackage @@ -140085,8 +137836,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Library to parse and execute JSONPath"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "jsonresume" = callPackage @@ -141055,43 +138804,6 @@ self: { }: mkDerivation { pname = "katip"; - version = "0.7.0.0"; - sha256 = "1z4533952sal5ma71xpsrwbi9pniy1cciw20w31igrx9rw9kx98b"; - revision = "1"; - editedCabalFile = "1lzla1iv5ll9iks5xh8399vs2mjxb33pbdg115kqbq9r5z3h84qp"; - libraryHaskellDepends = [ - aeson async auto-update base bytestring containers either hostname - microlens microlens-th monad-control mtl old-locale resourcet - safe-exceptions scientific semigroups stm string-conv - template-haskell text time transformers transformers-base - transformers-compat unix unliftio-core unordered-containers - ]; - testHaskellDepends = [ - aeson base bytestring containers directory microlens - quickcheck-instances regex-tdfa safe-exceptions stm tasty - tasty-golden tasty-hunit tasty-quickcheck template-haskell text - time time-locale-compat unordered-containers - ]; - benchmarkHaskellDepends = [ - aeson async base blaze-builder criterion deepseq directory filepath - safe-exceptions text time transformers unix - ]; - description = "A structured logging framework"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "katip_0_8_3_0" = callPackage - ({ mkDerivation, aeson, async, auto-update, base, blaze-builder - , bytestring, containers, criterion, deepseq, directory, either - , filepath, hostname, microlens, microlens-th, monad-control, mtl - , old-locale, quickcheck-instances, regex-tdfa, resourcet - , safe-exceptions, scientific, semigroups, stm, string-conv, tasty - , tasty-golden, tasty-hunit, tasty-quickcheck, template-haskell - , text, time, time-locale-compat, transformers, transformers-base - , transformers-compat, unix, unliftio-core, unordered-containers - }: - mkDerivation { - pname = "katip"; version = "0.8.3.0"; sha256 = "0wpqchpgrp7awrf7hirg0768g8nnqrydnwcw8xgxw6w47zcb71d0"; libraryHaskellDepends = [ @@ -141113,7 +138825,6 @@ self: { ]; description = "A structured logging framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "katip-datadog" = callPackage @@ -141136,8 +138847,6 @@ self: { ]; description = "Datadog scribe for the Katip logging framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "katip-elasticsearch" = callPackage @@ -141184,6 +138893,8 @@ self: { ]; description = "Katip scribe to send logs to Kafka"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "katip-logzio" = callPackage @@ -141210,8 +138921,6 @@ self: { ]; description = "Logz.IO scribe for the Katip logging framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "katip-rollbar" = callPackage @@ -141324,6 +139033,8 @@ self: { ]; description = "A haskell implementation of Katydid"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "kawa" = callPackage @@ -141394,6 +139105,8 @@ self: { ]; description = "stats.NBA.com library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "kazura-queue" = callPackage @@ -142167,6 +139880,8 @@ self: { ]; description = "Pure Haskell key/value store implementation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "keyword-args" = callPackage @@ -142378,27 +140093,6 @@ self: { }) {}; "kleene" = callPackage - ({ mkDerivation, base, base-compat-batteries, containers, lattices - , MemoTrie, QuickCheck, range-set-list, regex-applicative - , step-function, text, transformers - }: - mkDerivation { - pname = "kleene"; - version = "0"; - sha256 = "00hbrmsm19azxxql14y6k7h7z8k4azlmy4y0gimyqbx4nb7swln6"; - revision = "1"; - editedCabalFile = "1izdmr7a2d7qssnj732m2qc02inm3hrc882x9nyvz68648pvwwsx"; - libraryHaskellDepends = [ - base base-compat-batteries containers lattices MemoTrie QuickCheck - range-set-list regex-applicative step-function text transformers - ]; - description = "Kleene algebra"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "kleene_0_1" = callPackage ({ mkDerivation, attoparsec, base, base-compat, bytestring , containers, lattices, MemoTrie, QuickCheck, range-set-list , regex-applicative, semigroupoids, step-function, text @@ -142417,8 +140111,6 @@ self: { ]; description = "Kleene algebra"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "kmeans" = callPackage @@ -142613,6 +140305,8 @@ self: { ]; description = "JSON config file parsing based on unjson"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "kontrakcja-templates" = callPackage @@ -142938,6 +140632,8 @@ self: { testHaskellDepends = [ base ]; description = "Find the alpha emoji"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "kyotocabinet" = callPackage @@ -144001,33 +141697,6 @@ self: { }) {}; "lame" = callPackage - ({ mkDerivation, base, bytestring, data-default-class, directory - , exceptions, filepath, hspec, htaglib, mp3lame, temporary, text - , transformers, wave - }: - mkDerivation { - pname = "lame"; - version = "0.1.1"; - sha256 = "0j35zpfhppb09m6h23awxgsawisvgsnrw7d99f5z3xq2bjihjq5k"; - revision = "4"; - editedCabalFile = "0r364limqm570a8xd82wwpcvmcx2j7nfndg5kad022vz2v5n0smz"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base bytestring data-default-class directory exceptions filepath - text transformers wave - ]; - librarySystemDepends = [ mp3lame ]; - testHaskellDepends = [ - base data-default-class directory filepath hspec htaglib temporary - text - ]; - description = "Fairly complete high-level binding to LAME encoder"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {mp3lame = null;}; - - "lame_0_2_0" = callPackage ({ mkDerivation, base, bytestring, directory, exceptions, filepath , hspec, hspec-discover, htaglib, mp3lame, temporary, text , transformers, wave @@ -145297,8 +142966,8 @@ self: { }: mkDerivation { pname = "lapack"; - version = "0.3.0.1"; - sha256 = "0i7zzsw7rdb2hja0rdmw0l45x8svv5dxmnmrjdfs52gxzqmq621g"; + version = "0.3.1"; + sha256 = "1w8nndh3gj6vrildxjn13lmi7aqjwbhpqkdj7d21fsfbmhjlgwvr"; libraryHaskellDepends = [ base blas-ffi blaze-html boxes comfort-array deepseq fixed-length guarded-allocation hyper lapack-ffi lazyio netlib-ffi non-empty @@ -145367,28 +143036,6 @@ self: { }: mkDerivation { pname = "lapack-ffi-tools"; - version = "0.1.2"; - sha256 = "14wfnddya7ch8hm3wgabd7nma7ahcgv6h2innfbp1ck92isn2s0q"; - isLibrary = false; - isExecutable = true; - enableSeparateDataOutput = true; - executableHaskellDepends = [ - base bytestring cassava containers explicit-exception filepath - non-empty optparse-applicative parsec pathtype transformers - unordered-containers utility-ht vector - ]; - description = "Generator for Haskell interface to Fortran LAPACK"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "lapack-ffi-tools_0_1_2_1" = callPackage - ({ mkDerivation, base, bytestring, cassava, containers - , explicit-exception, filepath, non-empty, optparse-applicative - , parsec, pathtype, transformers, unordered-containers, utility-ht - , vector - }: - mkDerivation { - pname = "lapack-ffi-tools"; version = "0.1.2.1"; sha256 = "0hk54psm066acgn24mw5dbbhz4a0nqvyks75302cabijbp524gdh"; isLibrary = false; @@ -145401,7 +143048,6 @@ self: { ]; description = "Generator for Haskell interface to Fortran LAPACK"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "large-hashable" = callPackage @@ -145611,32 +143257,6 @@ self: { "lattices" = callPackage ({ mkDerivation, base, base-compat, containers, deepseq, hashable - , QuickCheck, quickcheck-instances, semigroupoids, tagged, tasty - , tasty-quickcheck, transformers, universe-base - , universe-instances-base, universe-reverse-instances - , unordered-containers - }: - mkDerivation { - pname = "lattices"; - version = "1.7.1.1"; - sha256 = "1byx2hmmh2213afdcsjxf3mvq3h9bwkl5wrvzxv1yqvd9jiqjz3r"; - revision = "2"; - editedCabalFile = "0qxz4v5pqwvhb79mz4b7wc66r2c0xc9ixfhss4h56jk3vb1hriys"; - libraryHaskellDepends = [ - base base-compat containers deepseq hashable semigroupoids tagged - universe-base universe-reverse-instances unordered-containers - ]; - testHaskellDepends = [ - base base-compat containers QuickCheck quickcheck-instances tasty - tasty-quickcheck transformers universe-instances-base - unordered-containers - ]; - description = "Fine-grained library for constructing and manipulating lattices"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "lattices_2_0_1" = callPackage - ({ mkDerivation, base, base-compat, containers, deepseq, hashable , integer-logarithms, QuickCheck, quickcheck-instances , semigroupoids, tagged, tasty, tasty-quickcheck, transformers , universe-base, universe-reverse-instances, unordered-containers @@ -145657,7 +143277,6 @@ self: { ]; description = "Fine-grained library for constructing and manipulating lattices"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "launchpad-control" = callPackage @@ -145970,6 +143589,8 @@ self: { ]; description = "An EDSL for programming the Game Boy"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lazyio" = callPackage @@ -146109,8 +143730,6 @@ self: { testHaskellDepends = [ base bytestring hspec process semigroups ]; description = "Pure Haskell LDAP Client Library"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ldapply" = callPackage @@ -146218,25 +143837,12 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "leancheck"; - version = "0.8.0"; - sha256 = "1lblxlg881asqgbdv6sivzxryis7cgkpclgyyks598ii06vd0z1s"; - libraryHaskellDepends = [ base template-haskell ]; - testHaskellDepends = [ base ]; - description = "Enumerative property-based testing"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "leancheck_0_9_1" = callPackage - ({ mkDerivation, base, template-haskell }: - mkDerivation { - pname = "leancheck"; version = "0.9.1"; sha256 = "03n9apqkfs8vjm0s1ajfpg02zsvdm091di0860gyqa58cd3qbkdb"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base ]; description = "Enumerative property-based testing"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "leancheck-enum-instances" = callPackage @@ -147963,46 +145569,6 @@ self: { }) {inherit (pkgs) postgresql;}; "libraft" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, cereal, concurrency - , containers, dejafu, directory, exceptions, haskeline - , hunit-dejafu, mtl, network, network-simple, parsec, protolude - , QuickCheck, random, repline, stm, tasty, tasty-dejafu - , tasty-discover, tasty-expected-failure, tasty-hunit - , tasty-quickcheck, text, time, transformers, word8 - }: - mkDerivation { - pname = "libraft"; - version = "0.1.1.0"; - sha256 = "1kjrrpgci6f1wsb75xrndp7xx50xgw8fgh4f6l345wyy2xxlpj8c"; - revision = "1"; - editedCabalFile = "0bzfkay18wphlqfm0i6rmr7rm1d6s16nxvrmc4wp0szim1k9k0gh"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - attoparsec base bytestring cereal concurrency containers directory - exceptions haskeline mtl network network-simple parsec protolude - random repline text time transformers word8 - ]; - executableHaskellDepends = [ - attoparsec base bytestring cereal concurrency containers directory - exceptions haskeline mtl network network-simple parsec protolude - random repline stm text time transformers word8 - ]; - testHaskellDepends = [ - attoparsec base bytestring cereal concurrency containers dejafu - directory exceptions haskeline hunit-dejafu mtl network - network-simple parsec protolude QuickCheck random repline tasty - tasty-dejafu tasty-discover tasty-expected-failure tasty-hunit - tasty-quickcheck text time transformers word8 - ]; - testToolDepends = [ tasty-discover ]; - description = "Raft consensus algorithm"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "libraft_0_5_0_0" = callPackage ({ mkDerivation, async, atomic-write, attoparsec, base , base16-bytestring, bytestring, cereal, concurrency, containers , cryptohash-sha256, dejafu, directory, ekg, ekg-core, exceptions @@ -148916,6 +146482,8 @@ self: { ]; description = "Haskell SDK for LINE Messaging API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "line-break" = callPackage @@ -148941,8 +146509,6 @@ self: { testHaskellDepends = [ base hspec ]; description = "raster line drawing"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "line-size" = callPackage @@ -149050,8 +146616,8 @@ self: { }: mkDerivation { pname = "linear-circuit"; - version = "0.1.0.1"; - sha256 = "1pm2pvx9ds1x9cb85n9b2km6ypmqqv5d3rwxyyszy10vcymypns4"; + version = "0.1.0.2"; + sha256 = "0cf2lq8p2yppns8qn732drky8ghhd4ri9zxv7nbvas10ha0p19lm"; libraryHaskellDepends = [ base comfort-array comfort-graph containers lapack netlib-ffi transformers utility-ht @@ -149148,6 +146714,8 @@ self: { testHaskellDepends = [ base hspec network tasty-hspec ]; description = "Typed sockets"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "linear-vect" = callPackage @@ -149172,6 +146740,8 @@ self: { libraryHaskellDepends = [ base sbv ]; description = "Use SMT solvers to solve linear systems over integers and rationals"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "linearmap-category" = callPackage @@ -149400,6 +146970,8 @@ self: { ]; description = "Bindings to the Linode API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "linode-v4" = callPackage @@ -150093,6 +147665,26 @@ self: { ]; description = "Witnesses for working with type-level lists"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "list-witnesses_0_1_2_0" = callPackage + ({ mkDerivation, base, decidable, functor-products, microlens + , profunctors, singletons, vinyl + }: + mkDerivation { + pname = "list-witnesses"; + version = "0.1.2.0"; + sha256 = "10bflmrj747xs2ga8s0vw7hb419wvrwnm0bakxw7x1l7bcaa7z7m"; + libraryHaskellDepends = [ + base decidable functor-products microlens profunctors singletons + vinyl + ]; + description = "Witnesses for working with type-level lists"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "list-zip-def" = callPackage @@ -150217,6 +147809,8 @@ self: { ]; description = "Append only key-list database"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lit" = callPackage @@ -150630,8 +148224,8 @@ self: { }: mkDerivation { pname = "llvm-hs-pretty"; - version = "0.6.1.0"; - sha256 = "12w1rkkaf50jl2vdkyk4xpvjmsxzjbfkdyklaq5p6b8ykw872pda"; + version = "0.6.2.0"; + sha256 = "0inljys97b3vmb0006p75kzsm922w1r9721df2h7nfqp0in28c14"; libraryHaskellDepends = [ array base bytestring llvm-hs-pure prettyprinter text ]; @@ -150652,26 +148246,6 @@ self: { }: mkDerivation { pname = "llvm-hs-pure"; - version = "7.0.0"; - sha256 = "1b82cin889qkyp9qv5p3yk7wq7ibnx2v9pk0mpvk6k9ca7fpr7dg"; - libraryHaskellDepends = [ - attoparsec base bytestring containers fail mtl template-haskell - transformers unordered-containers - ]; - testHaskellDepends = [ - base containers mtl tasty tasty-hunit tasty-quickcheck transformers - ]; - description = "Pure Haskell LLVM functionality (no FFI)"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "llvm-hs-pure_8_0_0" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, containers, fail - , mtl, tasty, tasty-hunit, tasty-quickcheck, template-haskell - , transformers, unordered-containers - }: - mkDerivation { - pname = "llvm-hs-pure"; version = "8.0.0"; sha256 = "1srlac1vdpxddvbf560npxhldkq27hkxwb2lg4qdwvks55l38nfc"; libraryHaskellDepends = [ @@ -150683,7 +148257,6 @@ self: { ]; description = "Pure Haskell LLVM functionality (no FFI)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "llvm-ht" = callPackage @@ -151233,24 +148806,6 @@ self: { "log-base" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, deepseq , exceptions, mmorph, monad-control, monad-time, mtl, semigroups - , stm, text, time, transformers-base, unordered-containers - }: - mkDerivation { - pname = "log-base"; - version = "0.7.4.0"; - sha256 = "06rzvh3g294hpwpxw2syvywrw3rms1chjxqhki8b97ml1nlfnrs0"; - libraryHaskellDepends = [ - aeson aeson-pretty base bytestring deepseq exceptions mmorph - monad-control monad-time mtl semigroups stm text time - transformers-base unordered-containers - ]; - description = "Structured logging solution (base package)"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "log-base_0_8_0_0" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring, deepseq - , exceptions, mmorph, monad-control, monad-time, mtl, semigroups , stm, text, time, transformers-base, unliftio-core , unordered-containers }: @@ -151265,7 +148820,6 @@ self: { ]; description = "Structured logging solution (base package)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "log-domain" = callPackage @@ -151454,8 +149008,8 @@ self: { }: mkDerivation { pname = "log4hs"; - version = "0.0.3.0"; - sha256 = "0bbl1cfa85dr1kxiikykh32x0141bkgfabvkjp37m52sv3vs9mvi"; + version = "0.0.5.0"; + sha256 = "1i1m2jmqjqkwbygwlwjk49lgfr42cvcwb0zg4xj1h74syqi6871y"; libraryHaskellDepends = [ aeson base containers data-default directory filepath template-haskell text time @@ -151737,17 +149291,6 @@ self: { }) {}; "logict" = callPackage - ({ mkDerivation, base, mtl }: - mkDerivation { - pname = "logict"; - version = "0.6.0.3"; - sha256 = "1a3sqws8bc55a7sxkl406a69ls75l60syv20b5rmkd30nbdisryh"; - libraryHaskellDepends = [ base mtl ]; - description = "A backtracking logic-programming monad"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "logict_0_7_0_2" = callPackage ({ mkDerivation, base, mtl, tasty, tasty-hunit }: mkDerivation { pname = "logict"; @@ -151757,7 +149300,6 @@ self: { testHaskellDepends = [ base mtl tasty tasty-hunit ]; description = "A backtracking logic-programming monad"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "logict-state" = callPackage @@ -152505,33 +150047,6 @@ self: { }) {}; "lsp-test" = callPackage - ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, base - , bytestring, conduit, conduit-parse, containers, data-default - , Diff, directory, filepath, haskell-lsp, hspec, lens, mtl - , parser-combinators, process, text, transformers, unix - , unordered-containers, yi-rope - }: - mkDerivation { - pname = "lsp-test"; - version = "0.5.1.2"; - sha256 = "1fc58krsm2q92azkcq57xdj7ngqvkqbvngjcr3plf0793xdarxj8"; - libraryHaskellDepends = [ - aeson aeson-pretty ansi-terminal base bytestring conduit - conduit-parse containers data-default Diff directory filepath - haskell-lsp lens mtl parser-combinators process text transformers - unix unordered-containers yi-rope - ]; - testHaskellDepends = [ - aeson base data-default haskell-lsp hspec lens text - unordered-containers - ]; - description = "Functional test framework for LSP servers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "lsp-test_0_6_0_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base , bytestring, conduit, conduit-parse, containers, data-default , Diff, directory, filepath, haskell-lsp, hspec, lens, mtl @@ -152626,6 +150141,8 @@ self: { ]; description = "Parameterized file evaluator"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ltiv1p1" = callPackage @@ -152808,24 +150325,6 @@ self: { }: mkDerivation { pname = "lucid-extras"; - version = "0.1.0.1"; - sha256 = "0wyb5pqhphfckmzpnl0xp6fy8fmnwqjqim3h3f3sdjqkqdly5iaw"; - revision = "1"; - editedCabalFile = "030mj3yddbia6dkbl8d6mssi42l3z8gs79z50r78gwiif6mh5dny"; - libraryHaskellDepends = [ - aeson base blaze-builder bytestring lucid text - ]; - testHaskellDepends = [ base directory lucid ]; - description = "Generate more HTML with Lucid"; - license = stdenv.lib.licenses.mit; - }) {}; - - "lucid-extras_0_2_2" = callPackage - ({ mkDerivation, aeson, base, blaze-builder, bytestring, directory - , lucid, text - }: - mkDerivation { - pname = "lucid-extras"; version = "0.2.2"; sha256 = "0zi48ly2729rs3rsbnwj3z5zk9zgzmva0d3dvp448726r62ryfc3"; libraryHaskellDepends = [ @@ -152834,7 +150333,6 @@ self: { testHaskellDepends = [ base directory lucid ]; description = "Generate more HTML with Lucid - Bootstrap, Rdash, Vega-Lite, Leaflet JS, Email"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lucid-foundation" = callPackage @@ -153626,6 +151124,8 @@ self: { ]; description = "An API client library for Mackerel"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "maclight" = callPackage @@ -153753,6 +151253,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) file;}; + "magic-tyfams" = callPackage + ({ mkDerivation, base, ghc, ghc-tcplugins-extra, syb }: + mkDerivation { + pname = "magic-tyfams"; + version = "0.1.1.0"; + sha256 = "1vgbbmv2807cyi6hh2137nw6dldn84qall828d64lg2ja6zj6xii"; + libraryHaskellDepends = [ base ghc ghc-tcplugins-extra syb ]; + description = "Write plugins for magic type families with ease"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "magic-wormhole" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, cryptonite , hashable, hedgehog, memory, network, network-uri @@ -153813,6 +151324,8 @@ self: { ]; description = "A web framework that integrates Servant, RIO, EKG, fast-logger, wai-cli…"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "magico" = callPackage @@ -153912,6 +151425,8 @@ self: { ]; description = "Preconfigured email connection pool on top of smtp"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mailbox-count" = callPackage @@ -154869,6 +152384,8 @@ self: { ]; description = "Efficient, polymorphic Map Algebra"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mappy" = callPackage @@ -155096,6 +152613,8 @@ self: { testToolDepends = [ tasty-discover ]; description = "Computations for Markov chain usage models"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "markov-processes" = callPackage @@ -155362,27 +152881,6 @@ self: { }) {}; "massiv" = callPackage - ({ mkDerivation, base, bytestring, data-default, data-default-class - , deepseq, ghc-prim, hspec, primitive, QuickCheck, safe-exceptions - , vector - }: - mkDerivation { - pname = "massiv"; - version = "0.2.8.1"; - sha256 = "10fq5h3nkgfibh0yix8j3h0ldqapyxivxj74jyrzc5zjbpa1j8pb"; - libraryHaskellDepends = [ - base bytestring data-default-class deepseq ghc-prim primitive - vector - ]; - testHaskellDepends = [ - base bytestring data-default deepseq hspec QuickCheck - safe-exceptions vector - ]; - description = "Massiv (Массив) is an Array Library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "massiv_0_4_0_0" = callPackage ({ mkDerivation, base, bytestring, Cabal, cabal-doctest , data-default-class, deepseq, doctest, exceptions , mersenne-random-pure64, primitive, QuickCheck, random, scheduler @@ -155404,6 +152902,7 @@ self: { description = "Massiv (Массив) is an Array Library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "massiv-io" = callPackage @@ -155420,6 +152919,8 @@ self: { ]; description = "Import/export of Image files into massiv Arrays"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "massiv-scheduler" = callPackage @@ -155536,6 +153037,8 @@ self: { testHaskellDepends = [ base containers matchable ]; description = "Generates Matchable instances using TemplateHaskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "matcher" = callPackage @@ -155705,6 +153208,8 @@ self: { ]; description = "Discover your (academic) ancestors!"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mathista" = callPackage @@ -155791,23 +153296,6 @@ self: { }: mkDerivation { pname = "matrices"; - version = "0.4.5"; - sha256 = "15vkkd3jwfdp648lfhskzhnisb1bzqia3asw8fmanpk71l9nyf9d"; - libraryHaskellDepends = [ base deepseq primitive vector ]; - testHaskellDepends = [ - base tasty tasty-hunit tasty-quickcheck vector - ]; - benchmarkHaskellDepends = [ base criterion vector ]; - description = "native matrix based on vector"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "matrices_0_5_0" = callPackage - ({ mkDerivation, base, criterion, deepseq, primitive, tasty - , tasty-hunit, tasty-quickcheck, vector - }: - mkDerivation { - pname = "matrices"; version = "0.5.0"; sha256 = "0k8x75k1vkalpmcblmfjqy7lq49nr5mznh134h3d0zqz0q5ky0gx"; libraryHaskellDepends = [ base deepseq primitive vector ]; @@ -155817,7 +153305,6 @@ self: { benchmarkHaskellDepends = [ base criterion vector ]; description = "native matrix based on vector"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "matrix" = callPackage @@ -156212,26 +153699,6 @@ self: { }) {}; "mbox-utility" = callPackage - ({ mkDerivation, base, bytestring, hsemail, non-empty, old-time - , parsec, spreadsheet, utility-ht - }: - mkDerivation { - pname = "mbox-utility"; - version = "0.0.1"; - sha256 = "1y792np4i24jlyxfsm4dw3m1bvij5wxj77dkqj2hvclm7kw0kq75"; - revision = "1"; - editedCabalFile = "0lhka293xbgsjs7sb3yrck6q7vw4dfdhpmpalc7s9az1mj4l4mjz"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base bytestring hsemail non-empty old-time parsec spreadsheet - utility-ht - ]; - description = "List contents of an mbox file containing e-mails"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "mbox-utility_0_0_3_1" = callPackage ({ mkDerivation, base, bytestring, hsemail, non-empty, parsec , spreadsheet, time, utility-ht }: @@ -156247,7 +153714,6 @@ self: { ]; description = "List contents of an mbox file containing e-mails"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mbtiles" = callPackage @@ -156291,6 +153757,8 @@ self: { ]; description = "download bugs mailboxes"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mcl" = callPackage @@ -156580,8 +154048,8 @@ self: { }: mkDerivation { pname = "med-module"; - version = "0.1.1"; - sha256 = "1qzffgcg29gjc6j0dl9ablgzad3lry28n9kv55kp5lgqm3xp92gp"; + version = "0.1.2.1"; + sha256 = "0f1yjdix89g6z2kigj08iq88jmi0x59la7764ixfha5sbjnwz0pp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -156750,6 +154218,8 @@ self: { ]; description = "Convert MediaWiki text to LaTeX"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "medium-sdk-haskell" = callPackage @@ -156791,25 +154261,6 @@ self: { }) {}; "mega-sdist" = callPackage - ({ mkDerivation, base, bytestring, conduit, conduit-extra - , http-conduit, optparse-simple, rio, rio-orphans, tar-conduit - , yaml - }: - mkDerivation { - pname = "mega-sdist"; - version = "0.3.3.2"; - sha256 = "0jhlaww753spj5k2mrzrizcb408265wglc7gycdicnashsxc7qd4"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base bytestring conduit conduit-extra http-conduit optparse-simple - rio rio-orphans tar-conduit yaml - ]; - description = "Handles uploading to Hackage from mega repos"; - license = stdenv.lib.licenses.mit; - }) {}; - - "mega-sdist_0_4_0_1" = callPackage ({ mkDerivation, base, bytestring, optparse-simple, pantry, path , path-io, rio, rio-orphans, yaml }: @@ -156826,6 +154277,7 @@ self: { description = "Handles uploading to Hackage from mega repos"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "megaparsec_6_5_0" = callPackage @@ -157043,8 +154495,6 @@ self: { ]; description = "Type-safe memory units"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "memcache" = callPackage @@ -158302,6 +155752,8 @@ self: { ]; description = "Bindings to the Microsoft Translator API"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "microspec" = callPackage @@ -158466,6 +155918,8 @@ self: { benchmarkHaskellDepends = [ base bytestring criterion ]; description = "A simple and fast library for working with MIDI messages"; license = stdenv.lib.licenses.lgpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "midi-util" = callPackage @@ -158734,25 +156188,6 @@ self: { }: mkDerivation { pname = "mime-mail"; - version = "0.4.14"; - sha256 = "0gmapbjci8nclwm8syg5xfci4nj8cpchb9ry1b7gwhcp9kaw6cln"; - revision = "1"; - editedCabalFile = "14zadyz63gjpf58h6v36w3jwwpxpg86czw19r4211wprqfclvr92"; - libraryHaskellDepends = [ - base base64-bytestring blaze-builder bytestring filepath process - random text - ]; - testHaskellDepends = [ base blaze-builder bytestring hspec text ]; - description = "Compose MIME email messages"; - license = stdenv.lib.licenses.mit; - }) {}; - - "mime-mail_0_5_0" = callPackage - ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring - , filepath, hspec, process, random, text - }: - mkDerivation { - pname = "mime-mail"; version = "0.5.0"; sha256 = "0vs302vbdf8y58nxky0m2w7cbqs4laljk969sfnbxl8zq7k3ic0h"; libraryHaskellDepends = [ @@ -158762,7 +156197,6 @@ self: { testHaskellDepends = [ base blaze-builder bytestring hspec text ]; description = "Compose MIME email messages"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mime-mail-ses" = callPackage @@ -158827,6 +156261,8 @@ self: { ]; description = "Double-ended priority queues"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "minecraft" = callPackage @@ -159026,39 +156462,6 @@ self: { }) {}; "minio-hs" = callPackage - ({ mkDerivation, aeson, base, base64-bytestring, bytestring - , case-insensitive, conduit, conduit-extra, containers, cryptonite - , cryptonite-conduit, directory, filepath, http-client - , http-conduit, http-types, ini, memory, protolude, QuickCheck - , resourcet, tasty, tasty-hunit, tasty-quickcheck, tasty-smallcheck - , temporary, text, time, transformers, unliftio, unliftio-core - , xml-conduit - }: - mkDerivation { - pname = "minio-hs"; - version = "1.2.0"; - sha256 = "14qhaiki7g09gkakl1irf0a5fnrcaj2x84vvh09g3dfsgybr851i"; - libraryHaskellDepends = [ - aeson base base64-bytestring bytestring case-insensitive conduit - conduit-extra containers cryptonite cryptonite-conduit directory - filepath http-client http-conduit http-types ini memory protolude - resourcet text time transformers unliftio unliftio-core xml-conduit - ]; - testHaskellDepends = [ - aeson base base64-bytestring bytestring case-insensitive conduit - conduit-extra containers cryptonite cryptonite-conduit directory - filepath http-client http-conduit http-types ini memory protolude - QuickCheck resourcet tasty tasty-hunit tasty-quickcheck - tasty-smallcheck temporary text time transformers unliftio - unliftio-core xml-conduit - ]; - description = "A Minio Haskell Library for Amazon S3 compatible cloud storage"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "minio-hs_1_5_0" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring , case-insensitive, conduit, conduit-extra, connection, cryptonite , cryptonite-conduit, digest, directory, exceptions, filepath @@ -159461,25 +156864,6 @@ self: { }: mkDerivation { pname = "miso"; - version = "0.21.2.0"; - sha256 = "061bjvxcs6psh8hj947p4jm9ki9ngrwvn23szvk8i3x4xd87jbfm"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring containers http-api-data http-types lucid - network-uri servant servant-lucid text transformers vector - ]; - description = "A tasty Haskell front-end framework"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "miso_1_2_0_0" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, http-api-data - , http-types, lucid, network-uri, servant, servant-lucid, text - , transformers, vector - }: - mkDerivation { - pname = "miso"; version = "1.2.0.0"; sha256 = "08yhr5hxrvgqdc32yz2j3mix7s8q5bzycld3kd4rfcy2h4h72962"; isLibrary = true; @@ -159490,7 +156874,6 @@ self: { ]; description = "A tasty Haskell front-end framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "miso-action-logger" = callPackage @@ -159506,6 +156889,20 @@ self: { broken = true; }) {}; + "miso-examples" = callPackage + ({ mkDerivation }: + mkDerivation { + pname = "miso-examples"; + version = "1.2.0.0"; + sha256 = "1wg4nli3qzq0dw9il4hqw78mpvcsbj22i2vdv2n9gafv9qsb6r68"; + isLibrary = false; + isExecutable = true; + description = "A tasty Haskell front-end framework"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "miss" = callPackage ({ mkDerivation, attoparsec, base, base16-bytestring, bytestring , ChasingBottoms, containers, cryptohash-sha1, deepseq, digest @@ -159636,23 +157033,6 @@ self: { }) {}; "mixed-types-num" = callPackage - ({ mkDerivation, base, convertible, hspec, hspec-smallcheck - , QuickCheck, smallcheck, template-haskell - }: - mkDerivation { - pname = "mixed-types-num"; - version = "0.3.1.5"; - sha256 = "0n60s5vy6l6mbc5z7di91whb3hn0qav2c98fmb7l7inxq8abzw3w"; - libraryHaskellDepends = [ - base convertible hspec hspec-smallcheck QuickCheck smallcheck - template-haskell - ]; - testHaskellDepends = [ base hspec hspec-smallcheck QuickCheck ]; - description = "Alternative Prelude with numeric and logic expressions typed bottom-up"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "mixed-types-num_0_4_0_1" = callPackage ({ mkDerivation, base, hspec, hspec-smallcheck, mtl, QuickCheck , smallcheck, template-haskell }: @@ -159667,7 +157047,6 @@ self: { testHaskellDepends = [ base hspec hspec-smallcheck QuickCheck ]; description = "Alternative Prelude with numeric and logic expressions typed bottom-up"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mixpanel-client" = callPackage @@ -159677,30 +157056,6 @@ self: { }: mkDerivation { pname = "mixpanel-client"; - version = "0.1.1"; - sha256 = "1dr7h8ss3msnabz6nisq3q4khi48b4ahmghil9sz4in4s1dvn9am"; - libraryHaskellDepends = [ - aeson base base64-bytestring bytestring http-client http-client-tls - servant servant-client string-conv text time - ]; - testHaskellDepends = [ - aeson base base64-bytestring bytestring hspec http-client - http-client-tls servant servant-client string-conv text time - ]; - testToolDepends = [ hspec-discover markdown-unlit ]; - description = "Mixpanel client"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "mixpanel-client_0_2_0" = callPackage - ({ mkDerivation, aeson, base, base64-bytestring, bytestring, hspec - , hspec-discover, http-client, http-client-tls, markdown-unlit - , servant, servant-client, string-conv, text, time - }: - mkDerivation { - pname = "mixpanel-client"; version = "0.2.0"; sha256 = "1c0lgysznql57wff90r5s6mwq7gwah0j6pw10i4wppqs6pdiiwik"; libraryHaskellDepends = [ @@ -159831,37 +157186,6 @@ self: { }: mkDerivation { pname = "mmark"; - version = "0.0.7.0"; - sha256 = "0g7mx3xvvj8vgcids231zlz9kp7z3zjrq4xfhdm0wk0v1k51dflx"; - revision = "2"; - editedCabalFile = "06hr9p2lqyh4zx38i601yd24acbl08p69l0pwh8266qvfripcsm9"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson base case-insensitive containers deepseq dlist email-validate - foldl hashable html-entity-map lucid megaparsec microlens - microlens-th modern-uri mtl parser-combinators text text-metrics - unordered-containers yaml - ]; - testHaskellDepends = [ - aeson base foldl hspec hspec-megaparsec lucid megaparsec modern-uri - QuickCheck text - ]; - benchmarkHaskellDepends = [ base criterion text weigh ]; - description = "Strict markdown processor for writers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "mmark_0_0_7_1" = callPackage - ({ mkDerivation, aeson, base, case-insensitive, containers - , criterion, deepseq, dlist, email-validate, foldl, hashable, hspec - , hspec-megaparsec, html-entity-map, lucid, megaparsec, microlens - , microlens-th, modern-uri, mtl, parser-combinators, QuickCheck - , text, text-metrics, unordered-containers, weigh, yaml - }: - mkDerivation { - pname = "mmark"; version = "0.0.7.1"; sha256 = "0apc582ck0g5ih0rpcljsfvss646ng62bjm37nj5z6k48symh16n"; enableSeparateDataOutput = true; @@ -159878,8 +157202,6 @@ self: { benchmarkHaskellDepends = [ base criterion text weigh ]; description = "Strict markdown processor for writers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "mmark-cli" = callPackage @@ -159903,8 +157225,6 @@ self: { ]; description = "Command line interface to the MMark markdown processor"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "mmark-ext" = callPackage @@ -159927,8 +157247,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Commonly useful extensions for the MMark markdown processor"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "mmorph" = callPackage @@ -160119,10 +157437,8 @@ self: { }: mkDerivation { pname = "modern-uri"; - version = "0.3.0.1"; - sha256 = "01a5jnv8kbl2c9ka9dgqm4a8b7n6frmg7yi8f417qcnwgn1lbs78"; - revision = "1"; - editedCabalFile = "13q0lapxk1v3ci3bqv21942jf2fw87frbbam53apd3i2iv69bqyr"; + version = "0.3.1.0"; + sha256 = "1pi7la2rrpfa9qszz7zm4dd7dihakm4kjrhjzvxpbp4n34ihl8h5"; libraryHaskellDepends = [ base bytestring containers contravariant deepseq exceptions megaparsec mtl profunctors QuickCheck reflection tagged @@ -160242,15 +157558,15 @@ self: { }) {}; "modularity" = callPackage - ({ mkDerivation, base, eigen, hmatrix, sparse-linear-algebra + ({ mkDerivation, base, hmatrix, sparse-linear-algebra , spectral-clustering, vector }: mkDerivation { pname = "modularity"; - version = "0.2.1.0"; - sha256 = "1xs9hdxsdpylhq3dzmyxfycwyqzy3v1zz48gvzpfcamfivxxpdph"; + version = "0.2.1.1"; + sha256 = "0s7n6z48wi2cc51i9aj8c35p02jsj2g1z1lbrsa0gpk684wzg8nq"; libraryHaskellDepends = [ - base eigen hmatrix sparse-linear-algebra spectral-clustering vector + base hmatrix sparse-linear-algebra spectral-clustering vector ]; description = "Find the modularity of a network"; license = stdenv.lib.licenses.gpl3; @@ -160534,8 +157850,6 @@ self: { ]; description = "These as a transformer, ChronicleT"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "monad-classes" = callPackage @@ -161550,10 +158864,8 @@ self: { }: mkDerivation { pname = "monad-validate"; - version = "1.0.0.0"; - sha256 = "0d2r54jhy5zkjph57f85syw6g0fmvj3csas8ki2hg7lfiqj6yq4q"; - revision = "1"; - editedCabalFile = "0zdxr266655w77zgzfqiw2aij64rhlys310c38myq1g6vgcxlbc2"; + version = "1.2.0.0"; + sha256 = "1wqiifcwm24mfshlh0xaq9b4blpsccqxglwgjqmg4jqbav3143zm"; libraryHaskellDepends = [ base exceptions monad-control mtl transformers transformers-base ]; @@ -161950,36 +159262,6 @@ self: { }: mkDerivation { pname = "mongoDB"; - version = "2.4.0.1"; - sha256 = "0wadf91vymy1wzf1xq9k5ackj5fc7220fgg6h42y4qpmg1xzbpip"; - libraryHaskellDepends = [ - array base base16-bytestring base64-bytestring binary bson - bytestring conduit conduit-extra containers cryptohash - data-default-class hashtables lifted-base monad-control mtl network - nonce parsec pureMD5 random random-shuffle resourcet stm tagged - text time tls transformers transformers-base - ]; - testHaskellDepends = [ base hspec mtl old-locale text time ]; - benchmarkHaskellDepends = [ - array base base16-bytestring base64-bytestring binary bson - bytestring containers criterion cryptohash data-default-class - hashtables lifted-base monad-control mtl network nonce parsec - random random-shuffle stm text transformers-base - ]; - description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "mongoDB_2_5_0_0" = callPackage - ({ mkDerivation, array, base, base16-bytestring, base64-bytestring - , binary, bson, bytestring, conduit, conduit-extra, containers - , criterion, cryptohash, data-default-class, hashtables, hspec - , lifted-base, monad-control, mtl, network, nonce, old-locale - , parsec, pureMD5, random, random-shuffle, resourcet, stm, tagged - , text, time, tls, transformers, transformers-base - }: - mkDerivation { - pname = "mongoDB"; version = "2.5.0.0"; sha256 = "15zlh2ws9vs2d5rp1g299b4lrpj6a4gcdm1zqiig452w7m1bsyzd"; libraryHaskellDepends = [ @@ -161998,7 +159280,6 @@ self: { ]; description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mongodb-queue" = callPackage @@ -162119,6 +159400,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "mono-traversable_1_0_12_0" = callPackage + ({ mkDerivation, base, bytestring, containers, foldl, gauge + , hashable, hspec, HUnit, mwc-random, QuickCheck, semigroups, split + , text, transformers, unordered-containers, vector + , vector-algorithms + }: + mkDerivation { + pname = "mono-traversable"; + version = "1.0.12.0"; + sha256 = "1h586myaayxg73lc1fx18axlq2bw761fypyy7mii1h0h75d8fyry"; + libraryHaskellDepends = [ + base bytestring containers hashable split text transformers + unordered-containers vector vector-algorithms + ]; + testHaskellDepends = [ + base bytestring containers foldl hspec HUnit QuickCheck semigroups + text transformers unordered-containers vector + ]; + benchmarkHaskellDepends = [ base gauge mwc-random vector ]; + description = "Type classes for mapping, folding, and traversing monomorphic containers"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mono-traversable-instances" = callPackage ({ mkDerivation, base, comonad, containers, dlist, dlist-instances , mono-traversable, semigroupoids, semigroups, transformers @@ -162295,17 +159600,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "monoidal-containers_0_5_0_0" = callPackage + "monoidal-containers_0_5_0_1" = callPackage ({ mkDerivation, aeson, base, containers, deepseq, hashable, lens - , newtype, semigroups, these, unordered-containers + , newtype, semialign, semigroups, these, unordered-containers }: mkDerivation { pname = "monoidal-containers"; - version = "0.5.0.0"; - sha256 = "0dayylvsn6mcgyis04nl4384sg8vr4mrnvf1wvfhb5pip3v7hl7a"; + version = "0.5.0.1"; + sha256 = "1d7a4kkwv86f69zv5g6wxq9bkxq3bxarb26rr5q9gxkyx9m5rwd3"; libraryHaskellDepends = [ - aeson base containers deepseq hashable lens newtype semigroups - these unordered-containers + aeson base containers deepseq hashable lens newtype semialign + semigroups these unordered-containers ]; description = "Containers with monoidal accumulation"; license = stdenv.lib.licenses.bsd3; @@ -162829,8 +160134,6 @@ self: { ]; description = "Haskell client for Moss"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "moto" = callPackage @@ -163359,6 +160662,8 @@ self: { ]; description = "A Haskell implementation of MessagePack"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "msgpack-aeson" = callPackage @@ -163377,6 +160682,8 @@ self: { testHaskellDepends = [ aeson base msgpack tasty tasty-hunit ]; description = "Aeson adapter for MessagePack"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "msgpack-idl" = callPackage @@ -163459,17 +160766,19 @@ self: { "mssql-simple" = callPackage ({ mkDerivation, base, binary, bytestring, hostname, ms-tds - , network, text, time, tls + , network, template-haskell, text, time, tls }: mkDerivation { pname = "mssql-simple"; - version = "0.3.0.0"; - sha256 = "0wssw1d3ki95b83ww6brx8apk7s86vnzgwlh91xvfdp8hkqygx1q"; + version = "0.4.0.2"; + sha256 = "0pa1q404xlq23ywdwkx9w1v8dn2nznkpng9ijwixkcd520bnx043"; libraryHaskellDepends = [ - base binary bytestring hostname ms-tds network text time tls + base binary bytestring hostname ms-tds network template-haskell + text time tls ]; testHaskellDepends = [ - base binary bytestring hostname ms-tds network text time tls + base binary bytestring hostname ms-tds network template-haskell + text time tls ]; description = "SQL Server client library implemented in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -165155,25 +162464,11 @@ self: { ({ mkDerivation, base, mwc-random, primitive, transformers }: mkDerivation { pname = "mwc-probability"; - version = "2.0.4"; - sha256 = "0msi72qp5aps3n4ji565r4rzyjg7svwilsh8lch59y2b4q7fvscz"; - revision = "1"; - editedCabalFile = "1b4wbxkxx0szjgzgn5jc1qap80zx6ispxrd51yxs4z7llv15w5k6"; - libraryHaskellDepends = [ base mwc-random primitive transformers ]; - description = "Sampling function-based probability distributions"; - license = stdenv.lib.licenses.mit; - }) {}; - - "mwc-probability_2_1_0" = callPackage - ({ mkDerivation, base, mwc-random, primitive, transformers }: - mkDerivation { - pname = "mwc-probability"; version = "2.1.0"; sha256 = "0ac4pr2l0p48a0n6jym445c8h7n2nf1pqkhrz6cd1rjbmrk5mbm3"; libraryHaskellDepends = [ base mwc-random primitive transformers ]; description = "Sampling function-based probability distributions"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mwc-probability-transition" = callPackage @@ -165947,27 +163242,12 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "named"; - version = "0.2.0.0"; - sha256 = "17ldvxypf099wj5phzh2aymzfwmyiyzhz24h1aj2s21nrys5n6n0"; - revision = "2"; - editedCabalFile = "0h9d74h6g685g1g0ylqf7kws1ancdy3q6fi39vinf5alkqa7kxwd"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base ]; - description = "Named parameters (keyword arguments) for Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "named_0_3_0_0" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "named"; version = "0.3.0.0"; sha256 = "03pg2xdx86c7ns8p04gn8l4nwpjx538545f0fjq0j3mlhn09qrh7"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Named parameters (keyword arguments) for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "named-formlet" = callPackage @@ -166462,6 +163742,8 @@ self: { ]; description = "Haskell API for NATS messaging system"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "natural" = callPackage @@ -167072,6 +164354,8 @@ self: { ]; description = "An MQTT Protocol Implementation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "net-spider" = callPackage @@ -167094,6 +164378,8 @@ self: { ]; description = "A graph database middleware to maintain a time-varying graph"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "net-spider-cli" = callPackage @@ -167114,6 +164400,8 @@ self: { ]; description = "CLI option parsers for NetSpider objects"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "net-spider-pangraph" = callPackage @@ -167743,6 +165031,8 @@ self: { ]; description = "Toolkit for building http client libraries over Network.Http.Conduit"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "network-arbitrary" = callPackage @@ -167764,6 +165054,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Arbitrary Instances for Network Types"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "network-attoparsec" = callPackage @@ -167820,8 +165112,6 @@ self: { doHaddock = false; description = "Network.BSD"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "network-bsd_2_8_1_0" = callPackage @@ -167836,7 +165126,6 @@ self: { description = "POSIX network database (<netdb.h>) API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "network-builder" = callPackage @@ -167866,25 +165155,12 @@ self: { ({ mkDerivation, base, bytestring, doctest }: mkDerivation { pname = "network-byte-order"; - version = "0.0.0.0"; - sha256 = "0wfy57ip87ksppggpz26grk4w144yld95mf2y0c6mhcs1l8z3div"; - libraryHaskellDepends = [ base bytestring ]; - testHaskellDepends = [ base bytestring doctest ]; - description = "Network byte order utilities"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "network-byte-order_0_1_1_0" = callPackage - ({ mkDerivation, base, bytestring, doctest }: - mkDerivation { - pname = "network-byte-order"; version = "0.1.1.0"; sha256 = "16prqgaqxn1h56gw9r446cq5a4jyaiplg50pjy1ji4k7cvcpx5vk"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base bytestring doctest ]; description = "Network byte order utilities"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-bytestring" = callPackage @@ -168225,19 +165501,6 @@ self: { }) {}; "network-multicast" = callPackage - ({ mkDerivation, base, network }: - mkDerivation { - pname = "network-multicast"; - version = "0.2.0"; - sha256 = "1wkmx5gic0zqghxxdyyrcysfaj1aknj53v50qq6c40d4qfmm0fqg"; - revision = "2"; - editedCabalFile = "1hha4vvyrx29d2lwwjl0bfpbaj00k85bd4w83s4hvawqbxqvvhkw"; - libraryHaskellDepends = [ base network ]; - description = "Simple multicast library"; - license = stdenv.lib.licenses.publicDomain; - }) {}; - - "network-multicast_0_3_2" = callPackage ({ mkDerivation, base, network, network-bsd }: mkDerivation { pname = "network-multicast"; @@ -168246,7 +165509,6 @@ self: { libraryHaskellDepends = [ base network network-bsd ]; description = "Simple multicast library"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-netpacket" = callPackage @@ -168324,8 +165586,8 @@ self: { ({ mkDerivation, base, network }: mkDerivation { pname = "network-run"; - version = "0.0.1"; - sha256 = "1yc5hpcadab1dzvi9wz6v25v7wp5j07a36wdabrxi1pwy4gania5"; + version = "0.1.0"; + sha256 = "16n7d0vgzcp6qq3y2vs1wjlj81xdi3a1kyk9qncmj3h7djav3r5b"; libraryHaskellDepends = [ base network ]; description = "Simple network runner library"; license = stdenv.lib.licenses.bsd3; @@ -168380,8 +165642,6 @@ self: { ]; description = "Simple network sockets usage patterns"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "network-simple-sockaddr" = callPackage @@ -168416,8 +165676,6 @@ self: { ]; description = "Simple interface to TLS secured network sockets"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "network-simple-ws" = callPackage @@ -168434,8 +165692,6 @@ self: { ]; description = "Simple interface to WebSockets"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "network-simple-wss" = callPackage @@ -168452,8 +165708,6 @@ self: { ]; description = "Simple interface to TLS secured WebSockets"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "network-socket-options" = callPackage @@ -168697,6 +165951,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "FromJSON and ToJSON Instances for Network.URI"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "network-uri-lenses" = callPackage @@ -169633,8 +166889,6 @@ self: { ]; description = "Tool for semi-automatic updating of nixpkgs repository"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "nkjp" = callPackage @@ -169757,6 +167011,8 @@ self: { testHaskellDepends = [ base tasty tasty-hspec tasty-quickcheck ]; description = "A tiny neural network"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "nntp" = callPackage @@ -170159,8 +167415,8 @@ self: { }: mkDerivation { pname = "nonempty-containers"; - version = "0.1.1.0"; - sha256 = "1vhpanz5n7fljc86kxif9kp9fr75wr87wy1fmawd7c5qmhk1b61k"; + version = "0.3.1.0"; + sha256 = "15flyfv6w4078wk69d2nb2lx21b76xr6c34rxs0w8jz1mb497f6l"; libraryHaskellDepends = [ base comonad containers deepseq semigroupoids these ]; @@ -170170,26 +167426,19 @@ self: { ]; description = "Non-empty variants of containers data types, with full API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; - "nonempty-containers_0_3_1_0" = callPackage - ({ mkDerivation, base, comonad, containers, deepseq, hedgehog - , hedgehog-fn, semigroupoids, tasty, tasty-hedgehog, text, these + "nonempty-lift" = callPackage + ({ mkDerivation, base, comonad, hedgehog, hedgehog-classes + , semigroupoids }: mkDerivation { - pname = "nonempty-containers"; - version = "0.3.1.0"; - sha256 = "15flyfv6w4078wk69d2nb2lx21b76xr6c34rxs0w8jz1mb497f6l"; - libraryHaskellDepends = [ - base comonad containers deepseq semigroupoids these - ]; - testHaskellDepends = [ - base comonad containers hedgehog hedgehog-fn semigroupoids tasty - tasty-hedgehog text these - ]; - description = "Non-empty variants of containers data types, with full API"; + pname = "nonempty-lift"; + version = "0.1"; + sha256 = "0zz6kh0ihbpjsigs2ssqcif6i85y9ykpx739yzpqz0drqn4013g8"; + libraryHaskellDepends = [ base comonad semigroupoids ]; + testHaskellDepends = [ base hedgehog hedgehog-classes ]; + description = "nonempty structure"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -170417,8 +167666,6 @@ self: { transformers tuple ]; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "notmuch" = callPackage @@ -170827,6 +168074,8 @@ self: { pname = "numbered-semigroups"; version = "0.1.0.0"; sha256 = "100r6k3cwycl75mj9g1x4w4qv064v8bdaan5rsj2vnvx4w1jrhp2"; + revision = "2"; + editedCabalFile = "04wkhb2r275nax8wh00w6c4pxfaky190g2bsviw39jyi7wr2f33c"; libraryHaskellDepends = [ base call-stack semigroups ]; description = "A sequence of semigroups, for composing stuff in multiple spatial directions"; license = stdenv.lib.licenses.lgpl3; @@ -171771,6 +169020,8 @@ self: { testToolDepends = [ tasty-discover ]; description = "An implementation of the Oblivious Transfer protocol in Haskell"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "observable" = callPackage @@ -172142,8 +169393,8 @@ self: { }: mkDerivation { pname = "oidc-client"; - version = "0.4.0.0"; - sha256 = "15lnxxmnpmkvz9zqgz8sq5lzjxvgc5x8a6hrizj3m0mzg9cvml0b"; + version = "0.4.0.1"; + sha256 = "0761m8yi8yrqspf9hig6pbdzchz8nvc9qn995wz4v0wklcypiagr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -172817,6 +170068,8 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Open type representations and dynamic types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "open-union" = callPackage @@ -173277,6 +170530,8 @@ self: { testHaskellDepends = [ base cereal hedgehog time ]; description = "Haskell implementation of openssh protocol primitives"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "openssl-createkey" = callPackage @@ -173669,36 +170924,6 @@ self: { "opml-conduit" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, conduit , conduit-combinators, containers, data-default, lens-simple - , mono-traversable, monoid-subclasses, mtl, parsers, QuickCheck - , quickcheck-instances, resourcet, safe-exceptions, semigroups - , tasty, tasty-hunit, tasty-quickcheck, text, time, timerep - , uri-bytestring, xml-conduit, xml-types - }: - mkDerivation { - pname = "opml-conduit"; - version = "0.6.0.4"; - sha256 = "07axacfa0wik2cnpzcnjjp9w6ws8sjhinzxdc4vrxdxaj1v5a2s8"; - revision = "1"; - editedCabalFile = "160sazqsrmm2755642c5y5i38miiglqb66cy5k0hy4k2jkdmjfbi"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base case-insensitive conduit conduit-combinators containers - lens-simple mono-traversable monoid-subclasses safe-exceptions - semigroups text time timerep uri-bytestring xml-conduit xml-types - ]; - testHaskellDepends = [ - base bytestring conduit conduit-combinators containers data-default - lens-simple mono-traversable mtl parsers QuickCheck - quickcheck-instances resourcet semigroups tasty tasty-hunit - tasty-quickcheck text time uri-bytestring xml-conduit - ]; - description = "Streaming parser/renderer for the OPML 2.0 format."; - license = stdenv.lib.licenses.publicDomain; - }) {}; - - "opml-conduit_0_7_0_0" = callPackage - ({ mkDerivation, base, bytestring, case-insensitive, conduit - , conduit-combinators, containers, data-default, lens-simple , monoid-subclasses, mtl, parsers, QuickCheck, quickcheck-instances , refined, resourcet, safe-exceptions, semigroups, tasty , tasty-hunit, tasty-quickcheck, text, time, timerep @@ -173723,6 +170948,7 @@ self: { description = "Streaming parser/renderer for the OPML 2.0 format."; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "opn" = callPackage @@ -173741,6 +170967,8 @@ self: { ]; description = "Open files or URLs using associated programs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "optima" = callPackage @@ -173971,8 +171199,6 @@ self: { ]; description = "An enum-text based toolkit for optparse-applicative"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "optparse-generic" = callPackage @@ -174950,6 +172176,8 @@ self: { ]; description = "MessagePack Serialization an Deserialization for Packer"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "packman" = callPackage @@ -175052,6 +172280,8 @@ self: { ]; description = "PADS data description language for Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pagarme" = callPackage @@ -175163,32 +172393,6 @@ self: { }) {}; "pairing" = callPackage - ({ mkDerivation, base, bytestring, criterion, cryptonite, memory - , protolude, QuickCheck, random, tasty, tasty-discover, tasty-hunit - , tasty-quickcheck, wl-pprint-text - }: - mkDerivation { - pname = "pairing"; - version = "0.1.4"; - sha256 = "13g1waqb32by4qlrl2hy3mgrr3lmfwkixy0745xv33vvw8wmm36c"; - libraryHaskellDepends = [ - base bytestring cryptonite memory protolude QuickCheck random - wl-pprint-text - ]; - testHaskellDepends = [ - base bytestring cryptonite memory protolude QuickCheck random tasty - tasty-discover tasty-hunit tasty-quickcheck wl-pprint-text - ]; - testToolDepends = [ tasty-discover ]; - benchmarkHaskellDepends = [ - base bytestring criterion cryptonite memory protolude QuickCheck - random tasty tasty-hunit tasty-quickcheck wl-pprint-text - ]; - description = "Optimal ate pairing over Barreto-Naehrig curves"; - license = stdenv.lib.licenses.mit; - }) {}; - - "pairing_0_4_1" = callPackage ({ mkDerivation, arithmoi, base, binary, bytestring, criterion , errors, galois-field, hexstring, integer-logarithms, memory , MonadRandom, protolude, QuickCheck, quickcheck-instances, random @@ -175220,6 +172424,37 @@ self: { description = "Bilinear pairings"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "pairing_0_5_0" = callPackage + ({ mkDerivation, base, bytestring, criterion, elliptic-curve + , errors, galois-field, MonadRandom, protolude, QuickCheck + , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck + , wl-pprint-text + }: + mkDerivation { + pname = "pairing"; + version = "0.5.0"; + sha256 = "0qnwkkfzd1jiqg4b989knvzzf05aljqjfqv1z35nl2ms46sqdv1b"; + libraryHaskellDepends = [ + base bytestring elliptic-curve errors galois-field MonadRandom + protolude QuickCheck wl-pprint-text + ]; + testHaskellDepends = [ + base bytestring elliptic-curve errors galois-field MonadRandom + protolude QuickCheck quickcheck-instances tasty tasty-hunit + tasty-quickcheck wl-pprint-text + ]; + benchmarkHaskellDepends = [ + base bytestring criterion elliptic-curve errors galois-field + MonadRandom protolude QuickCheck quickcheck-instances tasty + tasty-hunit tasty-quickcheck wl-pprint-text + ]; + description = "Bilinear pairings"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "palette" = callPackage @@ -175287,60 +172522,6 @@ self: { }) {}; "pandoc" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring - , binary, blaze-html, blaze-markup, bytestring, Cabal - , case-insensitive, cmark-gfm, containers, criterion, data-default - , deepseq, Diff, directory, doctemplates, exceptions - , executable-path, filepath, Glob, haddock-library, hslua - , hslua-module-text, HsYAML, HTTP, http-client, http-client-tls - , http-types, JuicyPixels, mtl, network, network-uri, pandoc-types - , parsec, process, QuickCheck, random, safe, SHA, skylighting - , split, syb, tagsoup, tasty, tasty-golden, tasty-hunit - , tasty-quickcheck, temporary, texmath, text, time - , unicode-transforms, unix, unordered-containers, vector, weigh - , xml, zip-archive, zlib - }: - mkDerivation { - pname = "pandoc"; - version = "2.5"; - sha256 = "0bi26r2qljdfxq26gaxj1xnhrawrfndfavs3f3g098x0g3dwazfm"; - revision = "2"; - editedCabalFile = "1z44hcwqqmkmhfak7svrrf950amf008gzhnlxkhwdyjpnpqp21sm"; - configureFlags = [ "-fhttps" "-f-trypandoc" ]; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - setupHaskellDepends = [ base Cabal ]; - libraryHaskellDepends = [ - aeson aeson-pretty base base64-bytestring binary blaze-html - blaze-markup bytestring case-insensitive cmark-gfm containers - data-default deepseq directory doctemplates exceptions filepath - Glob haddock-library hslua hslua-module-text HsYAML HTTP - http-client http-client-tls http-types JuicyPixels mtl network - network-uri pandoc-types parsec process random safe SHA skylighting - split syb tagsoup temporary texmath text time unicode-transforms - unix unordered-containers vector xml zip-archive zlib - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base base64-bytestring bytestring containers Diff directory - executable-path filepath Glob hslua pandoc-types process QuickCheck - tasty tasty-golden tasty-hunit tasty-quickcheck temporary text time - xml zip-archive - ]; - benchmarkHaskellDepends = [ - base bytestring containers criterion mtl text time weigh - ]; - postInstall = '' - mkdir -p $out/share - mv $data/*/*/man $out/share/ - ''; - description = "Conversion between markup formats"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ peti ]; - }) {}; - - "pandoc_2_7_3" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base , base64-bytestring, binary, blaze-html, blaze-markup, bytestring , case-insensitive, cmark-gfm, containers, criterion, data-default @@ -175389,47 +172570,12 @@ self: { ''; description = "Conversion between markup formats"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; "pandoc-citeproc" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring , Cabal, containers, data-default, directory, filepath, hs-bibutils - , mtl, old-locale, pandoc, pandoc-types, parsec, process, rfc5051 - , setenv, split, syb, tagsoup, temporary, text, time - , unordered-containers, vector, xml-conduit, yaml - }: - mkDerivation { - pname = "pandoc-citeproc"; - version = "0.15.0.1"; - sha256 = "1y4jmralmcikmk75cf5bjlv4ymr42x35a6174ybqa99jmlm5znr9"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - setupHaskellDepends = [ base Cabal ]; - libraryHaskellDepends = [ - aeson base bytestring containers data-default directory filepath - hs-bibutils mtl old-locale pandoc pandoc-types parsec rfc5051 - setenv split syb tagsoup text time unordered-containers vector - xml-conduit yaml - ]; - executableHaskellDepends = [ - aeson aeson-pretty attoparsec base bytestring filepath pandoc - pandoc-types syb text yaml - ]; - testHaskellDepends = [ - aeson base bytestring containers directory filepath mtl pandoc - pandoc-types process temporary text yaml - ]; - doCheck = false; - description = "Supports using pandoc with citeproc"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pandoc-citeproc_0_16_2" = callPackage - ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring - , Cabal, containers, data-default, directory, filepath, hs-bibutils , libyaml, mtl, network, old-locale, pandoc, pandoc-types, parsec , process, rfc5051, safe, setenv, split, syb, tagsoup, temporary , text, time, unordered-containers, vector, xml-conduit, yaml @@ -175461,7 +172607,6 @@ self: { doCheck = false; description = "Supports using pandoc with citeproc"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pandoc-citeproc-preamble" = callPackage @@ -175554,6 +172699,8 @@ self: { testToolDepends = [ tasty-discover ]; description = "A Pandoc filter for emphasizing code in fenced blocks"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pandoc-filter-graphviz" = callPackage @@ -175635,6 +172782,8 @@ self: { ]; description = "A Pandoc filter for including code from source files"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pandoc-japanese-filters" = callPackage @@ -175694,6 +172843,8 @@ self: { ]; description = "Pandoc-filter to evaluate `code` section in markdown and auto-embed output"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pandoc-placetable" = callPackage @@ -175740,25 +172891,6 @@ self: { }) {}; "pandoc-pyplot" = callPackage - ({ mkDerivation, base, containers, directory, filepath - , pandoc-types, temporary, typed-process - }: - mkDerivation { - pname = "pandoc-pyplot"; - version = "1.0.3.0"; - sha256 = "0nzpww21j79s1ww2q26856m6zq325pz32jjd4hanki7ch0ni2kg2"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers directory filepath pandoc-types temporary - typed-process - ]; - executableHaskellDepends = [ base pandoc-types ]; - description = "A Pandoc filter for including figures generated from Matplotlib"; - license = stdenv.lib.licenses.mit; - }) {}; - - "pandoc-pyplot_2_1_4_0" = callPackage ({ mkDerivation, base, containers, data-default-class, deepseq , directory, filepath, hashable, hspec, hspec-expectations , open-browser, optparse-applicative, pandoc, pandoc-types, tasty @@ -175767,8 +172899,8 @@ self: { }: mkDerivation { pname = "pandoc-pyplot"; - version = "2.1.4.0"; - sha256 = "1mfyb8gyyc7dsg0n3l8kp8f7wx9ag0imn88xpibic5x6ff1g75br"; + version = "2.1.5.1"; + sha256 = "100mn7q5nz7xvhbnhjsfmcf9n6x1gjl71akrnc5j8k2j57bk1kkf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -175787,6 +172919,7 @@ self: { description = "A Pandoc filter to include figures generated from Python code blocks"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pandoc-sidenote" = callPackage @@ -176082,8 +173215,6 @@ self: { ]; description = "Content addressable Haskell package management"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "pantry-tmp" = callPackage @@ -176737,6 +173868,8 @@ self: { ]; description = "Classes and data structures for working with data-kind indexed types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "paramtree" = callPackage @@ -176747,14 +173880,14 @@ self: { pname = "paramtree"; version = "0.1.1.1"; sha256 = "0ls9wzmz5lk7gyl8lx9cjs49zpwhrv955fs5q6ypv7bpbvjbchs1"; + revision = "1"; + editedCabalFile = "0p7zb0xvx88i72garnlihp2q1x5lpsr73jp2qh8lgasy12gy7g0q"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base bytestring tasty tasty-golden tasty-hunit temporary ]; description = "Generate labelled test/benchmark trees from sets of parameters"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "paranoia" = callPackage @@ -176964,16 +174097,14 @@ self: { broken = true; }) {}; - "parsec_3_1_13_0" = callPackage + "parsec_3_1_14_0" = callPackage ({ mkDerivation, base, bytestring, HUnit, mtl, test-framework , test-framework-hunit, text }: mkDerivation { pname = "parsec"; - version = "3.1.13.0"; - sha256 = "1wc09pyn70p8z6llink10c8pqbh6ikyk554911yfwxv1g91swqbq"; - revision = "2"; - editedCabalFile = "032sizm03m2vdqshkv4sdviyka05gqf8gs6r4hqf9did177i0qnm"; + version = "3.1.14.0"; + sha256 = "132waj2cpn892midbhpkfmb74qq83v0zv29v885frlp1gvh94b67"; libraryHaskellDepends = [ base bytestring mtl text ]; testHaskellDepends = [ base HUnit mtl test-framework test-framework-hunit @@ -177224,8 +174355,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "parser-combinators"; - version = "1.0.3"; - sha256 = "0cqic88xwi60x5x6pli0r8401yljvg2cis8a67766zypfg0il3bp"; + version = "1.1.0"; + sha256 = "149yhbnrrl108h1jinrsxni3rwrldhphpk9bbmbpr90q5fbl4xmc"; libraryHaskellDepends = [ base ]; description = "Lightweight package providing commonly useful parser combinators"; license = stdenv.lib.licenses.bsd3; @@ -177250,6 +174381,30 @@ self: { }: mkDerivation { pname = "parser-combinators-tests"; + version = "1.1.0"; + sha256 = "0m3xgdi1q3q638zfvgpdqyrhfq9abqwjripvbdx5z9rai4whzqmz"; + revision = "1"; + editedCabalFile = "0adgbzpylvk9p7ylxynsdrmqhhbh5pm8ww1s3nz3czl79y8lhh47"; + isLibrary = false; + isExecutable = false; + testHaskellDepends = [ + base hspec hspec-expectations hspec-megaparsec megaparsec + megaparsec-tests parser-combinators QuickCheck + ]; + testToolDepends = [ hspec-discover ]; + description = "Test suite of parser-combinators"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "parser-combinators-tests_1_2_0" = callPackage + ({ mkDerivation, base, hspec, hspec-discover, hspec-expectations + , hspec-megaparsec, megaparsec, megaparsec-tests + , parser-combinators, QuickCheck + }: + mkDerivation { + pname = "parser-combinators-tests"; version = "1.2.0"; sha256 = "0ainpyrxm03brn6z27jkqp65rc1z3lza00k6mg10506qk83fa52l"; isLibrary = false; @@ -177767,8 +174922,8 @@ self: { }: mkDerivation { pname = "patat"; - version = "0.8.2.3"; - sha256 = "0fkrm5zq2978qaqkxwibqj5dlmrrkpnlqv97ff436bf6ad5vpfw8"; + version = "0.8.2.5"; + sha256 = "1hss18gb71xrjgncjr4g5935k7kcwxpxxb6j52i32ans43xavhiv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -178890,6 +176045,8 @@ self: { ]; description = "Package to solve the Generalized Pell Equation"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pem" = callPackage @@ -179255,6 +176412,8 @@ self: { ]; description = "Library for performing vector shuffles"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "perfecthash" = callPackage @@ -179546,7 +176705,7 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; - "persistent_2_10_0" = callPackage + "persistent_2_10_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , blaze-html, bytestring, conduit, containers, fast-logger, hspec , http-api-data, monad-logger, mtl, path-pieces, resource-pool @@ -179555,8 +176714,8 @@ self: { }: mkDerivation { pname = "persistent"; - version = "2.10.0"; - sha256 = "1ja34gdwf72rxnz3v5d9wjri11285fpzxn8sh9ws7ldrx3kfqy1g"; + version = "2.10.1"; + sha256 = "1wwka7pxyym12hcvf45qr15n3ig9zyz5y2wl30vgcvwnhawmrsbg"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-html bytestring conduit containers fast-logger http-api-data monad-logger mtl @@ -179807,7 +176966,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "persistent-mysql_2_10_0" = callPackage + "persistent-mysql_2_10_1" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit , containers, fast-logger, hspec, HUnit, monad-logger, mysql , mysql-simple, persistent, persistent-qq, persistent-template @@ -179816,8 +176975,8 @@ self: { }: mkDerivation { pname = "persistent-mysql"; - version = "2.10.0"; - sha256 = "13y65l0vaiczxndah2djh28j4jhslymb53gnfz3av24kg5vb2y4n"; + version = "2.10.1"; + sha256 = "0a75zqfhcd8xigcifi4ksdn5xwyq5qnif1r3yvnkhp5f3vjzm9vj"; libraryHaskellDepends = [ aeson base blaze-builder bytestring conduit containers monad-logger mysql mysql-simple persistent resource-pool resourcet text @@ -180072,8 +177231,6 @@ self: { ]; description = "relational-record on persisten backends"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "persistent-spatial" = callPackage @@ -180196,10 +177353,10 @@ self: { }: mkDerivation { pname = "persistent-template"; - version = "2.5.4"; - sha256 = "008afcy7zbw7bzp9jww8gdldb51kfm0fg4p0x4xcp61gx4679bjc"; - revision = "4"; - editedCabalFile = "08yb4kcmpqmm50lwrbmavd0zhgg6p7bl8dy026xw644cazrzcvr1"; + version = "2.6.0"; + sha256 = "0wr1z2nfrl6jv1lprxb0d2jw4izqfcbcwvkdrhryzg95gjz8ryjv"; + revision = "1"; + editedCabalFile = "1p7j3lz0jrczrl25bw7cg0vskhxki065x8r6913sh8l1kvrdbkk8"; libraryHaskellDepends = [ aeson aeson-compat base bytestring containers ghc-prim http-api-data monad-control monad-logger path-pieces persistent @@ -180296,6 +177453,32 @@ self: { }: mkDerivation { pname = "persistent-typed-db"; + version = "0.0.1.1"; + sha256 = "0cn9dyv5gzkjn9jbv2srw94akz1rpgxsvn1hv1ik90a8sl3drh9n"; + revision = "1"; + editedCabalFile = "106dkixvzg2zia8hzxsw5fb458v7bka69szlnfxnffa5sdbm8him"; + libraryHaskellDepends = [ + aeson base bytestring conduit http-api-data monad-logger + path-pieces persistent persistent-template resource-pool resourcet + template-haskell text transformers + ]; + testHaskellDepends = [ + aeson base bytestring conduit esqueleto hspec http-api-data + monad-logger path-pieces persistent persistent-template + resource-pool resourcet template-haskell text transformers + ]; + description = "Type safe access to multiple database schemata"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "persistent-typed-db_0_1_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, conduit, esqueleto, hspec + , http-api-data, monad-logger, path-pieces, persistent + , persistent-template, resource-pool, resourcet, template-haskell + , text, transformers + }: + mkDerivation { + pname = "persistent-typed-db"; version = "0.1.0.0"; sha256 = "0wlz2d6v4ks376amp26fxw5wj381kqaghp25mry073krc7yqz6yv"; libraryHaskellDepends = [ @@ -180311,7 +177494,6 @@ self: { description = "Type safe access to multiple database schemata"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "persistent-vector" = callPackage @@ -181401,6 +178583,8 @@ self: { ]; description = "Back up the notes you've saved to Pinboard"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pinch" = callPackage @@ -181594,6 +178778,8 @@ self: { testToolDepends = [ tasty-discover ]; description = "Conduit with a smaller core"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pipeline" = callPackage @@ -181614,29 +178800,6 @@ self: { }: mkDerivation { pname = "pipes"; - version = "4.3.10"; - sha256 = "1vhq8z3518y6xl0nzgdxmcd44ax40c8fghlccwhgqq132bf59nb2"; - libraryHaskellDepends = [ - base exceptions mmorph mtl semigroups transformers void - ]; - testHaskellDepends = [ - base mtl QuickCheck test-framework test-framework-quickcheck2 - transformers - ]; - benchmarkHaskellDepends = [ - base criterion mtl optparse-applicative transformers - ]; - description = "Compositional pipelines"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pipes_4_3_11" = callPackage - ({ mkDerivation, base, criterion, exceptions, mmorph, mtl - , optparse-applicative, QuickCheck, semigroups, test-framework - , test-framework-quickcheck2, transformers, void - }: - mkDerivation { - pname = "pipes"; version = "4.3.11"; sha256 = "0h70djd6x306rci8zp356klqj6376xry6mkhyr12301adfhag8vv"; libraryHaskellDepends = [ @@ -181651,7 +178814,6 @@ self: { ]; description = "Compositional pipelines"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-aeson" = callPackage @@ -181876,6 +179038,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pipes-cborg" = callPackage + ({ mkDerivation, base, bytestring, cborg, ghc-prim, pipes + , pipes-bytestring, pipes-parse, QuickCheck, serialise, tasty + , tasty-quickcheck, transformers + }: + mkDerivation { + pname = "pipes-cborg"; + version = "0.1"; + sha256 = "1ihngg2gvlyq40wnpajhbb7xpj028pk1k08xay19ir4n9mmx4jrn"; + libraryHaskellDepends = [ + base bytestring cborg ghc-prim pipes pipes-bytestring pipes-parse + serialise transformers + ]; + testHaskellDepends = [ + base bytestring cborg pipes pipes-bytestring QuickCheck serialise + tasty tasty-quickcheck transformers + ]; + description = "Encode and decode cborg streams using the pipes and cborg libraries"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "pipes-cellular" = callPackage ({ mkDerivation, base, bytestring, data-cell, pipes }: mkDerivation { @@ -182361,8 +179544,6 @@ self: { ]; description = "Use network sockets together with the pipes library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "pipes-network-tls" = callPackage @@ -182380,8 +179561,6 @@ self: { ]; description = "TLS-secured network connections support for pipes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "pipes-network-ws" = callPackage @@ -182395,8 +179574,6 @@ self: { ]; description = "WebSockets support for pipes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "pipes-ordered-zip" = callPackage @@ -183287,8 +180464,6 @@ self: { ]; description = "run a subprocess, combining stdout and stderr"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "plist" = callPackage @@ -183920,8 +181095,6 @@ self: { executableHaskellDepends = [ base ]; description = "Pointful refactoring tool"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "pointless-fun" = callPackage @@ -184135,8 +181308,6 @@ self: { benchmarkHaskellDepends = [ base gauge semirings vector ]; description = "Polynomials"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "poly-arity" = callPackage @@ -184325,8 +181496,38 @@ self: { ]; description = "Higher-order, low-boilerplate, zero-cost free monads"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "polysemy_1_1_0_0" = callPackage + ({ mkDerivation, async, base, containers, criterion, doctest + , first-class-families, free, freer-simple, hspec, hspec-discover + , inspection-testing, mtl, stm, syb, template-haskell + , th-abstraction, transformers, type-errors, type-errors-pretty + , unagi-chan + }: + mkDerivation { + pname = "polysemy"; + version = "1.1.0.0"; + sha256 = "1slc177ygphiaaxr301nmn47q7jl71rmzcw8h9q7az2s2f3gy83p"; + libraryHaskellDepends = [ + async base containers first-class-families mtl stm syb + template-haskell th-abstraction transformers type-errors + type-errors-pretty unagi-chan + ]; + testHaskellDepends = [ + async base containers doctest first-class-families hspec + inspection-testing mtl stm syb template-haskell th-abstraction + transformers type-errors type-errors-pretty unagi-chan + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + async base containers criterion first-class-families free + freer-simple mtl stm syb template-haskell th-abstraction + transformers type-errors type-errors-pretty unagi-chan + ]; + description = "Higher-order, low-boilerplate, zero-cost free monads"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "polysemy-RandomFu" = callPackage @@ -184499,6 +181700,8 @@ self: { ]; description = "Maps and sets of partial orders"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pomodoro" = callPackage @@ -185217,8 +182420,8 @@ self: { }: mkDerivation { pname = "postgresql-binary"; - version = "0.12.1.2"; - sha256 = "10h5299fxqmfz0kxyvivfy396q35gzg60spnjagyha33kx5m3bc3"; + version = "0.12.1.3"; + sha256 = "0y2irx1fw0xqs77qpaa3lk06r2q7j7wzbzriyc274h6lmn85sjdw"; libraryHaskellDepends = [ aeson base base-prelude binary-parser bytestring bytestring-strict-builder containers loch-th network-ip @@ -185365,8 +182568,6 @@ self: { ]; description = "Utilities for streaming PostgreSQL LargeObjects"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "postgresql-named" = callPackage @@ -185865,6 +183066,8 @@ self: { ]; description = "Library for postmarkapp.com HTTP Api"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "postmark-streams" = callPackage @@ -187041,6 +184244,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pretty-simple_3_0_0_0" = callPackage + ({ mkDerivation, ansi-terminal, base, criterion, doctest, Glob, mtl + , text, transformers + }: + mkDerivation { + pname = "pretty-simple"; + version = "3.0.0.0"; + sha256 = "0cv21iq6xk73dlmkm9ax22qv93sgqj72gzl1zxxn2870vhf102ab"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal base mtl text transformers + ]; + testHaskellDepends = [ base doctest Glob ]; + benchmarkHaskellDepends = [ base criterion text ]; + description = "pretty printer for data types with a 'Show' instance"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pretty-sop" = callPackage ({ mkDerivation, base, generics-sop, markdown-unlit, pretty-show }: mkDerivation { @@ -187085,25 +184308,12 @@ self: { ({ mkDerivation, base, hspec, mtl, tagged }: mkDerivation { pname = "pretty-types"; - version = "0.2.3.1"; - sha256 = "0kvqp39q1qydgf6rlrabgjcgv53irdh9xvw2p7hazbls178ljv75"; - libraryHaskellDepends = [ base mtl tagged ]; - testHaskellDepends = [ base hspec tagged ]; - description = "A small pretty printing DSL for complex types"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pretty-types_0_3_0_1" = callPackage - ({ mkDerivation, base, hspec, mtl, tagged }: - mkDerivation { - pname = "pretty-types"; version = "0.3.0.1"; sha256 = "06dkyk3zdi9wv77yza0vgwl9v8zhyazyhdjbffkqpism07c80rgv"; libraryHaskellDepends = [ base mtl tagged ]; testHaskellDepends = [ base hspec tagged ]; description = "A small pretty printing DSL for complex types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "prettyFunctionComposing" = callPackage @@ -187135,13 +184345,13 @@ self: { }: mkDerivation { pname = "prettyprinter"; - version = "1.2.1"; - sha256 = "1kvza7jp5n833m8rj0bc35bd2p8wx3fq0iqflm9nbh3wm05kwrg7"; + version = "1.2.1.1"; + sha256 = "1p9c3q55hba4c0zyxc624g5df7wgsclpsmd8wqpdnmib882q9d1v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base text ]; testHaskellDepends = [ - base bytestring doctest pgp-wordlist tasty tasty-hunit + base bytestring doctest pgp-wordlist QuickCheck tasty tasty-hunit tasty-quickcheck text ]; benchmarkHaskellDepends = [ @@ -187445,8 +184655,6 @@ self: { libraryHaskellDepends = [ base primitive ]; description = "Addresses to unmanaged memory"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "primitive-atomic" = callPackage @@ -187507,6 +184715,30 @@ self: { "primitive-extras" = callPackage ({ mkDerivation, base, bytestring, cereal, deferred-folds, focus + , foldl, list-t, primitive, profunctors, QuickCheck + , quickcheck-instances, rerebase, tasty, tasty-hunit + , tasty-quickcheck, vector + }: + mkDerivation { + pname = "primitive-extras"; + version = "0.7.1.1"; + sha256 = "1hffgvqdrsxml2z834jb1mpywkflcnlymmxp9dmapwg8pcadjzdm"; + revision = "1"; + editedCabalFile = "10z7fnz907s7ar15lk3kq62p11bbsksdb0nmg5y7ii0n97mqni96"; + libraryHaskellDepends = [ + base bytestring cereal deferred-folds focus foldl list-t primitive + profunctors vector + ]; + testHaskellDepends = [ + cereal deferred-folds focus primitive QuickCheck + quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck + ]; + description = "Extras for the \"primitive\" library"; + license = stdenv.lib.licenses.mit; + }) {}; + + "primitive-extras_0_8" = callPackage + ({ mkDerivation, base, bytestring, cereal, deferred-folds, focus , foldl, list-t, primitive, primitive-unlifted, profunctors , QuickCheck, quickcheck-instances, rerebase, tasty, tasty-hunit , tasty-quickcheck, vector @@ -187526,7 +184758,6 @@ self: { description = "Extras for the \"primitive\" library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "primitive-foreign" = callPackage @@ -188267,8 +185498,6 @@ self: { libraryHaskellDepends = [ base category ]; description = "Product category"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "product-isomorphic" = callPackage @@ -188744,6 +185973,8 @@ self: { libraryHaskellDepends = [ base fgl graphviz mtl prolog text ]; description = "Generating images of resolution trees for Prolog queries"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "prologue" = callPackage @@ -188786,6 +186017,8 @@ self: { ]; description = "Prometheus Haskell Client"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "prometheus-client" = callPackage @@ -188982,8 +186215,6 @@ self: { executableHaskellDepends = [ base ]; description = "property-based host configuration management in haskell"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "properties" = callPackage @@ -189157,24 +186388,6 @@ self: { }) {}; "proto-lens" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, containers, deepseq - , lens-family, lens-labels, parsec, pretty, text, transformers - , void - }: - mkDerivation { - pname = "proto-lens"; - version = "0.4.0.1"; - sha256 = "1ryz183ds1k28nvw6y1w84k29aq5mgrpv5yyqarj0g463gp137cm"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - attoparsec base bytestring containers deepseq lens-family - lens-labels parsec pretty text transformers void - ]; - description = "A lens-based implementation of protocol buffers in Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "proto-lens_0_5_1_0" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, ghc-prim , lens-family, parsec, pretty, primitive, profunctors, QuickCheck , tagged, test-framework, test-framework-quickcheck2, text @@ -189195,7 +186408,6 @@ self: { ]; description = "A lens-based implementation of protocol buffers in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "proto-lens-arbitrary" = callPackage @@ -189286,23 +186498,6 @@ self: { }) {inherit (pkgs) protobuf;}; "proto-lens-protobuf-types" = callPackage - ({ mkDerivation, base, Cabal, lens-labels, proto-lens - , proto-lens-runtime, proto-lens-setup, protobuf, text - }: - mkDerivation { - pname = "proto-lens-protobuf-types"; - version = "0.4.0.1"; - sha256 = "091284pyp4b36hnvfjsrsg6zlgw1payzwfbsy66sgbbi285mwira"; - setupHaskellDepends = [ base Cabal proto-lens-setup ]; - libraryHaskellDepends = [ - base lens-labels proto-lens proto-lens-runtime text - ]; - libraryToolDepends = [ protobuf ]; - description = "Basic protocol buffer message types"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) protobuf;}; - - "proto-lens-protobuf-types_0_5_0_0" = callPackage ({ mkDerivation, base, Cabal, lens-family, proto-lens , proto-lens-runtime, proto-lens-setup, protobuf, text }: @@ -189317,7 +186512,6 @@ self: { libraryToolDepends = [ protobuf ]; description = "Basic protocol buffer message types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) protobuf;}; "proto-lens-protoc_0_2_2_3" = callPackage @@ -189353,28 +186547,6 @@ self: { }: mkDerivation { pname = "proto-lens-protoc"; - version = "0.4.0.2"; - sha256 = "1kvbv7c42qcynh25mh1vzwdzk4fhvjai031hwmsrmpqywgbgknmm"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers filepath haskell-src-exts lens-family pretty - proto-lens text - ]; - libraryToolDepends = [ protobuf ]; - executableHaskellDepends = [ - base bytestring containers lens-family proto-lens text - ]; - description = "Protocol buffer compiler for the proto-lens library"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) protobuf;}; - - "proto-lens-protoc_0_5_0_0" = callPackage - ({ mkDerivation, base, bytestring, containers, filepath - , haskell-src-exts, lens-family, pretty, proto-lens, protobuf, text - }: - mkDerivation { - pname = "proto-lens-protoc"; version = "0.5.0.0"; sha256 = "0r6il4gvvcggxxbz2hq1kkw1qwk1rspqcb2j04ngd06pmvicw78n"; isLibrary = true; @@ -189389,27 +186561,10 @@ self: { ]; description = "Protocol buffer compiler for the proto-lens library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) protobuf;}; "proto-lens-runtime" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, filepath - , lens-family, lens-labels, proto-lens, text - }: - mkDerivation { - pname = "proto-lens-runtime"; - version = "0.4.0.2"; - sha256 = "1k6biy5z890nn5b76sd3xr086sbrqr09rx1r2a7jxra2l2ymc4sr"; - libraryHaskellDepends = [ - base bytestring containers deepseq filepath lens-family lens-labels - proto-lens text - ]; - doHaddock = false; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "proto-lens-runtime_0_5_0_0" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, filepath , lens-family, proto-lens, text, vector }: mkDerivation { @@ -189422,7 +186577,6 @@ self: { ]; doHaddock = false; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "proto-lens-setup" = callPackage @@ -189664,23 +186818,6 @@ self: { }: mkDerivation { pname = "protocol-radius-test"; - version = "0.0.1.0"; - sha256 = "185d85d9gfylcg575rvr43p4p8wzh0mi9frvkm2cn3liwwarmk5m"; - libraryHaskellDepends = [ - base bytestring cereal containers protocol-radius QuickCheck - quickcheck-simple transformers - ]; - testHaskellDepends = [ base quickcheck-simple ]; - description = "testsuit of protocol-radius haskell package"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "protocol-radius-test_0_1_0_0" = callPackage - ({ mkDerivation, base, bytestring, cereal, containers - , protocol-radius, QuickCheck, quickcheck-simple, transformers - }: - mkDerivation { - pname = "protocol-radius-test"; version = "0.1.0.0"; sha256 = "1zgfq76k86jf1jpm14mpb8iaiya0d6vz0lrmbwc0fn34hqhkcd88"; libraryHaskellDepends = [ @@ -189690,7 +186827,6 @@ self: { testHaskellDepends = [ base quickcheck-simple ]; description = "testsuit of protocol-radius haskell package"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "protolude" = callPackage @@ -191367,37 +188503,6 @@ self: { }: mkDerivation { pname = "qnap-decrypt"; - version = "0.3.4"; - sha256 = "0s263zkdns50bvanjiaiavdk6bpd1ccqbckdmxwbbl2sxp2s3jxz"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base binary bytestring cipher-aes128 conduit conduit-extra - crypto-api directory streaming-commons tagged utf8-string - ]; - executableHaskellDepends = [ - base binary bytestring cipher-aes128 conduit conduit-extra - crypto-api directory filepath optparse-applicative - streaming-commons tagged utf8-string - ]; - testHaskellDepends = [ - base binary bytestring cipher-aes128 conduit conduit-extra - crypto-api directory filepath hspec HUnit streaming-commons tagged - temporary utf8-string - ]; - description = "Decrypt files encrypted by QNAP's Hybrid Backup Sync"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "qnap-decrypt_0_3_5" = callPackage - ({ mkDerivation, base, binary, bytestring, cipher-aes128, conduit - , conduit-extra, crypto-api, directory, filepath, hspec, HUnit - , optparse-applicative, streaming-commons, tagged, temporary - , utf8-string - }: - mkDerivation { - pname = "qnap-decrypt"; version = "0.3.5"; sha256 = "1mm08bm2jzcnh1zal7zdiyryl3z5z91ch2vyyl0p29nbwl2q06xb"; isLibrary = true; @@ -191419,7 +188524,6 @@ self: { ]; description = "Decrypt files encrypted by QNAP's Hybrid Backup Sync"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "qq-literals" = callPackage @@ -191652,28 +188756,6 @@ self: { }: mkDerivation { pname = "quadratic-irrational"; - version = "0.0.6"; - sha256 = "02hdxi9kjp7dccmb7ix3a0yqr7fvl2vpc588ibxq6gjd5v3716r0"; - revision = "1"; - editedCabalFile = "0i7dsl7zm9r7sgfs2cwmic3qbk15lc7kbhjd53vin89p21fh8mzm"; - libraryHaskellDepends = [ - arithmoi base containers mtl transformers - ]; - testHaskellDepends = [ - base directory doctest filepath mtl numbers QuickCheck tasty - tasty-quickcheck - ]; - description = "An implementation of quadratic irrationals"; - license = stdenv.lib.licenses.mit; - }) {}; - - "quadratic-irrational_0_1_0" = callPackage - ({ mkDerivation, arithmoi, base, containers, directory, doctest - , filepath, mtl, numbers, QuickCheck, tasty, tasty-quickcheck - , transformers - }: - mkDerivation { - pname = "quadratic-irrational"; version = "0.1.0"; sha256 = "0kfgvixvcawfhw4vv0zg2r0d6hrlak01q9isqc3n3lc63qaifxgy"; libraryHaskellDepends = [ arithmoi base containers transformers ]; @@ -191683,7 +188765,6 @@ self: { ]; description = "An implementation of quadratic irrationals"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quandl-api" = callPackage @@ -192107,8 +189188,6 @@ self: { ]; description = "Generate QuickCheck Gen for Sum Types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "quickcheck-assertions" = callPackage @@ -192130,11 +189209,14 @@ self: { }: mkDerivation { pname = "quickcheck-classes"; - version = "0.6.0.0"; - sha256 = "02ssvvhi87ggyxi3jsg2h1xirwqyydda88n5ax4imfljvig366cy"; + version = "0.6.1.0"; + sha256 = "01mqsffks1d0wf3vwrlmalqxqha2gfqa389gqq0zr5b9y7ka5a8h"; + revision = "1"; + editedCabalFile = "1n68f8qw8if3db7x7b49lfvs0hpdvlmq0bhdjf1dvmaz0wmw932i"; libraryHaskellDepends = [ aeson base base-orphans bifunctors containers fail primitive QuickCheck semigroupoids semigroups semirings tagged transformers + vector ]; testHaskellDepends = [ aeson base base-orphans containers primitive QuickCheck @@ -192144,20 +189226,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "quickcheck-classes_0_6_2_1" = callPackage + "quickcheck-classes_0_6_3_0" = callPackage ({ mkDerivation, aeson, base, base-orphans, bifunctors, containers , contravariant, fail, primitive, primitive-addr, QuickCheck - , semigroupoids, semigroups, semirings, tagged, tasty - , tasty-quickcheck, transformers, vector + , quickcheck-classes-base, semigroupoids, semigroups, semirings + , tagged, tasty, tasty-quickcheck, transformers, vector }: mkDerivation { pname = "quickcheck-classes"; - version = "0.6.2.1"; - sha256 = "1pw4r4166a3f0ylvjifpcnicfh9kidz7lvjpgp4m0frhaqhx82ig"; + version = "0.6.3.0"; + sha256 = "0rbrxs79naffzp809523452xprh7z33j6p256qs0cnni9v9zfgjf"; libraryHaskellDepends = [ aeson base base-orphans bifunctors containers contravariant fail - primitive primitive-addr QuickCheck semigroupoids semigroups - semirings tagged transformers vector + primitive primitive-addr QuickCheck quickcheck-classes-base + semigroupoids semigroups semirings tagged transformers vector ]; testHaskellDepends = [ aeson base base-orphans containers primitive QuickCheck @@ -192168,6 +189250,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "quickcheck-classes-base" = callPackage + ({ mkDerivation, base, base-orphans, bifunctors, containers + , contravariant, fail, QuickCheck, semigroups, tagged, transformers + }: + mkDerivation { + pname = "quickcheck-classes-base"; + version = "0.6.0.0"; + sha256 = "193jbr3fy2451gx0hzw82xrzxp6mxz5ics6yaybbz1a3dhlz53yx"; + libraryHaskellDepends = [ + base base-orphans bifunctors containers contravariant fail + QuickCheck semigroups tagged transformers + ]; + description = "QuickCheck common typeclasses from `base`"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "quickcheck-combinators" = callPackage ({ mkDerivation, base, QuickCheck, unfoldable-restricted }: mkDerivation { @@ -192176,6 +189274,8 @@ self: { sha256 = "0qdjls949kmcv8wj3a27p4dz8nb1dq4i99zizkw7qyqn47r9ccxd"; libraryHaskellDepends = [ base QuickCheck unfoldable-restricted ]; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "quickcheck-enum-instances" = callPackage @@ -192192,29 +189292,6 @@ self: { "quickcheck-instances" = callPackage ({ mkDerivation, array, base, base-compat, bytestring , case-insensitive, containers, hashable, old-time, QuickCheck - , scientific, tagged, text, time, transformers, transformers-compat - , unordered-containers, uuid-types, vector - }: - mkDerivation { - pname = "quickcheck-instances"; - version = "0.3.19"; - sha256 = "0mls8095ylk5pq2j787ary5lyn4as64414silq3zn4sky3zsx92p"; - libraryHaskellDepends = [ - array base base-compat bytestring case-insensitive containers - hashable old-time QuickCheck scientific tagged text time - transformers transformers-compat unordered-containers uuid-types - vector - ]; - testHaskellDepends = [ - base containers QuickCheck tagged uuid-types - ]; - description = "Common quickcheck instances"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "quickcheck-instances_0_3_22" = callPackage - ({ mkDerivation, array, base, base-compat, bytestring - , case-insensitive, containers, hashable, old-time, QuickCheck , scientific, splitmix, tagged, text, time, time-compat , transformers, transformers-compat, unordered-containers , uuid-types, vector @@ -192223,6 +189300,8 @@ self: { pname = "quickcheck-instances"; version = "0.3.22"; sha256 = "14asr9r7da3w7p4hjj51w2yb002nz8x0np8hdz9z4yjvi60vyrax"; + revision = "1"; + editedCabalFile = "1ln7zp6rx7ya7iwcbh8m1s1y1pdh28f64nga74f2lszmpmmd512w"; libraryHaskellDepends = [ array base base-compat bytestring case-insensitive containers hashable old-time QuickCheck scientific splitmix tagged text time @@ -192235,7 +189314,6 @@ self: { benchmarkHaskellDepends = [ base bytestring QuickCheck ]; description = "Common quickcheck instances"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quickcheck-io" = callPackage @@ -192386,8 +189464,8 @@ self: { ({ mkDerivation, base, QuickCheck }: mkDerivation { pname = "quickcheck-simple"; - version = "0.1.1.0"; - sha256 = "0rclb8ghakcrcw3sz9q8lvb2zh1a4lafb711mqpfl0csd3yvlia4"; + version = "0.1.1.1"; + sha256 = "0ah32y1p39p3d0696zp4mlf4bj67ggh73sb8nvf21snkwll86dai"; libraryHaskellDepends = [ base QuickCheck ]; description = "Test properties and default-mains for QuickCheck"; license = stdenv.lib.licenses.bsd3; @@ -192409,38 +189487,6 @@ self: { "quickcheck-state-machine" = callPackage ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers , directory, doctest, exceptions, filelock, filepath, http-client - , lifted-async, matrix, monad-control, monad-logger, mtl, network - , persistent, persistent-postgresql, persistent-template - , pretty-show, process, QuickCheck, quickcheck-instances, random - , resourcet, servant, servant-client, servant-server, split, stm - , strict, string-conversions, tasty, tasty-hunit, tasty-quickcheck - , text, tree-diff, vector, wai, warp - }: - mkDerivation { - pname = "quickcheck-state-machine"; - version = "0.4.3"; - sha256 = "0f9hsjhrnab8gy51m4m1fn5i594ixx1qw14hsfwsakbn8f78aarx"; - libraryHaskellDepends = [ - ansi-wl-pprint base containers exceptions lifted-async matrix - monad-control mtl pretty-show QuickCheck split stm tree-diff vector - ]; - testHaskellDepends = [ - base bytestring directory doctest filelock filepath http-client - lifted-async matrix monad-control monad-logger mtl network - persistent persistent-postgresql persistent-template process - QuickCheck quickcheck-instances random resourcet servant - servant-client servant-server stm strict string-conversions tasty - tasty-hunit tasty-quickcheck text tree-diff vector wai warp - ]; - description = "Test monadic programs using state machine based models"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "quickcheck-state-machine_0_6_0" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers - , directory, doctest, exceptions, filelock, filepath, http-client , matrix, monad-logger, mtl, network, persistent , persistent-postgresql, persistent-template, pretty-show, process , QuickCheck, quickcheck-instances, random, resourcet, servant @@ -192510,6 +189556,8 @@ self: { ]; description = "Helper to build generators with Text.StringRandom"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "quickcheck-text" = callPackage @@ -192568,8 +189616,6 @@ self: { libraryHaskellDepends = [ base QuickCheck template-haskell ]; description = "Get counterexamples from QuickCheck as Haskell values"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "quicklz" = callPackage @@ -193188,6 +190234,8 @@ self: { attoparsec base criterion deepseq QuasiText text vector ]; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rados-haskell" = callPackage @@ -193222,8 +190270,8 @@ self: { }: mkDerivation { pname = "raft"; - version = "0.3.11.0"; - sha256 = "0rc4gvhfcslwb01lxbwmd1j3hbcbkyflm0qg43ccdkf2pj2gibz8"; + version = "0.4.0.0"; + sha256 = "07lfjq2dz9vki7pvjg6p3mp2ifazhmidcx9pbsfxnhj1h8xb80bp"; libraryHaskellDepends = [ aeson attoparsec base binary bytestring cereal containers data-default ghc-prim mtl parallel scientific split stm text time @@ -193438,6 +190486,8 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq ]; description = "Random access list with a list compatible interface"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rallod" = callPackage @@ -193691,8 +190741,6 @@ self: { testHaskellDepends = [ base ]; description = "Multivariate distributions for random-fu"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "random-hypergeometric" = callPackage @@ -193898,26 +190946,6 @@ self: { }: mkDerivation { pname = "range-set-list"; - version = "0.1.3"; - sha256 = "1pwnriv5r093qvqzzg9s868613nf92d3h8qmqaqc5qq95hykj6z5"; - revision = "1"; - editedCabalFile = "00ddj7if8lcrqf5c882m4slm15sdwcghz7d2fz222c7jcw1ahvdr"; - libraryHaskellDepends = [ base containers deepseq hashable ]; - testHaskellDepends = [ - base containers deepseq hashable tasty tasty-quickcheck - ]; - description = "Memory efficient sets with ranges of elements"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "range-set-list_0_1_3_1" = callPackage - ({ mkDerivation, base, containers, deepseq, hashable, tasty - , tasty-quickcheck - }: - mkDerivation { - pname = "range-set-list"; version = "0.1.3.1"; sha256 = "0m8c8qhpk9vaykqfy6gsv1csmvdclm27zv9l56ipv152k75xks0j"; libraryHaskellDepends = [ base containers deepseq hashable ]; @@ -193926,8 +190954,6 @@ self: { ]; description = "Memory efficient sets with ranges of elements"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "range-space" = callPackage @@ -194020,26 +191046,6 @@ self: { }: mkDerivation { pname = "rank2classes"; - version = "1.2.1"; - sha256 = "0dbg5hc8vy0nikyw9h99d9z5jpwfzqb3jwg1li5h281fi5cm4nb0"; - libraryHaskellDepends = [ - base distributive template-haskell transformers - ]; - testHaskellDepends = [ - base distributive doctest tasty tasty-hunit - ]; - description = "standard type constructor class hierarchy, only with methods of rank 2 types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "rank2classes_1_3" = callPackage - ({ mkDerivation, base, distributive, doctest, tasty, tasty-hunit - , template-haskell, transformers - }: - mkDerivation { - pname = "rank2classes"; version = "1.3"; sha256 = "1mwwismxafz43qjqh74gjd8d1hiflkilkxkwfvwhq0gx4h4i0rq1"; libraryHaskellDepends = [ @@ -194392,21 +191398,6 @@ self: { }: mkDerivation { pname = "ratel-wai"; - version = "1.0.5"; - sha256 = "07k2gzc2by6zhsk1zqp0kjk37zc6ikigdp0j5d38pd7x30a7qk7x"; - libraryHaskellDepends = [ - base bytestring case-insensitive containers http-client ratel wai - ]; - description = "Notify Honeybadger about exceptions via a WAI middleware"; - license = stdenv.lib.licenses.mit; - }) {}; - - "ratel-wai_1_1_0" = callPackage - ({ mkDerivation, base, bytestring, case-insensitive, containers - , http-client, ratel, wai - }: - mkDerivation { - pname = "ratel-wai"; version = "1.1.0"; sha256 = "1wgmlcazfbz4y4q9k6367i76l8cal1qgqhqbh2p69ca365w9pf56"; libraryHaskellDepends = [ @@ -194414,7 +191405,6 @@ self: { ]; description = "Notify Honeybadger about exceptions via a WAI middleware"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rating-chgk-info" = callPackage @@ -194443,8 +191433,6 @@ self: { benchmarkHaskellDepends = [ base-noprelude gauge relude ]; description = "Client for rating.chgk.info API and CSV tables (documentation in Russian)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "rating-systems" = callPackage @@ -194493,39 +191481,6 @@ self: { "rattletrap" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, binary, binary-bits - , bytestring, clock, containers, filepath, http-client - , http-client-tls, HUnit, template-haskell, temporary, text - , transformers - }: - mkDerivation { - pname = "rattletrap"; - version = "6.0.2"; - sha256 = "1904g1s61zazhg6zn189m7y9v5aap39zd0gfypzd9jrk6489aqi1"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson aeson-pretty base binary binary-bits bytestring containers - filepath http-client http-client-tls template-haskell text - transformers - ]; - executableHaskellDepends = [ - aeson aeson-pretty base binary binary-bits bytestring containers - filepath http-client http-client-tls template-haskell text - transformers - ]; - testHaskellDepends = [ - aeson aeson-pretty base binary binary-bits bytestring clock - containers filepath http-client http-client-tls HUnit - template-haskell temporary text transformers - ]; - description = "Parse and generate Rocket League replays"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "rattletrap_9_0_1" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, binary, binary-bits , bytestring, containers, filepath, http-client, http-client-tls , HUnit, scientific, template-haskell, temporary, text , transformers @@ -195471,8 +192426,6 @@ self: { testHaskellDepends = [ base doctest protolude tasty ]; description = "See readme.md"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "readpyc" = callPackage @@ -195710,21 +192663,6 @@ self: { }) {}; "record-dot-preprocessor" = callPackage - ({ mkDerivation, base, extra, filepath }: - mkDerivation { - pname = "record-dot-preprocessor"; - version = "0.1.5"; - sha256 = "1vap09g7gh9nsr4x4bfysx3ha8kc9vpx252j0fdmffbivyj5d2wl"; - revision = "1"; - editedCabalFile = "1hggzp6fh071f2d11pn1y2rgczgxgvcfw86717gpxsm34kr60pgb"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ base extra filepath ]; - description = "Preprocessor to allow record.field syntax"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "record-dot-preprocessor_0_2" = callPackage ({ mkDerivation, base, extra, filepath, ghc, record-hasfield , uniplate }: @@ -195739,7 +192677,6 @@ self: { testHaskellDepends = [ base extra filepath record-hasfield ]; description = "Preprocessor to allow record.field syntax"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "record-encode" = callPackage @@ -195908,8 +192845,8 @@ self: { ({ mkDerivation, base, composition-prelude }: mkDerivation { pname = "recursion"; - version = "2.2.3.0"; - sha256 = "193v6ygjhgv8l5b31gs4279dah677lhlj68kvj80pw5vj5azyawr"; + version = "2.2.4.0"; + sha256 = "0n50nv1lzahy2mfvia5v41f8jx9w2yygzq584xbkirazhj73sjbx"; libraryHaskellDepends = [ base composition-prelude ]; description = "A recursion schemes library for GHC"; license = stdenv.lib.licenses.bsd3; @@ -196439,6 +193376,26 @@ self: { testHaskellDepends = [ base doctest ]; description = "Refinement types with static and runtime checking"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "refinery" = callPackage + ({ mkDerivation, base, containers, exceptions, mmorph, mtl, pipes + , semigroupoids + }: + mkDerivation { + pname = "refinery"; + version = "0.1.0.0"; + sha256 = "1g18ih1122h61jxgi72kxc9b4x7nvfxl807km46x150x1f3m7wvl"; + libraryHaskellDepends = [ + base containers exceptions mmorph mtl pipes semigroupoids + ]; + testHaskellDepends = [ + base containers exceptions mmorph mtl pipes semigroupoids + ]; + description = "Toolkit for building proof automation systems"; + license = stdenv.lib.licenses.bsd3; }) {}; "reflection" = callPackage @@ -196868,6 +193825,8 @@ self: { ]; description = "Reflex FRP host and widgets for vty applications"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "reform" = callPackage @@ -196920,6 +193879,8 @@ self: { ]; description = "Happstack support for reform"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "reform-hsp" = callPackage @@ -196931,6 +193892,8 @@ self: { libraryHaskellDepends = [ base hsp hsx2hs reform text ]; description = "Add support for using HSP with Reform"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "reform-lucid" = callPackage @@ -197707,26 +194670,26 @@ self: { }) {}; "registry" = callPackage - ({ mkDerivation, async, base, containers, exceptions, generic-lens - , hashable, hedgehog, io-memoize, mmorph, MonadRandom, mtl - , multimap, protolude, random, resourcet, semigroupoids, semigroups - , tasty, tasty-discover, tasty-hedgehog, tasty-th, template-haskell - , text, transformers-base, universum + ({ mkDerivation, async, base, bytestring, containers, directory + , exceptions, generic-lens, hashable, hedgehog, io-memoize, mmorph + , MonadRandom, mtl, multimap, protolude, random, resourcet + , semigroupoids, semigroups, tasty, tasty-discover, tasty-hedgehog + , tasty-th, template-haskell, text, transformers-base, universum }: mkDerivation { pname = "registry"; - version = "0.1.6.2"; - sha256 = "03j7m08wj0abr0nywb3vgsifyhmdrr7mvbn82gg8kx3gcbxvanbd"; + version = "0.1.7.0"; + sha256 = "14da74d1fijib9w6xi2x904c9iqhdja685lq63c0wc6zgi7ss2ln"; libraryHaskellDepends = [ base containers exceptions hashable mmorph mtl protolude resourcet semigroupoids semigroups template-haskell text transformers-base ]; testHaskellDepends = [ - async base containers exceptions generic-lens hashable hedgehog - io-memoize mmorph MonadRandom mtl multimap protolude random - resourcet semigroupoids semigroups tasty tasty-discover - tasty-hedgehog tasty-th template-haskell text transformers-base - universum + async base bytestring containers directory exceptions generic-lens + hashable hedgehog io-memoize mmorph MonadRandom mtl multimap + protolude random resourcet semigroupoids semigroups tasty + tasty-discover tasty-hedgehog tasty-th template-haskell text + transformers-base universum ]; testToolDepends = [ tasty-discover ]; description = "data structure for assembling components"; @@ -197959,6 +194922,8 @@ self: { ]; description = "Sensible RLP encoding"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "relation" = callPackage @@ -197976,6 +194941,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "A data structure representing Relations on Sets"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "relational-postgresql8" = callPackage @@ -198005,28 +194972,6 @@ self: { }: mkDerivation { pname = "relational-query"; - version = "0.12.2.1"; - sha256 = "09ihkynff79kpgph6kwb0rr6q9crkppdhal4nz7gvb1nx3y8fw9s"; - libraryHaskellDepends = [ - array base bytestring containers dlist names-th persistable-record - product-isomorphic sql-words template-haskell text th-reify-compat - time time-locale-compat transformers - ]; - testHaskellDepends = [ - base containers product-isomorphic quickcheck-simple transformers - ]; - description = "Typeful, Modular, Relational, algebraic query engine"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "relational-query_0_12_2_2" = callPackage - ({ mkDerivation, array, base, bytestring, containers, dlist - , names-th, persistable-record, product-isomorphic - , quickcheck-simple, sql-words, template-haskell, text - , th-reify-compat, time, time-locale-compat, transformers - }: - mkDerivation { - pname = "relational-query"; version = "0.12.2.2"; sha256 = "0768cw6c5chzdcwshjjniysik5d1yj7zvhwncqnn0wgy4gp6kzjv"; libraryHaskellDepends = [ @@ -198039,7 +194984,6 @@ self: { ]; description = "Typeful, Modular, Relational, algebraic query engine"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "relational-query-HDBC" = callPackage @@ -198198,29 +195142,6 @@ self: { "relude" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, doctest - , gauge, ghc-prim, Glob, hashable, hedgehog, mtl, stm, tasty - , tasty-hedgehog, text, transformers, unordered-containers - }: - mkDerivation { - pname = "relude"; - version = "0.4.0"; - sha256 = "03z8ji8hssb811d1xvmv2zlnq7h7dsr801x05xydhfl1srbg5i9f"; - libraryHaskellDepends = [ - base bytestring containers deepseq ghc-prim hashable mtl stm text - transformers unordered-containers - ]; - testHaskellDepends = [ - base bytestring doctest Glob hedgehog tasty tasty-hedgehog text - ]; - benchmarkHaskellDepends = [ - base containers gauge unordered-containers - ]; - description = "Custom prelude from Kowainik"; - license = stdenv.lib.licenses.mit; - }) {}; - - "relude_0_5_0" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, doctest , gauge, ghc-prim, Glob, hashable, hedgehog, mtl, QuickCheck, stm , tasty, tasty-hedgehog, text, transformers, unordered-containers }: @@ -198243,7 +195164,6 @@ self: { ]; description = "Custom prelude from Kowainik"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "remark" = callPackage @@ -199057,38 +195977,6 @@ self: { "req" = callPackage ({ mkDerivation, aeson, authenticate-oauth, base, blaze-builder - , bytestring, case-insensitive, connection, data-default-class - , hspec, hspec-core, hspec-discover, http-api-data, http-client - , http-client-tls, http-types, monad-control, mtl, QuickCheck - , retry, text, time, transformers, transformers-base - , unordered-containers - }: - mkDerivation { - pname = "req"; - version = "1.2.1"; - sha256 = "1s8gjifc9jixl4551hay013fwyhlamcyrxjb00qr76wwikqa0g8k"; - revision = "3"; - editedCabalFile = "1sbm2rk2q56gma2wja47q1rc8a2pizl8487g5z4fy1zynxm5inyj"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson authenticate-oauth base blaze-builder bytestring - case-insensitive connection data-default-class http-api-data - http-client http-client-tls http-types monad-control mtl retry text - time transformers transformers-base - ]; - testHaskellDepends = [ - aeson base blaze-builder bytestring case-insensitive - data-default-class hspec hspec-core http-client http-types - monad-control mtl QuickCheck text time unordered-containers - ]; - testToolDepends = [ hspec-discover ]; - doCheck = false; - description = "Easy-to-use, type-safe, expandable, high-level HTTP client library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "req_2_1_0" = callPackage - ({ mkDerivation, aeson, authenticate-oauth, base, blaze-builder , bytestring, case-insensitive, connection, hspec, hspec-core , hspec-discover, http-api-data, http-client, http-client-tls , http-types, monad-control, mtl, QuickCheck, retry, text, time @@ -199114,7 +196002,6 @@ self: { doCheck = false; description = "Easy-to-use, type-safe, expandable, high-level HTTP client library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "req-conduit" = callPackage @@ -199163,30 +196050,11 @@ self: { testHaskellDepends = [ base hspec ]; description = "Provides OAuth2 authentication for use with Req"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "req-url-extra" = callPackage - ({ mkDerivation, aeson, base, data-default-class, hspec, modern-uri - , req, text - }: - mkDerivation { - pname = "req-url-extra"; - version = "0.1.0.0"; - sha256 = "113xsf37kra3k3jhf2wh37rsgphxz24rsn3dy8zw1cwzsim2dpmk"; - revision = "2"; - editedCabalFile = "0srj9fcbm9y8ddqgs8wc6caxamhgnic54y8qpxwnqdxrggdfkk67"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base modern-uri req ]; - executableHaskellDepends = [ - aeson base data-default-class modern-uri req text - ]; - testHaskellDepends = [ base hspec modern-uri req ]; - description = "Provides URI/URL helper functions for use with Req"; - license = stdenv.lib.licenses.mit; - }) {}; - - "req-url-extra_0_1_1_0" = callPackage ({ mkDerivation, aeson, base, hspec, modern-uri, req, text }: mkDerivation { pname = "req-url-extra"; @@ -199200,6 +196068,7 @@ self: { description = "Provides URI/URL helper functions for use with Req"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "reqcatcher" = callPackage @@ -199216,6 +196085,8 @@ self: { ]; description = "A local http server to catch the HTTP redirect"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "request-monad" = callPackage @@ -199347,14 +196218,16 @@ self: { libraryHaskellDepends = [ base ghc-prim ralist semigroupoids ]; description = "High performance variable binders"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "resistor-cube" = callPackage ({ mkDerivation, base, comfort-array, lapack }: mkDerivation { pname = "resistor-cube"; - version = "0.0.1.1"; - sha256 = "1prbjl1zm4pbkz7xwwkp00bnnq94fql7jlskrxfrk6vxp9ryp60a"; + version = "0.0.1.2"; + sha256 = "1jdpyxpbqhlbd66gy1qlrjqm31mhvg636yp8nrm9qbksllzdi6n6"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base comfort-array lapack ]; @@ -199986,26 +196859,6 @@ self: { }) {}; "retry" = callPackage - ({ mkDerivation, base, data-default-class, exceptions, ghc-prim - , hedgehog, HUnit, mtl, random, stm, tasty, tasty-hedgehog - , tasty-hunit, time, transformers - }: - mkDerivation { - pname = "retry"; - version = "0.7.7.0"; - sha256 = "0v6irf01xykhv0mwr1k5i08jn77irqbz8h116j8p435d11xc5jrw"; - libraryHaskellDepends = [ - base data-default-class exceptions ghc-prim random transformers - ]; - testHaskellDepends = [ - base data-default-class exceptions ghc-prim hedgehog HUnit mtl - random stm tasty tasty-hedgehog tasty-hunit time transformers - ]; - description = "Retry combinators for monadic actions that may fail"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "retry_0_8_0_1" = callPackage ({ mkDerivation, base, exceptions, ghc-prim, hedgehog, HUnit, mtl , random, stm, tasty, tasty-hedgehog, tasty-hunit, time , transformers @@ -200023,7 +196876,6 @@ self: { ]; description = "Retry combinators for monadic actions that may fail"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "retryer" = callPackage @@ -200365,8 +197217,6 @@ self: { libraryHaskellDepends = [ base network-simple rfc1413-types ]; description = "rfc1413 server"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "rfc1413-types" = callPackage @@ -200440,6 +197290,8 @@ self: { ]; description = "A dynamic/unbounded alternative to Bounded Enum"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rgb-color-model" = callPackage @@ -200574,6 +197426,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "rib" = callPackage + ({ mkDerivation, aeson, async, base, binary, bytestring, clay + , cmdargs, containers, data-default, fsnotify, http-types, lens + , lens-aeson, lucid, mtl, pandoc, pandoc-include-code, pandoc-types + , safe, shake, skylighting, text, time, wai, wai-app-static + , wai-extra, warp + }: + mkDerivation { + pname = "rib"; + version = "0.2.0.0"; + sha256 = "0fn6hwg1lns92qy7c531rqrdryaildkr25isvdflnydczvy9wx3r"; + libraryHaskellDepends = [ + aeson async base binary bytestring clay cmdargs containers + data-default fsnotify http-types lens lens-aeson lucid mtl pandoc + pandoc-include-code pandoc-types safe shake skylighting text time + wai wai-app-static wai-extra warp + ]; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "ribbit" = callPackage ({ mkDerivation, base, Only, postgresql-simple, text, time }: mkDerivation { @@ -200832,30 +197706,6 @@ self: { "rio" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, directory , exceptions, filepath, hashable, hspec, microlens, mtl, primitive - , process, text, time, typed-process, unix, unliftio - , unordered-containers, vector - }: - mkDerivation { - pname = "rio"; - version = "0.1.8.0"; - sha256 = "1qgmvfc8whhg0qd6zh4jaqqbx5c4p11r8dskybanj6hs482ds4x0"; - libraryHaskellDepends = [ - base bytestring containers deepseq directory exceptions filepath - hashable microlens mtl primitive process text time typed-process - unix unliftio unordered-containers vector - ]; - testHaskellDepends = [ - base bytestring containers deepseq directory exceptions filepath - hashable hspec microlens mtl primitive process text time - typed-process unix unliftio unordered-containers vector - ]; - description = "A standard library for Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "rio_0_1_11_0" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, directory - , exceptions, filepath, hashable, hspec, microlens, mtl, primitive , process, QuickCheck, text, time, typed-process, unix, unliftio , unliftio-core, unordered-containers, vector }: @@ -200876,7 +197726,6 @@ self: { ]; description = "A standard library for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rio-orphans" = callPackage @@ -200915,8 +197764,6 @@ self: { ]; description = "Pretty-printing for RIO"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "riot" = callPackage @@ -201690,8 +198537,8 @@ self: { }: mkDerivation { pname = "ron"; - version = "0.7"; - sha256 = "1bh4vdq9nwi5kwfa2qly1n0jfnphy17b8svd1k3jdzjfclwrjpgj"; + version = "0.8"; + sha256 = "1j5agf0367ldn3jb1jwgi9x9r4sss4jb93j6sgw5w9yzgqj23i8w"; libraryHaskellDepends = [ aeson attoparsec base binary bytestring containers hashable integer-gmp mtl scientific template-haskell text time @@ -201708,8 +198555,8 @@ self: { }: mkDerivation { pname = "ron-rdt"; - version = "0.7"; - sha256 = "1fcvsirzhwmkzcsdr0bhipqq7k7wsg1cjb6z3q4sjihcq9qp22gq"; + version = "0.8"; + sha256 = "1k8xyxi5s3c1q45j51s7ssghqq5m5ka3hn29z4wb7inyzllz6ifx"; libraryHaskellDepends = [ base containers Diff hashable integer-gmp mtl ron text time transformers unordered-containers @@ -201725,8 +198572,8 @@ self: { }: mkDerivation { pname = "ron-schema"; - version = "0.7"; - sha256 = "12vnzmsj6vxvr26x7a9vvp025dxn9jlyi40hgpydpyg9dmjbs246"; + version = "0.8"; + sha256 = "1hqf9wpiwckaj25ljfyfl6dkp53jg31x3wyryc0vwfdy269v8lfb"; libraryHaskellDepends = [ base bytestring containers hedn integer-gmp megaparsec mtl ron ron-rdt template-haskell text transformers @@ -201742,8 +198589,8 @@ self: { }: mkDerivation { pname = "ron-storage"; - version = "0.8"; - sha256 = "1326r8x3m4x1ylf32x66h9s6y7z4hwrwah33kkshj656f3f4bnds"; + version = "0.9"; + sha256 = "0bvmy5mya2v64cj3sxvr0mlfp4zc0xy4q33qr6hk3r6k5jwdfqwx"; libraryHaskellDepends = [ base bytestring containers directory filepath integer-gmp mtl network-info ron ron-rdt stm text transformers @@ -203285,6 +200132,8 @@ self: { ]; description = "Instances from the store library for the safe-money library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "safe-money-xmlbf" = callPackage @@ -203302,8 +200151,6 @@ self: { ]; description = "Instances from the xmlbf library for the safe-money library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "safe-plugins" = callPackage @@ -203591,49 +200438,50 @@ self: { }) {}; "salak" = callPackage - ({ mkDerivation, aeson, attoparsec, base, containers, data-default - , directory, filepath, hspec, menshen, mtl, pqueue, QuickCheck - , scientific, text, transformers, unordered-containers, vector - , yaml + ({ mkDerivation, attoparsec, base, bytestring, containers + , data-default, directory, exceptions, filepath, hashable, heaps + , hspec, menshen, mtl, QuickCheck, random, scientific, text, time + , unliftio-core, unordered-containers }: mkDerivation { pname = "salak"; - version = "0.1.11"; - sha256 = "03l6vadg5wzz2pf1kaxl0h7qndkspymamfdm27ifpwz3vwfy7m1p"; + version = "0.3.3.1"; + sha256 = "0gv7qjiwnr67s38g68y2aqjljihrlggmnz2jz79865bi2v34isd2"; libraryHaskellDepends = [ - aeson attoparsec base containers data-default directory filepath - menshen mtl pqueue scientific text transformers - unordered-containers vector yaml + attoparsec base bytestring containers data-default directory + exceptions filepath hashable heaps menshen mtl scientific text time + unliftio-core unordered-containers ]; testHaskellDepends = [ - aeson attoparsec base containers data-default directory filepath - hspec menshen mtl pqueue QuickCheck scientific text transformers - unordered-containers vector yaml + attoparsec base bytestring containers data-default directory + exceptions filepath hashable heaps hspec menshen mtl QuickCheck + random scientific text time unliftio-core unordered-containers ]; - description = "Configuration Loader"; - license = stdenv.lib.licenses.bsd3; + description = "Configuration (re)Loader and Parser"; + license = stdenv.lib.licenses.mit; }) {}; - "salak_0_3_3" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, data-default - , directory, exceptions, filepath, hashable, heaps, hspec, menshen - , mtl, QuickCheck, random, scientific, text, time, unliftio-core - , unordered-containers + "salak_0_3_3_2" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers + , data-default, directory, dlist, exceptions, filepath, hashable + , heaps, hspec, hspec-discover, menshen, mtl, QuickCheck, random + , scientific, text, time, unliftio-core, unordered-containers }: mkDerivation { pname = "salak"; - version = "0.3.3"; - sha256 = "1jq9vngi03wqcvfb1r9ndg4w1vipgbhbzdyybkpj4hmc074l1079"; + version = "0.3.3.2"; + sha256 = "16v93lnfaqh7pbvpd26gf20wq6nwi42gf9jhv9978qswynck98xd"; libraryHaskellDepends = [ - attoparsec base bytestring data-default directory exceptions - filepath hashable heaps menshen mtl scientific text time + attoparsec base bytestring containers data-default directory dlist + exceptions filepath hashable heaps menshen mtl scientific text time unliftio-core unordered-containers ]; testHaskellDepends = [ - attoparsec base bytestring data-default directory exceptions - filepath hashable heaps hspec menshen mtl QuickCheck random - scientific text time unliftio-core unordered-containers + attoparsec base bytestring containers data-default directory dlist + exceptions filepath hashable heaps hspec menshen mtl QuickCheck + random scientific text time unliftio-core unordered-containers ]; + testToolDepends = [ hspec-discover ]; description = "Configuration (re)Loader and Parser"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -203660,6 +200508,27 @@ self: { broken = true; }) {}; + "salak-toml_0_3_3_2" = callPackage + ({ mkDerivation, base, exceptions, hspec, mtl, QuickCheck, salak + , text, time, tomland, unordered-containers + }: + mkDerivation { + pname = "salak-toml"; + version = "0.3.3.2"; + sha256 = "11134ikw2y7h7cn0c23q454z5g6y85ij8qnzqhqm6jpiyhdp7d6z"; + libraryHaskellDepends = [ + base salak text time tomland unordered-containers + ]; + testHaskellDepends = [ + base exceptions hspec mtl QuickCheck salak text time tomland + unordered-containers + ]; + description = "Configuration Loader for toml"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "salak-yaml" = callPackage ({ mkDerivation, base, conduit, exceptions, hspec, libyaml, mtl , QuickCheck, salak, text @@ -203674,8 +200543,23 @@ self: { ]; description = "Configuration Loader for yaml"; license = stdenv.lib.licenses.mit; + }) {}; + + "salak-yaml_0_3_3_2" = callPackage + ({ mkDerivation, base, conduit, exceptions, hspec, libyaml, mtl + , QuickCheck, salak, text + }: + mkDerivation { + pname = "salak-yaml"; + version = "0.3.3.2"; + sha256 = "1k4n97wayia13q247283m25fqarjdw5jj3k8fcv18kkkpsq4fv97"; + libraryHaskellDepends = [ base conduit libyaml salak text ]; + testHaskellDepends = [ + base conduit exceptions hspec libyaml mtl QuickCheck salak text + ]; + description = "Configuration Loader for yaml"; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "saltine" = callPackage @@ -204277,32 +201161,6 @@ self: { }) {}; "sbp" = callPackage - ({ mkDerivation, aeson, array, base, base64-bytestring - , basic-prelude, binary, binary-conduit, bytestring, conduit - , conduit-extra, data-binary-ieee754, lens, lens-aeson, monad-loops - , resourcet, tasty, tasty-hunit, template-haskell, text, time, yaml - }: - mkDerivation { - pname = "sbp"; - version = "2.4.7"; - sha256 = "1ik254jzgazlbjm09nms8imansk8nb7hhghzyqjcgywg45i119i3"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson array base base64-bytestring basic-prelude binary bytestring - data-binary-ieee754 lens lens-aeson monad-loops template-haskell - text - ]; - executableHaskellDepends = [ - aeson base basic-prelude binary-conduit bytestring conduit - conduit-extra resourcet time yaml - ]; - testHaskellDepends = [ base basic-prelude tasty tasty-hunit ]; - description = "SwiftNav's SBP Library"; - license = stdenv.lib.licenses.lgpl3; - }) {}; - - "sbp_2_6_3" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, base , base64-bytestring, basic-prelude, binary, binary-conduit , bytestring, cmdargs, conduit, conduit-extra, data-binary-ieee754 @@ -204327,7 +201185,6 @@ self: { testHaskellDepends = [ base basic-prelude tasty tasty-hunit ]; description = "SwiftNav's SBP Library"; license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sbp2udp" = callPackage @@ -204355,33 +201212,6 @@ self: { , crackNum, deepseq, directory, doctest, filepath, generic-deriving , ghc, Glob, hlint, mtl, pretty, process, QuickCheck, random, syb , tasty, tasty-golden, tasty-hunit, tasty-quickcheck - , template-haskell, time, z3 - }: - mkDerivation { - pname = "sbv"; - version = "7.13"; - sha256 = "0bk400swnb4s98c5p71ml1px6jndaiqhf5dj7zmnliyplqcgpfik"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - array async base containers crackNum deepseq directory filepath - generic-deriving ghc mtl pretty process QuickCheck random syb - template-haskell time - ]; - testHaskellDepends = [ - base bytestring containers crackNum directory doctest filepath Glob - hlint mtl QuickCheck random syb tasty tasty-golden tasty-hunit - tasty-quickcheck template-haskell - ]; - testSystemDepends = [ z3 ]; - description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) z3;}; - - "sbv_8_3" = callPackage - ({ mkDerivation, array, async, base, bytestring, containers - , crackNum, deepseq, directory, doctest, filepath, generic-deriving - , ghc, Glob, hlint, mtl, pretty, process, QuickCheck, random, syb - , tasty, tasty-golden, tasty-hunit, tasty-quickcheck , template-haskell, time, transformers, z3 }: mkDerivation { @@ -204403,6 +201233,7 @@ self: { description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) z3;}; "sbvPlugin" = callPackage @@ -204607,21 +201438,6 @@ self: { }) {}; "scalpel" = callPackage - ({ mkDerivation, base, bytestring, curl, data-default, scalpel-core - , tagsoup, text - }: - mkDerivation { - pname = "scalpel"; - version = "0.5.1"; - sha256 = "03cbc0yahs8pzp1jz0mvfnd9sl80zd3ql18l9xswm8kh6m1ndpr0"; - libraryHaskellDepends = [ - base bytestring curl data-default scalpel-core tagsoup text - ]; - description = "A high level web scraping library for Haskell"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "scalpel_0_6_0" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, data-default , http-client, http-client-tls, scalpel-core, tagsoup, text }: @@ -204635,30 +201451,10 @@ self: { ]; description = "A high level web scraping library for Haskell"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "scalpel-core" = callPackage ({ mkDerivation, base, bytestring, containers, criterion - , data-default, fail, HUnit, regex-base, regex-tdfa, tagsoup, text - , vector - }: - mkDerivation { - pname = "scalpel-core"; - version = "0.5.1"; - sha256 = "1a99wazrgpvnjzsjk5az61f54hvppdxrrp2487nzndxpadlbh1cc"; - libraryHaskellDepends = [ - base bytestring containers data-default fail regex-base regex-tdfa - tagsoup text vector - ]; - testHaskellDepends = [ base HUnit regex-base regex-tdfa tagsoup ]; - benchmarkHaskellDepends = [ base criterion tagsoup text ]; - description = "A high level web scraping library for Haskell"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "scalpel-core_0_6_0" = callPackage - ({ mkDerivation, base, bytestring, containers, criterion , data-default, fail, HUnit, pointedlist, regex-base, regex-tdfa , tagsoup, text, vector }: @@ -204674,7 +201470,6 @@ self: { benchmarkHaskellDepends = [ base criterion tagsoup text ]; description = "A high level web scraping library for Haskell"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "scan" = callPackage @@ -205942,27 +202737,6 @@ self: { }: mkDerivation { pname = "sdl2"; - version = "2.4.1.0"; - sha256 = "0p4b12fmxps0sbnkqdfy0qw19s355yrkw7fgw6xz53wzq706k991"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base bytestring exceptions linear StateVar text transformers vector - ]; - librarySystemDepends = [ SDL2 ]; - libraryPkgconfigDepends = [ SDL2 ]; - testHaskellDepends = [ base deepseq linear vector weigh ]; - description = "Both high- and low-level bindings to the SDL library (version 2.0.4+)."; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) SDL2;}; - - "sdl2_2_5_0_0" = callPackage - ({ mkDerivation, base, bytestring, deepseq, exceptions, linear - , SDL2, StateVar, text, transformers, vector, weigh - }: - mkDerivation { - pname = "sdl2"; version = "2.5.0.0"; sha256 = "1x368yhdd55b3cvx8dvj1sj6nzygzigbhrwhssjs4k0rcxlwqfw8"; isLibrary = true; @@ -205976,7 +202750,6 @@ self: { testHaskellDepends = [ base deepseq linear vector weigh ]; description = "Both high- and low-level bindings to the SDL library (version 2.0.6+)."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) SDL2;}; "sdl2-cairo" = callPackage @@ -206043,6 +202816,8 @@ self: { libraryHaskellDepends = [ base sdl2 ]; description = "Run of the mill, frames per second timer implementation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sdl2-gfx" = callPackage @@ -206561,22 +203336,6 @@ self: { }) {sedna = null;}; "selda" = callPackage - ({ mkDerivation, base, bytestring, exceptions, hashable, mtl - , psqueues, text, time, unordered-containers - }: - mkDerivation { - pname = "selda"; - version = "0.3.4.0"; - sha256 = "1ww4v30ywmdshcf4fpgqj5ycd9c197xdlvnby366hzsm7byqq8wj"; - libraryHaskellDepends = [ - base bytestring exceptions hashable mtl psqueues text time - unordered-containers - ]; - description = "Multi-backend, high-level EDSL for interacting with SQL databases"; - license = stdenv.lib.licenses.mit; - }) {}; - - "selda_0_4_0_0" = callPackage ({ mkDerivation, base, bytestring, containers, exceptions, mtl , random, text, time, uuid-types }: @@ -206590,7 +203349,6 @@ self: { ]; description = "Multi-backend, high-level EDSL for interacting with SQL databases"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "selda-json" = callPackage @@ -206604,28 +203362,9 @@ self: { libraryHaskellDepends = [ aeson base bytestring selda text ]; description = "JSON support for the Selda database library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "selda-postgresql" = callPackage - ({ mkDerivation, base, bytestring, exceptions, postgresql-libpq - , selda, text - }: - mkDerivation { - pname = "selda-postgresql"; - version = "0.1.7.3"; - sha256 = "0ardh6ds8fmqy09y74nflsb8r5y4cvl2ddxcla0vzaf5xppx4czc"; - revision = "2"; - editedCabalFile = "1zrj412hkjjka4cvl5zj6gdpvdafmcny6xighi1glg67n8cmpb67"; - libraryHaskellDepends = [ - base bytestring exceptions postgresql-libpq selda text - ]; - description = "PostgreSQL backend for the Selda database EDSL"; - license = stdenv.lib.licenses.mit; - }) {}; - - "selda-postgresql_0_1_8_0" = callPackage ({ mkDerivation, base, bytestring, exceptions, postgresql-binary , postgresql-libpq, selda, selda-json, text, time, uuid-types }: @@ -206639,27 +203378,9 @@ self: { ]; description = "PostgreSQL backend for the Selda database EDSL"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "selda-sqlite" = callPackage - ({ mkDerivation, base, direct-sqlite, directory, exceptions, selda - , text - }: - mkDerivation { - pname = "selda-sqlite"; - version = "0.1.6.1"; - sha256 = "1qqrgqzcfwqzlcklm0qjvdy3ndn3zg8s5mp8744v76bd6z2xwq4d"; - revision = "2"; - editedCabalFile = "0gb8raqmy8r8xwjpx238mqar5gdfd4194si2ms1a9ndcrilkkqja"; - libraryHaskellDepends = [ - base direct-sqlite directory exceptions selda text - ]; - description = "SQLite backend for the Selda database EDSL"; - license = stdenv.lib.licenses.mit; - }) {}; - - "selda-sqlite_0_1_7_0" = callPackage ({ mkDerivation, base, bytestring, direct-sqlite, directory , exceptions, selda, text, time, uuid-types }: @@ -206673,7 +203394,6 @@ self: { ]; description = "SQLite backend for the Selda database EDSL"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "select" = callPackage @@ -206887,8 +203607,6 @@ self: { ]; description = "Align and Zip type-classes from the common Semialign ancestor"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "semialign-indexed" = callPackage @@ -206905,8 +203623,6 @@ self: { ]; description = "SemialignWithIndex, i.e. izip and ialign"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "semibounded-lattices" = callPackage @@ -206919,6 +203635,8 @@ self: { testHaskellDepends = [ base ]; description = "A Haskell implementation of semibounded lattices"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "semigroupoid-extras" = callPackage @@ -207092,21 +203810,6 @@ self: { "semirings" = callPackage ({ mkDerivation, base, containers, hashable, integer-gmp - , unordered-containers, vector - }: - mkDerivation { - pname = "semirings"; - version = "0.2.1.1"; - sha256 = "0s28qq6fk2zqzz6y76fa1ddrrmpax99mlkxhz89mw15hx04mnsjp"; - libraryHaskellDepends = [ - base containers hashable integer-gmp unordered-containers vector - ]; - description = "two monoids as one, in holy haskimony"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "semirings_0_4_2" = callPackage - ({ mkDerivation, base, containers, hashable, integer-gmp , unordered-containers }: mkDerivation { @@ -207120,7 +203823,6 @@ self: { ]; description = "two monoids as one, in holy haskimony"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "semver" = callPackage @@ -207794,34 +204496,6 @@ self: { "servant" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat, bifunctors - , bytestring, Cabal, cabal-doctest, case-insensitive, doctest - , hspec, hspec-discover, http-api-data, http-media, http-types - , mmorph, mtl, network-uri, QuickCheck, quickcheck-instances - , singleton-bool, string-conversions, tagged, text, transformers - , vault - }: - mkDerivation { - pname = "servant"; - version = "0.15"; - sha256 = "0fgsddg8yn23izk3g4bmax6rlh56qhx13j8h5n6fxr7mq34kagsg"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - aeson attoparsec base base-compat bifunctors bytestring - case-insensitive http-api-data http-media http-types mmorph mtl - network-uri QuickCheck singleton-bool string-conversions tagged - text transformers vault - ]; - testHaskellDepends = [ - aeson base base-compat bytestring doctest hspec mtl QuickCheck - quickcheck-instances string-conversions text transformers - ]; - testToolDepends = [ hspec-discover ]; - description = "A family of combinators for defining webservices APIs"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant_0_16_2" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base-compat, bifunctors , bytestring, Cabal, cabal-doctest, case-insensitive, deepseq , doctest, hspec, hspec-discover, http-api-data, http-media , http-types, mmorph, mtl, network-uri, QuickCheck @@ -207847,7 +204521,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "A family of combinators for defining webservices APIs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-JuicyPixels" = callPackage @@ -207916,33 +204589,6 @@ self: { ({ mkDerivation, aeson, base, bytestring, containers, hspec , hspec-discover, http-client, http-types, jose, QuickCheck , servant, servant-auth, servant-auth-server, servant-client - , servant-client-core, servant-server, text, time, transformers - , wai, warp - }: - mkDerivation { - pname = "servant-auth-client"; - version = "0.3.3.0"; - sha256 = "1pxkwpg1in3anamfvrp8gd7iihng0ikhl4k7ymz5d75ma1qwa2j9"; - revision = "3"; - editedCabalFile = "1kzyqd9hg7xld5s8qpm76l9ym48z81j6ycdwp3lb0f1p2d3aagcd"; - libraryHaskellDepends = [ - base bytestring containers servant servant-auth servant-client-core - text - ]; - testHaskellDepends = [ - aeson base bytestring hspec http-client http-types jose QuickCheck - servant servant-auth servant-auth-server servant-client - servant-server time transformers wai warp - ]; - testToolDepends = [ hspec-discover ]; - description = "servant-client/servant-auth compatibility"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-auth-client_0_4_0_0" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, hspec - , hspec-discover, http-client, http-types, jose, QuickCheck - , servant, servant-auth, servant-auth-server, servant-client , servant-client-core, servant-server, time, transformers, wai , warp }: @@ -207963,7 +204609,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "servant-client/servant-auth compatibility"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-auth-cookie" = callPackage @@ -208279,22 +204924,6 @@ self: { }: mkDerivation { pname = "servant-blaze"; - version = "0.8"; - sha256 = "155f20pizgkhn0hczwpxwxw1i99h0l6kfwwhs2r6bmr305aqisj6"; - revision = "2"; - editedCabalFile = "1cfla60vn4kk5gb7fawlp34jr2k6b2fprysq05561wdfv990x4bj"; - libraryHaskellDepends = [ base blaze-html http-media servant ]; - testHaskellDepends = [ base blaze-html servant-server wai warp ]; - description = "Blaze-html support for servant"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-blaze_0_9" = callPackage - ({ mkDerivation, base, blaze-html, http-media, servant - , servant-server, wai, warp - }: - mkDerivation { - pname = "servant-blaze"; version = "0.9"; sha256 = "1pfnpc6m7i8knndc1734fbzpfgmvdcpkd8cj0jyw139b70siz63r"; revision = "2"; @@ -208303,7 +204932,6 @@ self: { testHaskellDepends = [ base blaze-html servant-server wai warp ]; description = "Blaze-html support for servant"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-cassava" = callPackage @@ -208328,35 +204956,6 @@ self: { }) {}; "servant-checked-exceptions" = callPackage - ({ mkDerivation, aeson, base, bytestring, deepseq, hspec-wai - , http-media, http-types, profunctors, servant - , servant-checked-exceptions-core, servant-client - , servant-client-core, servant-docs, servant-server, tagged, tasty - , tasty-hspec, tasty-hunit, text, wai, world-peace - }: - mkDerivation { - pname = "servant-checked-exceptions"; - version = "2.0.0.0"; - sha256 = "127nav7z2zkgfgzpjjprqb6s55mbdj9z2p05knjx3mangs2q5wm7"; - revision = "1"; - editedCabalFile = "0h18x8gimmczgml4rj74kx3463pwrsyxl2vnd13ra5hj0q44d683"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring deepseq http-media http-types profunctors - servant servant-checked-exceptions-core servant-client - servant-client-core servant-docs servant-server tagged text wai - world-peace - ]; - testHaskellDepends = [ - base bytestring hspec-wai http-types servant servant-server tasty - tasty-hspec tasty-hunit wai - ]; - description = "Checked exceptions for Servant APIs"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-checked-exceptions_2_2_0_0" = callPackage ({ mkDerivation, base, bytestring, hspec-wai, http-types, servant , servant-checked-exceptions-core, servant-client , servant-client-core, servant-server, tasty, tasty-hspec @@ -208379,31 +204978,10 @@ self: { description = "Checked exceptions for Servant APIs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-checked-exceptions-core" = callPackage - ({ mkDerivation, aeson, base, bytestring, deepseq, doctest, Glob - , http-media, http-types, profunctors, servant, servant-docs - , tagged, text, world-peace - }: - mkDerivation { - pname = "servant-checked-exceptions-core"; - version = "2.0.0.0"; - sha256 = "0j5j7ai1b7nnsvzal27jy6hamwx5i2pyc1f6mmmb06r40cs53lxa"; - revision = "1"; - editedCabalFile = "1q2y4cri4h33cfdpgz95dczhvhmyrqajm7k6ypl3b8rw953qlzy7"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring deepseq http-media http-types profunctors - servant servant-docs tagged text world-peace - ]; - testHaskellDepends = [ base doctest Glob ]; - description = "Checked exceptions for Servant APIs"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-checked-exceptions-core_2_2_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, contravariant, doctest , Glob, http-media, http-types, mtl, profunctors, servant , servant-docs, tagged, text, transformers, world-peace @@ -208422,7 +205000,6 @@ self: { testHaskellDepends = [ base doctest Glob ]; description = "Checked exceptions for Servant APIs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-cli" = callPackage @@ -208456,39 +205033,6 @@ self: { "servant-client" = callPackage ({ mkDerivation, aeson, base, base-compat, bytestring, containers - , deepseq, entropy, exceptions, generics-sop, hspec, hspec-discover - , http-api-data, http-client, http-media, http-types, HUnit - , kan-extensions, markdown-unlit, monad-control, mtl, network - , QuickCheck, semigroupoids, servant, servant-client-core - , servant-server, stm, tdigest, text, time, transformers - , transformers-base, transformers-compat, wai, warp - }: - mkDerivation { - pname = "servant-client"; - version = "0.15"; - sha256 = "098aaickq6j6f0d7bl2y72fcl53xp2w29qg3gy7yls4z8wd76v1a"; - revision = "1"; - editedCabalFile = "1h3j8mpnrbpc1i4appf8g4zn7h30f6ybg6fg3w057kz18bk9y76f"; - libraryHaskellDepends = [ - base base-compat bytestring containers deepseq exceptions - http-client http-media http-types kan-extensions monad-control mtl - semigroupoids servant servant-client-core stm text time - transformers transformers-base transformers-compat - ]; - testHaskellDepends = [ - aeson base base-compat bytestring entropy generics-sop hspec - http-api-data http-client http-types HUnit kan-extensions - markdown-unlit mtl network QuickCheck servant servant-client-core - servant-server tdigest text transformers transformers-compat wai - warp - ]; - testToolDepends = [ hspec-discover markdown-unlit ]; - description = "Automatic derivation of querying functions for servant"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-client_0_16" = callPackage - ({ mkDerivation, aeson, base, base-compat, bytestring, containers , deepseq, entropy, exceptions, hspec, hspec-discover , http-api-data, http-client, http-media, http-types, HUnit , kan-extensions, markdown-unlit, monad-control, mtl, network @@ -208517,32 +205061,10 @@ self: { testToolDepends = [ hspec-discover markdown-unlit ]; description = "Automatic derivation of querying functions for servant"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-client-core" = callPackage ({ mkDerivation, aeson, base, base-compat, base64-bytestring - , bytestring, containers, deepseq, exceptions, free, generics-sop - , hspec, hspec-discover, http-media, http-types, network-uri - , QuickCheck, safe, servant, template-haskell, text, transformers - }: - mkDerivation { - pname = "servant-client-core"; - version = "0.15"; - sha256 = "0q3rrbdplzzj90kdb7cmb6qknsbd9dy4w5lkqcb95nndwgjlk3lv"; - libraryHaskellDepends = [ - aeson base base-compat base64-bytestring bytestring containers - deepseq exceptions free generics-sop http-media http-types - network-uri safe servant template-haskell text transformers - ]; - testHaskellDepends = [ base base-compat deepseq hspec QuickCheck ]; - testToolDepends = [ hspec-discover ]; - description = "Core functionality and class for client function generation for servant APIs"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-client-core_0_16" = callPackage - ({ mkDerivation, aeson, base, base-compat, base64-bytestring , bytestring, containers, deepseq, exceptions, free, hspec , hspec-discover, http-media, http-types, network-uri, QuickCheck , safe, servant, template-haskell, text, transformers @@ -208562,7 +205084,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Core functionality and class for client function generation for servant APIs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-client-namedargs" = callPackage @@ -208777,26 +205298,6 @@ self: { }) {}; "servant-elm" = callPackage - ({ mkDerivation, aeson, base, Diff, elm-export, hspec, HUnit, lens - , servant, servant-foreign, text, wl-pprint-text - }: - mkDerivation { - pname = "servant-elm"; - version = "0.5.0.0"; - sha256 = "0l5rjml46qbnq4p3d7zjk8zl9gnpz8m5n6n8yf8kgy89ybm6xnfr"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base elm-export lens servant servant-foreign text wl-pprint-text - ]; - testHaskellDepends = [ - aeson base Diff elm-export hspec HUnit servant text - ]; - description = "Automatically derive Elm functions to query servant webservices"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-elm_0_6_0_2" = callPackage ({ mkDerivation, aeson, base, Diff, directory, elm-bridge, hspec , HUnit, lens, servant, servant-client, servant-foreign, text , wl-pprint-text @@ -208816,7 +205317,6 @@ self: { ]; description = "Automatically derive Elm functions to query servant webservices"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-examples" = callPackage @@ -208861,6 +205361,8 @@ self: { aeson base exceptions http-types servant-server text warp ]; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-fiat-content" = callPackage @@ -208984,8 +205486,6 @@ self: { ]; description = "Servant combinators to facilitate writing GitHub webhooks"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-haxl-client" = callPackage @@ -209202,22 +205702,6 @@ self: { }: mkDerivation { pname = "servant-lucid"; - version = "0.8.1"; - sha256 = "0g8icz12ydyxyv710fhixswdphiri0b44pw5p0dr21cvwbaxawb6"; - revision = "1"; - editedCabalFile = "0jna96jy6nmhk6w5zxdd3qn3vlrnhnvh4s3f2bqkn3c0had5py7d"; - libraryHaskellDepends = [ base http-media lucid servant text ]; - testHaskellDepends = [ base lucid servant-server wai warp ]; - description = "Servant support for lucid"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-lucid_0_9" = callPackage - ({ mkDerivation, base, http-media, lucid, servant, servant-server - , text, wai, warp - }: - mkDerivation { - pname = "servant-lucid"; version = "0.9"; sha256 = "1xamwcijd03cynml5c2hr577qairybyrqd90ixyb1a94lql6agbf"; revision = "2"; @@ -209226,7 +205710,6 @@ self: { testHaskellDepends = [ base lucid servant-server wai warp ]; description = "Servant support for lucid"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-machines" = callPackage @@ -209445,6 +205928,8 @@ self: { ]; description = "Use Pandoc to render servant API documentation"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-pipes" = callPackage @@ -209548,6 +206033,8 @@ self: { ]; description = "Generate PureScript accessor functions for you servant API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-pushbullet-client" = callPackage @@ -209633,34 +206120,6 @@ self: { }: mkDerivation { pname = "servant-rawm"; - version = "0.3.0.0"; - sha256 = "09va9glqkyarxsq9296br55ka8j5jd5nlb833hndpf4ib10yxzp9"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring filepath http-client http-media http-types lens - resourcet servant-client servant-client-core servant-docs - servant-server wai wai-app-static - ]; - testHaskellDepends = [ - base bytestring doctest Glob hspec-wai http-client http-media - http-types servant servant-client servant-client-core - servant-server tasty tasty-hspec tasty-hunit text transformers wai - warp - ]; - description = "Embed a raw 'Application' in a Servant API"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-rawm_0_3_1_0" = callPackage - ({ mkDerivation, base, bytestring, doctest, filepath, Glob - , hspec-wai, http-client, http-media, http-types, lens, resourcet - , servant, servant-client, servant-client-core, servant-docs - , servant-server, tasty, tasty-hspec, tasty-hunit, text - , transformers, wai, wai-app-static, warp - }: - mkDerivation { - pname = "servant-rawm"; version = "0.3.1.0"; sha256 = "055ys4gkywy1ld0d736fsmc39fix2b4ad4myb7qn0sbax6y9zn3q"; isLibrary = true; @@ -209679,6 +206138,7 @@ self: { description = "Embed a raw 'Application' in a Servant API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-reason" = callPackage @@ -209807,43 +206267,6 @@ self: { }: mkDerivation { pname = "servant-server"; - version = "0.15"; - sha256 = "1qlkdgls2z71sx09lbkrqcxwx1wam3hn7dnyps6z2i7qixhlw0wq"; - isLibrary = true; - isExecutable = true; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - base base-compat base64-bytestring bytestring containers exceptions - filepath http-api-data http-media http-types monad-control mtl - network network-uri resourcet servant string-conversions tagged - text transformers transformers-base wai wai-app-static word8 - ]; - executableHaskellDepends = [ - aeson base base-compat servant text wai warp - ]; - testHaskellDepends = [ - aeson base base-compat base64-bytestring bytestring directory - doctest hspec hspec-wai http-types mtl QuickCheck resourcet safe - servant should-not-typecheck string-conversions temporary text - transformers transformers-compat wai wai-extra - ]; - testToolDepends = [ hspec-discover ]; - description = "A family of combinators for defining webservices APIs and serving them"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-server_0_16_2" = callPackage - ({ mkDerivation, aeson, base, base-compat, base64-bytestring - , bytestring, Cabal, cabal-doctest, containers, directory, doctest - , exceptions, filepath, hspec, hspec-discover, hspec-wai - , http-api-data, http-media, http-types, monad-control, mtl - , network, network-uri, QuickCheck, resourcet, safe, servant - , should-not-typecheck, string-conversions, tagged, temporary, text - , transformers, transformers-base, transformers-compat, wai - , wai-app-static, wai-extra, warp, word8 - }: - mkDerivation { - pname = "servant-server"; version = "0.16.2"; sha256 = "1l4kgjg5z775bi76hy7cb70qwvmkai4rxqkgp0ildsjgsvf8qb80"; isLibrary = true; @@ -209867,7 +206290,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "A family of combinators for defining webservices APIs and serving them"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-server-namedargs" = callPackage @@ -209998,6 +206420,8 @@ self: { ]; description = "Embed a directory of static files in your Servant server"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-streaming" = callPackage @@ -210012,6 +206436,8 @@ self: { testHaskellDepends = [ base hspec http-types QuickCheck servant ]; description = "Servant combinators for the 'streaming' package"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-streaming-client" = callPackage @@ -210112,6 +206538,8 @@ self: { executableHaskellDepends = [ base purescript-bridge ]; description = "When REST is not enough ..."; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-swagger" = callPackage @@ -210156,6 +206584,8 @@ self: { ]; description = "Swagger Tags for Servant"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-swagger-ui" = callPackage @@ -210298,6 +206728,8 @@ self: { ]; description = "Small library providing WebSocket endpoints for servant"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-xml" = callPackage @@ -210557,6 +206989,8 @@ self: { ]; description = "Storage backend for serversession using Redis"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "serversession-frontend-snap" = callPackage @@ -210783,8 +207217,6 @@ self: { ]; description = "Solve exact set cover problems like Sudoku, 8 Queens, Soma Cube, Tetris Cube"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "set-extra" = callPackage @@ -211048,6 +207480,34 @@ self: { }: mkDerivation { pname = "sexp-grammar"; + version = "2.0.2"; + sha256 = "1cmn5y72wp9dlzqzrv4rmfb1zm3zw517la0kf0vgyv3nhsn58397"; + libraryHaskellDepends = [ + array base bytestring containers deepseq invertible-grammar + prettyprinter recursion-schemes scientific semigroups text + utf8-string + ]; + libraryToolDepends = [ alex happy ]; + testHaskellDepends = [ + base containers invertible-grammar prettyprinter QuickCheck + scientific semigroups tasty tasty-hunit tasty-quickcheck text + utf8-string + ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq text + ]; + description = "Invertible grammar combinators for S-expressions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "sexp-grammar_2_1_0" = callPackage + ({ mkDerivation, alex, array, base, bytestring, containers + , criterion, deepseq, happy, invertible-grammar, prettyprinter + , QuickCheck, recursion-schemes, scientific, semigroups, tasty + , tasty-hunit, tasty-quickcheck, text, utf8-string + }: + mkDerivation { + pname = "sexp-grammar"; version = "2.1.0"; sha256 = "139sqr50bba74h2r6gdivzsgkqjwq1gcah54zw2jkwzhlfk03fm1"; libraryHaskellDepends = [ @@ -211066,6 +207526,7 @@ self: { ]; description = "Invertible grammar combinators for S-expressions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sexp-show" = callPackage @@ -211205,6 +207666,8 @@ self: { ]; description = "Stochastic gradient descent library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sgf" = callPackage @@ -211428,8 +207891,8 @@ self: { }: mkDerivation { pname = "shake-ats"; - version = "1.10.2.1"; - sha256 = "1y85rrrrcd7jz51ir6cwa3w23ldi4fkc215iqj1crbxfjzrphacn"; + version = "1.10.2.2"; + sha256 = "070vvzz0nmdal9ja43l8s4dll2iwxjzd3lmlynkdm1v9qzj0iw67"; libraryHaskellDepends = [ base binary dependency directory hs2ats language-ats microlens shake shake-c shake-cabal shake-ext text @@ -211565,8 +208028,8 @@ self: { ({ mkDerivation, base, cpphs, shake }: mkDerivation { pname = "shake-literate"; - version = "0.1.0.0"; - sha256 = "1kliv9i9libcyzm0bccxi226rd69kvjxi9hi3n4y7zjbbp40cqgd"; + version = "0.1.0.1"; + sha256 = "0wx3mh62b8kq20qw15zg35nl4l066i11mzgj0vxlvys5a6902ijn"; libraryHaskellDepends = [ base cpphs shake ]; description = "Rules for building literate programs in shake"; license = stdenv.lib.licenses.bsd3; @@ -211587,6 +208050,19 @@ self: { broken = true; }) {}; + "shake-minify-css" = callPackage + ({ mkDerivation, base, directory, filepath, hasmin, shake, text }: + mkDerivation { + pname = "shake-minify-css"; + version = "0.1.0.0"; + sha256 = "0gy3h108gbv93jr74sp3wa3r3vkm8k53wr3z9bmm6c9rg7zwr2q7"; + libraryHaskellDepends = [ + base directory filepath hasmin shake text + ]; + description = "Shake rules for CSS"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "shake-pack" = callPackage ({ mkDerivation, base, bytestring, bzlib, shake, tar }: mkDerivation { @@ -212096,6 +208572,17 @@ self: { broken = true; }) {}; + "shell-utility" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "shell-utility"; + version = "0.0"; + sha256 = "1s3482vxllmmjbcqbwsrql9ka6zng7qbbqk3kfjs6dvkcs710hbs"; + libraryHaskellDepends = [ base ]; + description = "Utility functions for writing command-line programs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "shellish" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, mtl , process, strict, time, unix-compat @@ -212219,37 +208706,6 @@ self: { , enclosed-exceptions, exceptions, filepath, hspec, hspec-contrib , HUnit, lifted-async, lifted-base, monad-control, mtl, process , system-fileio, system-filepath, text, time, transformers - , transformers-base, unix-compat - }: - mkDerivation { - pname = "shelly"; - version = "1.8.0"; - sha256 = "1y08pdw49yk4hbipgfwjab0wa85ng0mkypch5l0p53frykjm2zvk"; - revision = "1"; - editedCabalFile = "17achybammxg5i7zcmwlfcb7xk77q3lfvck3gqa9ljfb6ksgrxb7"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - async base bytestring containers directory enclosed-exceptions - exceptions lifted-async lifted-base monad-control mtl process - system-fileio system-filepath text time transformers - transformers-base unix-compat - ]; - testHaskellDepends = [ - async base bytestring containers directory enclosed-exceptions - exceptions filepath hspec hspec-contrib HUnit lifted-async - lifted-base monad-control mtl process system-fileio system-filepath - text time transformers transformers-base unix-compat - ]; - description = "shell-like (systems) programming in Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "shelly_1_8_1" = callPackage - ({ mkDerivation, async, base, bytestring, containers, directory - , enclosed-exceptions, exceptions, filepath, hspec, hspec-contrib - , HUnit, lifted-async, lifted-base, monad-control, mtl, process - , system-fileio, system-filepath, text, time, transformers , transformers-base, unix, unix-compat }: mkDerivation { @@ -212274,7 +208730,6 @@ self: { ]; description = "shell-like (systems) programming in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shelly-extra" = callPackage @@ -212313,27 +208768,28 @@ self: { "shh" = callPackage ({ mkDerivation, async, base, bytestring, containers, deepseq - , directory, doctest, filepath, mtl, process, split, tasty - , tasty-hunit, tasty-quickcheck, template-haskell, temporary, unix - , utf8-string + , directory, doctest, filepath, markdown-unlit, mtl, process, split + , stringsearch, tasty, tasty-hunit, tasty-quickcheck + , template-haskell, temporary, unix, utf8-string }: mkDerivation { pname = "shh"; - version = "0.6.0.0"; - sha256 = "10l13iyik4m0z2c4f2cjlj5kjg51i4g4z6gp1vldqfa0i3shzvvz"; + version = "0.7.0.2"; + sha256 = "0b9q4pg1gvnw18gxba8cd7b9crj8d822vivsvgagcjmhm6a8y3pk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ async base bytestring containers deepseq directory filepath mtl - process split template-haskell unix utf8-string + process split stringsearch template-haskell unix utf8-string ]; executableHaskellDepends = [ async base bytestring deepseq directory temporary unix ]; testHaskellDepends = [ - async base bytestring directory doctest tasty tasty-hunit - tasty-quickcheck utf8-string + async base bytestring directory doctest filepath markdown-unlit + tasty tasty-hunit tasty-quickcheck utf8-string ]; + testToolDepends = [ markdown-unlit ]; description = "Simple shell scripting from Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -212599,22 +209055,6 @@ self: { }) {}; "show-prettyprint" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, doctest, prettyprinter - , trifecta - }: - mkDerivation { - pname = "show-prettyprint"; - version = "0.2.3"; - sha256 = "01wg1bzp6dylysbm9rfq8n0ci7yzg3gw6jkzy8kzmsydgs5c54pd"; - libraryHaskellDepends = [ - ansi-wl-pprint base prettyprinter trifecta - ]; - testHaskellDepends = [ base doctest ]; - description = "Robust prettyprinter for output of auto-generated Show instances"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "show-prettyprint_0_3_0_1" = callPackage ({ mkDerivation, ansi-wl-pprint, base, containers, doctest , prettyprinter, trifecta }: @@ -212630,7 +209070,6 @@ self: { ]; description = "Robust prettyprinter for output of auto-generated Show instances"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "show-type" = callPackage @@ -212889,6 +209328,8 @@ self: { ]; description = "Rounding rationals to significant digits and decimal places"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sigma-ij" = callPackage @@ -212934,6 +209375,8 @@ self: { ]; description = "Arithmetic over signs and sets of signs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "signal" = callPackage @@ -212985,25 +209428,12 @@ self: { ({ mkDerivation, base, deepseq, directory, nanospec, temporary }: mkDerivation { pname = "silently"; - version = "1.2.5"; - sha256 = "0f9qm3f7y0hpxn6mddhhg51mm1r134qkvd2kr8r6192ka1ijbxnf"; - libraryHaskellDepends = [ base deepseq directory ]; - testHaskellDepends = [ base deepseq directory nanospec temporary ]; - description = "Prevent or capture writing to stdout and other handles"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "silently_1_2_5_1" = callPackage - ({ mkDerivation, base, deepseq, directory, nanospec, temporary }: - mkDerivation { - pname = "silently"; version = "1.2.5.1"; sha256 = "1lgs1gsr5dp0x21diqn4l03fxgai2kgdmj85gqp0iz3zykvbmjbz"; libraryHaskellDepends = [ base deepseq directory ]; testHaskellDepends = [ base deepseq directory nanospec temporary ]; description = "Prevent or capture writing to stdout and other handles"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "silvi" = callPackage @@ -213089,8 +209519,6 @@ self: { ]; description = "A minimalist web framework for the WAI server interface"; license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "simple-actors" = callPackage @@ -213182,46 +209610,22 @@ self: { ({ mkDerivation, base, Cabal, directory, filepath }: mkDerivation { pname = "simple-cabal"; - version = "0.0.0"; - sha256 = "051xfg48y09qa6avndllv29nibpchys5ksp38d1p3lk82qqywvqd"; - libraryHaskellDepends = [ base Cabal directory filepath ]; - description = "Cabal file wrapper library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "simple-cabal_0_0_0_1" = callPackage - ({ mkDerivation, base, Cabal, directory, filepath }: - mkDerivation { - pname = "simple-cabal"; version = "0.0.0.1"; sha256 = "17v22v9sb8z2jbr76vv577hxcvypfkpmji2k8yzwd2kxjssxpjrn"; libraryHaskellDepends = [ base Cabal directory filepath ]; description = "Cabal file wrapper library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "simple-cmd" = callPackage ({ mkDerivation, base, directory, filepath, process, unix }: mkDerivation { pname = "simple-cmd"; - version = "0.1.4"; - sha256 = "1g63c0bdm3231aqf12i45nsfpy6bvl1w3nn0jcbbg2hij377y9rg"; - libraryHaskellDepends = [ base directory filepath process unix ]; - description = "Simple String-based process commands"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "simple-cmd_0_2_0_1" = callPackage - ({ mkDerivation, base, directory, filepath, process, unix }: - mkDerivation { - pname = "simple-cmd"; version = "0.2.0.1"; sha256 = "0kd0kr27q72ay5jzrnyqnbbfl4q1lyrlq13s74iphxx4s2yzn03p"; libraryHaskellDepends = [ base directory filepath process unix ]; description = "Simple String-based process commands"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "simple-cmd-args" = callPackage @@ -213667,8 +210071,6 @@ self: { ]; description = "Connector package for integrating postgresql-orm with the Simple web framework"; license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "simple-reflect" = callPackage @@ -213745,8 +210147,6 @@ self: { ]; description = "Cookie-based session management for the Simple web framework"; license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "simple-sessions" = callPackage @@ -213800,6 +210200,8 @@ self: { testHaskellDepends = [ base extra tasty tasty-hunit text ]; description = "source code editing utilities"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "simple-stacked-vm" = callPackage @@ -213865,8 +210267,6 @@ self: { ]; description = "A basic template language for the Simple web framework"; license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "simple-text-format" = callPackage @@ -213911,8 +210311,6 @@ self: { libraryHaskellDepends = [ base first-class-families ]; description = "Simple arithmetic with SI units using type-checked dimensional analysis"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "simple-vec3" = callPackage @@ -213921,25 +210319,6 @@ self: { }: mkDerivation { pname = "simple-vec3"; - version = "0.4.0.10"; - sha256 = "0dyr9bg3y8613hd0zz7knkniq7p0hxm7w9pjs0jjhq586g0qh5ql"; - libraryHaskellDepends = [ base QuickCheck vector ]; - testHaskellDepends = [ - base doctest doctest-driver-gen tasty tasty-quickcheck - ]; - benchmarkHaskellDepends = [ base criterion vector ]; - description = "Three-dimensional vectors of doubles with basic operations"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "simple-vec3_0_6" = callPackage - ({ mkDerivation, base, criterion, doctest, doctest-driver-gen - , QuickCheck, tasty, tasty-quickcheck, vector - }: - mkDerivation { - pname = "simple-vec3"; version = "0.6"; sha256 = "1vw03xlnf8hj6rlcgpblg3swcbvqj4qp04zdv3a9j2a47j780qhh"; libraryHaskellDepends = [ base QuickCheck vector ]; @@ -214235,19 +210614,6 @@ self: { }) {inherit (pkgs.xorg) libXft;}; "singleton-bool" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "singleton-bool"; - version = "0.1.4"; - sha256 = "0apvzb6ym0fnm4rx7paz6ivv72ahzn2bxhvyd1drw50ypvicd581"; - revision = "1"; - editedCabalFile = "0ccd49z9xwa8gr8sclmmn0zc4xq39yyjws4zr6lrw3xjql130nsx"; - libraryHaskellDepends = [ base ]; - description = "Type level booleans"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "singleton-bool_0_1_5" = callPackage ({ mkDerivation, base, dec }: mkDerivation { pname = "singleton-bool"; @@ -214256,7 +210622,6 @@ self: { libraryHaskellDepends = [ base dec ]; description = "Type level booleans"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "singleton-dict" = callPackage @@ -214843,29 +211208,6 @@ self: { }: mkDerivation { pname = "skylighting"; - version = "0.7.7"; - sha256 = "03nn5z67jg45myrcmbwkz06z4ywy06whbc0jhc3ycpw9wfy5iqvy"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson ansi-terminal attoparsec base base64-bytestring binary - blaze-html bytestring case-insensitive colour containers directory - filepath hxt mtl regex-pcre-builtin safe skylighting-core text - utf8-string - ]; - description = "syntax highlighting library"; - license = stdenv.lib.licenses.gpl2; - }) {}; - - "skylighting_0_8_2" = callPackage - ({ mkDerivation, aeson, ansi-terminal, attoparsec, base - , base64-bytestring, binary, blaze-html, bytestring - , case-insensitive, colour, containers, directory, filepath, hxt - , mtl, regex-pcre-builtin, safe, skylighting-core, text - , utf8-string - }: - mkDerivation { - pname = "skylighting"; version = "0.8.2"; sha256 = "0a81hd4f0xlc8as5lh454gkbyxndaxyj7lblkfk92j173nyx69cz"; isLibrary = true; @@ -214878,7 +211220,6 @@ self: { ]; description = "syntax highlighting library"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "skylighting-core" = callPackage @@ -214891,38 +211232,6 @@ self: { }: mkDerivation { pname = "skylighting-core"; - version = "0.7.7"; - sha256 = "0zd7gsybi02rigbgly63d8asfz8xy1xlnfy90m92zayizkagyg49"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson ansi-terminal attoparsec base base64-bytestring binary - blaze-html bytestring case-insensitive colour containers directory - filepath hxt mtl regex-pcre-builtin safe text transformers - utf8-string - ]; - testHaskellDepends = [ - aeson base bytestring containers Diff directory filepath HUnit - pretty-show QuickCheck random tasty tasty-golden tasty-hunit - tasty-quickcheck text - ]; - benchmarkHaskellDepends = [ - base containers criterion directory filepath text - ]; - description = "syntax highlighting library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "skylighting-core_0_8_2" = callPackage - ({ mkDerivation, aeson, ansi-terminal, attoparsec, base - , base64-bytestring, binary, blaze-html, bytestring - , case-insensitive, colour, containers, criterion, Diff, directory - , filepath, HUnit, hxt, mtl, pretty-show, QuickCheck, random - , regex-pcre-builtin, safe, tasty, tasty-golden, tasty-hunit - , tasty-quickcheck, text, transformers, utf8-string - }: - mkDerivation { - pname = "skylighting-core"; version = "0.8.2"; sha256 = "1nd11170r7xwv0hy21bx9nz7173ijbqkh7r8504ixjkwckgr2zs0"; isLibrary = true; @@ -214943,7 +211252,6 @@ self: { ]; description = "syntax highlighting library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "skylighting-extensions" = callPackage @@ -215138,6 +211446,8 @@ self: { ]; description = "A note taking CLI tool"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "slave-thread" = callPackage @@ -215898,24 +212208,6 @@ self: { "smtp-mail" = callPackage ({ mkDerivation, array, base, base16-bytestring, base64-bytestring - , bytestring, cryptohash, filepath, mime-mail, network, text - }: - mkDerivation { - pname = "smtp-mail"; - version = "0.1.4.6"; - sha256 = "1g0lsbd9h8bhk4xddgzm96i8fy233904jnqnl4i94ld2hzpwpnl6"; - revision = "1"; - editedCabalFile = "1lvzami2vzrkgz5na71k1yi7346xdarxm0sbi6alq3wbpj1raakq"; - libraryHaskellDepends = [ - array base base16-bytestring base64-bytestring bytestring - cryptohash filepath mime-mail network text - ]; - description = "Simple email sending via SMTP"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "smtp-mail_0_2_0_0" = callPackage - ({ mkDerivation, array, base, base16-bytestring, base64-bytestring , bytestring, connection, cryptohash, filepath, mime-mail, network , network-bsd, text }: @@ -215931,7 +212223,6 @@ self: { ]; description = "Simple email sending via SMTP"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "smtp-mail-ng" = callPackage @@ -216094,6 +212385,8 @@ self: { ]; description = "Accept header branching for the Snap web framework"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "snap-app" = callPackage @@ -216382,48 +212675,6 @@ self: { }: mkDerivation { pname = "snap-server"; - version = "1.1.0.0"; - sha256 = "0vvw9n8xs272qdlrf3dxhnva41zh3awi7pf022rrjj75lj8a77i4"; - revision = "3"; - editedCabalFile = "0a9d3nqb5rvgm25nak68lp6yj9m6cwhbgdbg5l7ib5i2czcg7yjh"; - configureFlags = [ "-fopenssl" ]; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - attoparsec base blaze-builder bytestring bytestring-builder - case-insensitive clock containers filepath HsOpenSSL io-streams - io-streams-haproxy lifted-base mtl network old-locale - openssl-streams snap-core text time unix unix-compat vector - ]; - testHaskellDepends = [ - attoparsec base base16-bytestring blaze-builder bytestring - bytestring-builder case-insensitive clock containers deepseq - directory filepath HsOpenSSL http-common http-streams HUnit - io-streams io-streams-haproxy lifted-base monad-control mtl network - old-locale openssl-streams parallel QuickCheck random snap-core - test-framework test-framework-hunit test-framework-quickcheck2 text - threads time transformers unix unix-compat vector - ]; - benchmarkHaskellDepends = [ - attoparsec base blaze-builder bytestring bytestring-builder - criterion io-streams io-streams-haproxy snap-core vector - ]; - description = "A web server for the Snap Framework"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "snap-server_1_1_1_1" = callPackage - ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder - , bytestring, bytestring-builder, case-insensitive, clock - , containers, criterion, deepseq, directory, filepath, HsOpenSSL - , http-common, http-streams, HUnit, io-streams, io-streams-haproxy - , lifted-base, monad-control, mtl, network, old-locale - , openssl-streams, parallel, QuickCheck, random, snap-core - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , text, threads, time, transformers, unix, unix-compat, vector - }: - mkDerivation { - pname = "snap-server"; version = "1.1.1.1"; sha256 = "0lw475wp0lnrbgc3jcfif3qjjc3pmrh2k74d8cgpnc1304g6a2s5"; revision = "1"; @@ -216452,7 +212703,6 @@ self: { ]; description = "A web server for the Snap Framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snap-stream" = callPackage @@ -217998,19 +214248,6 @@ self: { }) {}; "socks" = callPackage - ({ mkDerivation, base, bytestring, cereal, network }: - mkDerivation { - pname = "socks"; - version = "0.5.6"; - sha256 = "0f44qy74i0n6ll3jym0a2ipafkpw1h67amcpqmj8iq95h21wsqzs"; - revision = "1"; - editedCabalFile = "19f6yzalxbvw0zi1z8wi0vz7s21p5anvfaqsaszppnkgk6j6nnvn"; - libraryHaskellDepends = [ base bytestring cereal network ]; - description = "Socks proxy (ver 5)"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "socks_0_6_0" = callPackage ({ mkDerivation, base, basement, bytestring, cereal, network }: mkDerivation { pname = "socks"; @@ -218021,7 +214258,6 @@ self: { ]; description = "Socks proxy (ver 5)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sodium" = callPackage @@ -218774,6 +215010,26 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "sparse-tensor" = callPackage + ({ mkDerivation, ad, base, bytestring, cereal, containers, deepseq + , eigen, ghc-typelits-knownnat, ghc-typelits-natnormalise, parallel + , singletons, tf-random, zlib + }: + mkDerivation { + pname = "sparse-tensor"; + version = "0.1.0.0"; + sha256 = "039i9d3w3xxkxvkqs59d82qm0yp0w23w7lrcfdmnb6bgc228mjvl"; + libraryHaskellDepends = [ + ad base bytestring cereal containers deepseq eigen + ghc-typelits-knownnat ghc-typelits-natnormalise parallel singletons + tf-random zlib + ]; + description = "typesafe tensor algebra library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "sparsebit" = callPackage ({ mkDerivation, base, haskell98 }: mkDerivation { @@ -219006,17 +215262,17 @@ self: { }) {}; "spectral-clustering" = callPackage - ({ mkDerivation, base, clustering, containers, eigen, hmatrix + ({ mkDerivation, base, clustering, containers, hmatrix , hmatrix-svdlibc, mwc-random, safe, sparse-linear-algebra , statistics, vector }: mkDerivation { pname = "spectral-clustering"; - version = "0.3.1.0"; - sha256 = "140njrq73nalkm7dp9vyk3hz027jj0ppgjqdr3qcz93a9lkzdsyh"; + version = "0.3.1.1"; + sha256 = "02fmg0bkhvsfh6k6p8bfpfc08isnn5p5h55kdnkm1d6jmixdkrzy"; libraryHaskellDepends = [ - base clustering containers eigen hmatrix hmatrix-svdlibc mwc-random - safe sparse-linear-algebra statistics vector + base clustering containers hmatrix hmatrix-svdlibc mwc-random safe + sparse-linear-algebra statistics vector ]; description = "Library for spectral clustering"; license = stdenv.lib.licenses.gpl3; @@ -219037,12 +215293,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "speculate_0_4_0" = callPackage + "speculate_0_4_1" = callPackage ({ mkDerivation, base, cmdargs, containers, express, leancheck }: mkDerivation { pname = "speculate"; - version = "0.4.0"; - sha256 = "12h4lci5547fb1g21xh3fbq1d7fmn3w54ppqdnh8h35aa0jqw9hl"; + version = "0.4.1"; + sha256 = "1fyj6kizwwb2vpvn17s7gx4swmzsziwmf6mmxaldbrzkha46y9hn"; libraryHaskellDepends = [ base cmdargs containers express leancheck ]; @@ -219460,6 +215716,8 @@ self: { testHaskellDepends = [ base invariant lens QuickCheck ]; description = "Split Epimorphisms and Monomorphisms"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "split-record" = callPackage @@ -219493,27 +215751,6 @@ self: { "splitmix" = callPackage ({ mkDerivation, async, base, base-compat-batteries, bytestring - , containers, criterion, deepseq, process, random, tf-random, time - , vector - }: - mkDerivation { - pname = "splitmix"; - version = "0.0.2"; - sha256 = "1y9vlik5icwimw6c8zh9pzgp0pbxvwxg48r54qsypnn1p4dbgaz6"; - libraryHaskellDepends = [ base deepseq random time ]; - testHaskellDepends = [ - async base base-compat-batteries bytestring deepseq process random - tf-random vector - ]; - benchmarkHaskellDepends = [ - base containers criterion random tf-random - ]; - description = "Fast Splittable PRNG"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "splitmix_0_0_3" = callPackage - ({ mkDerivation, async, base, base-compat-batteries, bytestring , clock, containers, criterion, deepseq, HUnit, process, random , tf-random, time, vector }: @@ -219531,7 +215768,6 @@ self: { ]; description = "Fast Splittable PRNG"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "splitter" = callPackage @@ -220125,8 +216361,6 @@ self: { ]; description = "A file-packing application"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "sr-extra" = callPackage @@ -220541,6 +216775,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "stache_2_1_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , deepseq, directory, file-embed, filepath, hspec, hspec-discover + , hspec-megaparsec, megaparsec, mtl, template-haskell, text + , unordered-containers, vector, yaml + }: + mkDerivation { + pname = "stache"; + version = "2.1.0"; + sha256 = "1q34h46px7miy2kx1yzaj785ai70mkchmijpdq2iih1fffir8kvk"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring containers deepseq directory filepath + megaparsec mtl template-haskell text unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring containers file-embed hspec hspec-megaparsec + megaparsec template-haskell text yaml + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + aeson base criterion deepseq megaparsec text + ]; + description = "Mustache templates for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "stack" = callPackage ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal, array , async, attoparsec, base, base64-bytestring, bytestring, Cabal @@ -221312,6 +217574,8 @@ self: { testHaskellDepends = [ base containers doctest graphviz text ]; description = "Ascii DAG(Directed acyclic graph) for visualization of dataflow"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "staf" = callPackage @@ -222297,6 +218561,8 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Positive rational numbers represented as paths in the Stern-Brocot tree"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stgi" = callPackage @@ -222648,6 +218914,8 @@ self: { testHaskellDepends = [ async base QuickCheck random Unique ]; description = "STM wrapper around Control.Concurrent.Supply."; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stm-tlist" = callPackage @@ -222926,59 +219194,6 @@ self: { }: mkDerivation { pname = "store"; - version = "0.5.1.1"; - sha256 = "1lp2kcrb4d3wsyd1cfmw3927w693lq9hj2anv0j993wvpdvd1cgl"; - revision = "1"; - editedCabalFile = "0v9rvm94afixryskpm7hn6cc6qkfciw3q7yi1dvrsq2rq75jbamk"; - libraryHaskellDepends = [ - array async base base-orphans base64-bytestring bifunctors - bytestring containers contravariant cryptohash deepseq directory - filepath free ghc-prim hashable hspec hspec-smallcheck integer-gmp - lifted-base monad-control mono-traversable network primitive - resourcet safe semigroups smallcheck store-core syb - template-haskell text th-lift th-lift-instances th-orphans - th-reify-many th-utilities time transformers unordered-containers - vector void - ]; - testHaskellDepends = [ - array async base base-orphans base64-bytestring bifunctors - bytestring clock containers contravariant cryptohash deepseq - directory filepath free ghc-prim hashable hspec hspec-smallcheck - integer-gmp lifted-base monad-control mono-traversable network - primitive resourcet safe semigroups smallcheck store-core syb - template-haskell text th-lift th-lift-instances th-orphans - th-reify-many th-utilities time transformers unordered-containers - vector void - ]; - benchmarkHaskellDepends = [ - array async base base-orphans base64-bytestring bifunctors - bytestring cereal cereal-vector containers contravariant criterion - cryptohash deepseq directory filepath free ghc-prim hashable hspec - hspec-smallcheck integer-gmp lifted-base monad-control - mono-traversable network primitive resourcet safe semigroups - smallcheck store-core syb template-haskell text th-lift - th-lift-instances th-orphans th-reify-many th-utilities time - transformers unordered-containers vector vector-binary-instances - void weigh - ]; - description = "Fast binary serialization"; - license = stdenv.lib.licenses.mit; - }) {}; - - "store_0_5_1_2" = callPackage - ({ mkDerivation, array, async, base, base-orphans - , base64-bytestring, bifunctors, bytestring, cereal, cereal-vector - , clock, containers, contravariant, criterion, cryptohash, deepseq - , directory, filepath, free, ghc-prim, hashable, hspec - , hspec-smallcheck, integer-gmp, lifted-base, monad-control - , mono-traversable, network, primitive, resourcet, safe, semigroups - , smallcheck, store-core, syb, template-haskell, text, th-lift - , th-lift-instances, th-orphans, th-reify-many, th-utilities, time - , transformers, unordered-containers, vector - , vector-binary-instances, void, weigh - }: - mkDerivation { - pname = "store"; version = "0.5.1.2"; sha256 = "1abwlcj0z17hj5h94cbg1sgqfdsdgjhgfgd2aaspsn4zdfk5bjc5"; libraryHaskellDepends = [ @@ -223014,7 +219229,6 @@ self: { ]; description = "Fast binary serialization"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "store-core" = callPackage @@ -223095,8 +219309,8 @@ self: { }: mkDerivation { pname = "stratosphere"; - version = "0.29.1"; - sha256 = "0j3mb09k498xynhc82cnsknzkbjwn9lvvanrz78jpx4fhh73zrlz"; + version = "0.40.0"; + sha256 = "0xj8bclyfvhdw12jfndg6pivzrbhqjf2qky383n0w6if11cfli1z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -223112,15 +219326,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "stratosphere_0_40_0" = callPackage + "stratosphere_0_41_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers , hashable, hspec, hspec-discover, lens, template-haskell, text , unordered-containers }: mkDerivation { pname = "stratosphere"; - version = "0.40.0"; - sha256 = "0xj8bclyfvhdw12jfndg6pivzrbhqjf2qky383n0w6if11cfli1z"; + version = "0.41.0"; + sha256 = "1prwkvlc9qglc0465gibv26h1nd06bdiayp22i91dw3ws3mbhzs5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -223213,8 +219427,6 @@ self: { ]; description = "A library for using HTTP with stratux"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "stratux-types" = callPackage @@ -223230,8 +219442,6 @@ self: { ]; description = "A library for reading JSON output from stratux"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "stratux-websockets" = callPackage @@ -223655,8 +219865,6 @@ self: { ]; description = "Streaming interface for LZMA/XZ compression"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "streaming-osm" = callPackage @@ -223809,8 +220017,6 @@ self: { ]; description = "http, attoparsec, pipes and other utilities for the streaming libraries"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "streaming-wai" = callPackage @@ -223847,34 +220053,6 @@ self: { }) {}; "streamly" = callPackage - ({ mkDerivation, atomic-primops, base, clock, containers, deepseq - , exceptions, gauge, ghc-prim, heaps, hspec, lockfree-queue - , monad-control, mtl, QuickCheck, random, transformers - , transformers-base - }: - mkDerivation { - pname = "streamly"; - version = "0.5.2"; - sha256 = "1pla9356yhf6zv2yz4mh8g1dslzdkkych4jrjyi4rw66frvw0jg6"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - atomic-primops base clock containers exceptions ghc-prim heaps - lockfree-queue monad-control mtl transformers transformers-base - ]; - testHaskellDepends = [ - base containers exceptions hspec mtl QuickCheck random transformers - ]; - benchmarkHaskellDepends = [ - atomic-primops base clock containers deepseq exceptions gauge - ghc-prim heaps lockfree-queue monad-control mtl random transformers - transformers-base - ]; - description = "Beautiful Streaming, Concurrent and Reactive Composition"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "streamly_0_6_1" = callPackage ({ mkDerivation, atomic-primops, base, containers, deepseq , exceptions, gauge, ghc-prim, heaps, hspec, lockfree-queue , monad-control, mtl, QuickCheck, random, transformers @@ -223896,7 +220074,6 @@ self: { benchmarkHaskellDepends = [ base deepseq gauge random ]; description = "Beautiful Streaming, Concurrent and Reactive Composition"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "streamproc" = callPackage @@ -224559,8 +220736,8 @@ self: { }: mkDerivation { pname = "stripe-core"; - version = "2.4.1"; - sha256 = "1ab3smzvm9qw4g1b5prin7njifwfls51c4cb625aaziljmpwyg27"; + version = "2.5.0"; + sha256 = "06b5qx20zkvaqvn98jqmq0vqrpkgfvab5wjq7lwlcdm9nn7nrsgi"; libraryHaskellDepends = [ aeson base bytestring mtl text time transformers unordered-containers @@ -224573,8 +220750,8 @@ self: { ({ mkDerivation, base, stripe-core, stripe-http-client }: mkDerivation { pname = "stripe-haskell"; - version = "2.4.1"; - sha256 = "041kj0dh6qzpmcwb6wm5ii9l6dwdpja3big57n0134z41hw0p45f"; + version = "2.5.0"; + sha256 = "0qazqygkg6hlfvz6wg3gk2am7qnxzsfqjqh6mgyandz9l141pyx5"; libraryHaskellDepends = [ base stripe-core stripe-http-client ]; description = "Stripe API for Haskell"; license = stdenv.lib.licenses.mit; @@ -224588,8 +220765,8 @@ self: { }: mkDerivation { pname = "stripe-http-client"; - version = "2.4.1"; - sha256 = "1x7720awkh97wpkyn6mbqb788a07lfshd8w55qwywfxlp42qg4a3"; + version = "2.5.0"; + sha256 = "1386d2bhql56kazxx89icl1j5ikhhza2cv934x19s5lqsl8089yi"; libraryHaskellDepends = [ aeson base bytestring http-client http-client-tls http-types stripe-core text @@ -224667,14 +220844,16 @@ self: { }: mkDerivation { pname = "stripe-tests"; - version = "2.4.1"; - sha256 = "1lq2m450y7ylalcimy2fm2c6vhl0m3pyj7m52cni5dm398qskmr6"; + version = "2.5.0"; + sha256 = "0jqxzdriaysf2lya8p9lc1ind2m4b4nz15dn7vb3sx74vw6lp4s3"; libraryHaskellDepends = [ aeson base bytestring free hspec hspec-core mtl random stripe-core text time transformers unordered-containers ]; description = "Tests for Stripe API bindings for Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stripe-wreq" = callPackage @@ -224738,8 +220917,8 @@ self: { }: mkDerivation { pname = "strongswan-sql"; - version = "1.3.0.0"; - sha256 = "0dxl6j73hmw9la2ivbgxm6wr12dd79nh2315k517zlgiq4q1yir7"; + version = "1.3.0.1"; + sha256 = "1n61xxgp4saljyq6zywi5x5nlcwzp3i9vhwlmib790wr19znnxky"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -225068,6 +221247,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "stylist" = callPackage + ({ mkDerivation, base, css-syntax, hashable, hspec, network-uri + , QuickCheck, text, unordered-containers + }: + mkDerivation { + pname = "stylist"; + version = "1.0.0.0"; + sha256 = "0lh8x8wqq4rsy4zn025qhs6jr9iaw65xqpbrk233h620prj23525"; + libraryHaskellDepends = [ + base css-syntax hashable network-uri text unordered-containers + ]; + testHaskellDepends = [ + base css-syntax hashable hspec network-uri QuickCheck text + unordered-containers + ]; + description = "Apply CSS styles to a document tree"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "stylized" = callPackage ({ mkDerivation, ansi-terminal, base }: mkDerivation { @@ -225118,6 +221318,8 @@ self: { ]; description = "An applicative functor that seamlessly talks to HTML inputs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sub-state" = callPackage @@ -225431,34 +221633,6 @@ self: { ({ mkDerivation, aeson, ansi-terminal, base, base-noprelude , bytestring, directory, filepath, generic-deriving, gitrev , hedgehog, hspec, neat-interpolation, optparse-applicative - , process, relude, text, time, tomland - }: - mkDerivation { - pname = "summoner"; - version = "1.2.0"; - sha256 = "04shi46j44g81zylmrm807rlinfx6sjpdwvxxyw9rhnpx56b8r34"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson ansi-terminal base-noprelude bytestring directory filepath - generic-deriving gitrev neat-interpolation optparse-applicative - process relude text time tomland - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base-noprelude filepath hedgehog hspec neat-interpolation relude - tomland - ]; - description = "Tool for scaffolding completely configured production Haskell projects"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "summoner_1_3_0_1" = callPackage - ({ mkDerivation, aeson, ansi-terminal, base, base-noprelude - , bytestring, directory, filepath, generic-deriving, gitrev - , hedgehog, hspec, neat-interpolation, optparse-applicative , process, relude, shellmet, text, time, tomland, tree-diff }: mkDerivation { @@ -225630,8 +221804,8 @@ self: { }: mkDerivation { pname = "super-user-spark"; - version = "0.4.0.1"; - sha256 = "0pxkvc1vjarh4p5rqnai6nlsqxv9as8jvqs2vpywl1525nsfyvy5"; + version = "0.4.0.3"; + sha256 = "0z2alc67p8nvvwaxxrgwhkwfki1iw7ycs3ay8kyfw0wh01d2cmgk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -225683,6 +221857,8 @@ self: { ]; description = "Efficiently build a bytestring from smaller chunks"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "supercollider-ht" = callPackage @@ -225873,6 +222049,8 @@ self: { testHaskellDepends = [ base hspec ]; description = "Monitor groups of threads with non-hierarchical lifetimes"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "supplemented" = callPackage @@ -225951,6 +222129,36 @@ self: { broken = true; }) {}; + "sv_1_4" = callPackage + ({ mkDerivation, attoparsec, base, bifunctors, bytestring, cassava + , contravariant, criterion, deepseq, hedgehog, hw-dsv, lens, Only + , parsers, semigroupoids, semigroups, sv-core, tasty + , tasty-hedgehog, tasty-hunit, text, transformers, trifecta + , utf8-string, validation, vector + }: + mkDerivation { + pname = "sv"; + version = "1.4"; + sha256 = "02ymnnknfppx59b922y62grkmarwsyy77iv6bmyp2bzm8vbvnvd5"; + libraryHaskellDepends = [ + attoparsec base bifunctors bytestring contravariant hw-dsv + semigroupoids sv-core transformers utf8-string validation + ]; + testHaskellDepends = [ + base bytestring cassava contravariant hedgehog lens Only parsers + semigroupoids semigroups tasty tasty-hedgehog tasty-hunit text + trifecta utf8-string validation vector + ]; + benchmarkHaskellDepends = [ + attoparsec base bytestring criterion deepseq hw-dsv lens text + vector + ]; + description = "Encode and decode separated values (CSV, PSV, ...)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "sv-cassava" = callPackage ({ mkDerivation, attoparsec, base, bytestring, cassava, HUnit , sv-core, text, utf8-string, validation, vector @@ -225959,8 +222167,8 @@ self: { pname = "sv-cassava"; version = "0.3"; sha256 = "1c4wacp7k5sgr5fy73h9if98d08apmcs6p4p3f3fvpqkm8jmf71b"; - revision = "2"; - editedCabalFile = "14grn815r54480jqpfib6qi3ivbaw0asa5ys0rp93allsprk96xb"; + revision = "3"; + editedCabalFile = "13414sn9rllq842bz0lv8qzdy6fxv72jbhmk64krrxq2xmw7wkhb"; libraryHaskellDepends = [ attoparsec base bytestring cassava sv-core utf8-string validation vector @@ -225974,20 +222182,22 @@ self: { "sv-core" = callPackage ({ mkDerivation, attoparsec, base, bifunctors, bytestring - , containers, contravariant, deepseq, lens, mtl, parsec - , profunctors, QuickCheck, readable, semigroupoids, semigroups - , tasty, tasty-quickcheck, text, transformers, trifecta + , containers, contravariant, deepseq, double-conversion, lens, mtl + , parsec, profunctors, QuickCheck, readable, semigroupoids + , semigroups, tasty, tasty-quickcheck, text, transformers, trifecta , utf8-string, validation, vector, void }: mkDerivation { pname = "sv-core"; - version = "0.3.1"; - sha256 = "08j8qin7q04jvrb1gd870cylix7p81f4rws1k31b3azby2mdja6h"; + version = "0.4.1"; + sha256 = "1brjdh22sarg9v0qak8xgzyhpcilwn0czab9mh65l2izp3nzkfn7"; + revision = "2"; + editedCabalFile = "05h0lsj434qv81b2fvnm80wyb7272wcwly3jfk4l1qp5hjyq6917"; libraryHaskellDepends = [ attoparsec base bifunctors bytestring containers contravariant - deepseq lens mtl parsec profunctors readable semigroupoids - semigroups text transformers trifecta utf8-string validation vector - void + deepseq double-conversion lens mtl parsec profunctors readable + semigroupoids semigroups text transformers trifecta utf8-string + validation vector void ]; testHaskellDepends = [ base bytestring profunctors QuickCheck semigroupoids semigroups @@ -225997,7 +222207,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "sv-core_0_4_1" = callPackage + "sv-core_0_5" = callPackage ({ mkDerivation, attoparsec, base, bifunctors, bytestring , containers, contravariant, deepseq, double-conversion, lens, mtl , parsec, profunctors, QuickCheck, readable, semigroupoids @@ -226006,10 +222216,8 @@ self: { }: mkDerivation { pname = "sv-core"; - version = "0.4.1"; - sha256 = "1brjdh22sarg9v0qak8xgzyhpcilwn0czab9mh65l2izp3nzkfn7"; - revision = "2"; - editedCabalFile = "05h0lsj434qv81b2fvnm80wyb7272wcwly3jfk4l1qp5hjyq6917"; + version = "0.5"; + sha256 = "1x5gmv2pbn3hx1dhpkigivjkbg6n6xy7lc36wmccsw2qqn9r5qxa"; libraryHaskellDepends = [ attoparsec base bifunctors bytestring containers contravariant deepseq double-conversion lens mtl parsec profunctors readable @@ -226033,8 +222241,8 @@ self: { pname = "sv-svfactor"; version = "0.2"; sha256 = "1fjgryypq6i4r3w9zdb282aq5lqp4577mzzycafklphc0d2ancgb"; - revision = "1"; - editedCabalFile = "0g0bswas1y06k1yg9lgzwm36pyxd05s3pji3nsiqff6bhfph3d37"; + revision = "2"; + editedCabalFile = "1igmg66d7zs8pcia4j7nhr7iivnbanqz34wcpfx967823vc2whpw"; libraryHaskellDepends = [ base bytestring lens profunctors sv-core svfactor validation ]; @@ -226322,40 +222530,6 @@ self: { }: mkDerivation { pname = "swagger2"; - version = "2.3.1.1"; - sha256 = "19fslhjqcnk0da1c8sdflnnxjzbbzqb0nbknpgyd45q0psxr6xs7"; - revision = "1"; - editedCabalFile = "1g6jiadrvglrbf0857nzfbnjxmb3lwqamgs47j3qv9k6kfwilzyk"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - aeson base base-compat-batteries bytestring containers cookie - generics-sop hashable http-media insert-ordered-containers lens mtl - network QuickCheck scientific template-haskell text time - transformers transformers-compat unordered-containers uuid-types - vector - ]; - testHaskellDepends = [ - aeson base base-compat-batteries bytestring containers doctest Glob - hashable hspec HUnit insert-ordered-containers lens mtl QuickCheck - quickcheck-instances template-haskell text time - unordered-containers utf8-string vector - ]; - testToolDepends = [ hspec-discover ]; - description = "Swagger 2.0 data model"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "swagger2_2_4" = callPackage - ({ mkDerivation, aeson, base, base-compat-batteries, bytestring - , Cabal, cabal-doctest, containers, cookie, doctest, generics-sop - , Glob, hashable, hspec, hspec-discover, http-media, HUnit - , insert-ordered-containers, lens, mtl, network, QuickCheck - , quickcheck-instances, scientific, template-haskell, text, time - , transformers, transformers-compat, unordered-containers - , utf8-string, uuid-types, vector - }: - mkDerivation { - pname = "swagger2"; version = "2.4"; sha256 = "0m08l7nz53h6ix6xgzynnh3cf6l61437da9swdbsz8avx0rq2wci"; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -226375,7 +222549,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Swagger 2.0 data model"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "swapper" = callPackage @@ -226651,8 +222824,6 @@ self: { ]; description = "Library for Typed Tagless-Final Higher-Order Composable DSL"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "symantic-cli" = callPackage @@ -226669,8 +222840,6 @@ self: { ]; description = "Symantics for parsing and documenting a CLI"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "symantic-document" = callPackage @@ -226853,8 +223022,6 @@ self: { ]; description = "Symantics for common types"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "symantic-xml" = callPackage @@ -226896,16 +223063,14 @@ self: { }) {}; "symbolic-link" = callPackage - ({ mkDerivation, base, directory, unix, yaml }: + ({ mkDerivation, base, directory, tasty, tasty-hunit, unix }: mkDerivation { pname = "symbolic-link"; - version = "0.1.0.2"; - sha256 = "02v0ry474xkpacbav6s3781xiczkhbx5rzks9ad5pj2y16z59pr7"; - isLibrary = true; - isExecutable = true; + version = "0.1.1.1"; + sha256 = "1g5w67kviqzz5q9xpln6nh8g86yh1v2wmgmgjmn5ai1qj4x80rf8"; libraryHaskellDepends = [ base directory unix ]; - executableHaskellDepends = [ base directory unix yaml ]; - description = "Symlink tools"; + testHaskellDepends = [ base tasty tasty-hunit unix ]; + description = "Symlink functions"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -227123,6 +223288,8 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq ]; description = "Generic representation and manipulation of abstract syntax"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "syntactical" = callPackage @@ -227436,21 +223603,21 @@ self: { "synthesizer-llvm" = callPackage ({ mkDerivation, base, containers, event-list, llvm-extra, llvm-tf , midi, non-empty, non-negative, numeric-prelude, pathtype - , QuickCheck, random, sox, storable-record, storable-tuple - , storablevector, synthesizer-core, synthesizer-midi, tfp - , transformers, unsafe, utility-ht, vault + , QuickCheck, random, semigroups, sox, storable-record + , storable-tuple, storablevector, synthesizer-core + , synthesizer-midi, tfp, transformers, unsafe, utility-ht, vault }: mkDerivation { pname = "synthesizer-llvm"; - version = "0.8.1.2"; - sha256 = "1rklmaibicc4fwcz22cw6vp5qm74b5vn5ymflwk4gi3knsn7mzi9"; + version = "0.8.2"; + sha256 = "0vf0p1ajs7k327cc1dwm6ja2qyby865g1bqc6mzrjn826dv2vric"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers event-list llvm-extra llvm-tf midi non-empty - non-negative numeric-prelude pathtype random sox storable-record - storable-tuple storablevector synthesizer-core synthesizer-midi tfp - transformers unsafe utility-ht vault + non-negative numeric-prelude pathtype random semigroups sox + storable-record storable-tuple storablevector synthesizer-core + synthesizer-midi tfp transformers unsafe utility-ht vault ]; testHaskellDepends = [ base llvm-extra llvm-tf numeric-prelude QuickCheck random @@ -227856,8 +224023,8 @@ self: { ({ mkDerivation, base, bytestring, network, transformers, unix }: mkDerivation { pname = "systemd"; - version = "1.1.2"; - sha256 = "11wjsfnnsfgrffsxy9s5yqlzb7zxlrjg92mhanq66jvbnqh1jijr"; + version = "1.2.0"; + sha256 = "04jzgixwy267bx75byi1pavfgic2h3znn42psb70i6l6xvwn875g"; libraryHaskellDepends = [ base bytestring network transformers unix ]; @@ -228051,6 +224218,8 @@ self: { ]; description = "Layout text as grid or table"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "table-tennis" = callPackage @@ -228239,8 +224408,6 @@ self: { executablePkgconfigDepends = [ gtk3 ]; description = "A desktop bar similar to xmobar, but with more GUI"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) gtk3;}; "tag-bits" = callPackage @@ -228592,6 +224759,25 @@ self: { broken = true; }) {}; + "tagsoup-navigate" = callPackage + ({ mkDerivation, base, deriving-compat, lens, mmorph, mtl + , semigroupoids, semigroups, tagsoup, tagsoup-selection + , transformers + }: + mkDerivation { + pname = "tagsoup-navigate"; + version = "0.1.0.1"; + sha256 = "01xzw375wdcj58s6mrwgzf9ccv8bbc50p4kcnv76cxbm38p1v94j"; + libraryHaskellDepends = [ + base deriving-compat lens mmorph mtl semigroupoids semigroups + tagsoup tagsoup-selection transformers + ]; + description = "Tagsoup Navigate"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "tagsoup-parsec" = callPackage ({ mkDerivation, base, parsec, tagsoup }: mkDerivation { @@ -228653,8 +224839,6 @@ self: { ]; description = "Support library to enable TAI usage on systems with time kept in UTC"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "tai64" = callPackage @@ -229143,8 +225327,8 @@ self: { }: mkDerivation { pname = "taskell"; - version = "1.4.0.0"; - sha256 = "1l0q1wyhkh271rpd6qw12j1kkzdqqcvp2xvqwykn98jwmnhswm4m"; + version = "1.5.0.0"; + sha256 = "0v66297i3d36r0k2jpp1cl3g3wj83k3s2dq5n50cm7zrrg0mc7sq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -229190,23 +225374,6 @@ self: { }: mkDerivation { pname = "tasty"; - version = "1.2"; - sha256 = "05w3bl5kah238pds818sxp9x58rp1nszbiicb1l21hf9k83mw66n"; - libraryHaskellDepends = [ - ansi-terminal async base clock containers mtl optparse-applicative - stm tagged unbounded-delays unix wcwidth - ]; - description = "Modern and extensible testing framework"; - license = stdenv.lib.licenses.mit; - }) {}; - - "tasty_1_2_3" = callPackage - ({ mkDerivation, ansi-terminal, async, base, clock, containers, mtl - , optparse-applicative, stm, tagged, unbounded-delays, unix - , wcwidth - }: - mkDerivation { - pname = "tasty"; version = "1.2.3"; sha256 = "0qpn0avpw4w1qq5r2gwh2piipj0llqq6ylagr3xnqiraq6mhg8cc"; libraryHaskellDepends = [ @@ -229215,7 +225382,6 @@ self: { ]; description = "Modern and extensible testing framework"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty-ant-xml" = callPackage @@ -229261,23 +225427,11 @@ self: { ({ mkDerivation, base, dejafu, random, tagged, tasty }: mkDerivation { pname = "tasty-dejafu"; - version = "1.2.1.0"; - sha256 = "0a0iqc9vnrj4a44h77larcprydipwxy9qkh3zb6zk9mpn9fas498"; - libraryHaskellDepends = [ base dejafu random tagged tasty ]; - description = "Deja Fu support for the Tasty test framework"; - license = stdenv.lib.licenses.mit; - }) {}; - - "tasty-dejafu_2_0_0_1" = callPackage - ({ mkDerivation, base, dejafu, random, tagged, tasty }: - mkDerivation { - pname = "tasty-dejafu"; version = "2.0.0.1"; sha256 = "19cgzr1gcy1khvw2a6bfd620zmrc4szkdwyf3rfyacxgbgqy1b1z"; libraryHaskellDepends = [ base dejafu random tagged tasty ]; description = "Deja Fu support for the Tasty test framework"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty-discover" = callPackage @@ -229457,23 +225611,11 @@ self: { ({ mkDerivation, base, call-stack, tasty }: mkDerivation { pname = "tasty-hunit"; - version = "0.10.0.1"; - sha256 = "0j3hgga6c3s8h5snzivb8a75h96207ia2rlbxzj07xbf4zpkp44g"; - libraryHaskellDepends = [ base call-stack tasty ]; - description = "HUnit support for the Tasty test framework"; - license = stdenv.lib.licenses.mit; - }) {}; - - "tasty-hunit_0_10_0_2" = callPackage - ({ mkDerivation, base, call-stack, tasty }: - mkDerivation { - pname = "tasty-hunit"; version = "0.10.0.2"; sha256 = "1xvf5xs0r8xqkcg354klz4wyzwyzvinalyl6f4fnxwqmzrgch8s8"; libraryHaskellDepends = [ base call-stack tasty ]; description = "HUnit support for the Tasty test framework"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty-hunit-adapter" = callPackage @@ -229694,29 +225836,6 @@ self: { }: mkDerivation { pname = "tasty-silver"; - version = "3.1.12"; - sha256 = "0s6cz0z8xmhc3gqyb68lkx0j94kagbdgc5gagknmfj6an2i33fly"; - libraryHaskellDepends = [ - ansi-terminal async base bytestring containers deepseq directory - filepath mtl optparse-applicative process process-extras regex-tdfa - semigroups stm tagged tasty temporary text - ]; - testHaskellDepends = [ - base directory filepath process tasty tasty-hunit temporary - transformers - ]; - description = "A fancy test runner, including support for golden tests"; - license = stdenv.lib.licenses.mit; - }) {}; - - "tasty-silver_3_1_13" = callPackage - ({ mkDerivation, ansi-terminal, async, base, bytestring, containers - , deepseq, directory, filepath, mtl, optparse-applicative, process - , process-extras, regex-tdfa, semigroups, stm, tagged, tasty - , tasty-hunit, temporary, text, transformers - }: - mkDerivation { - pname = "tasty-silver"; version = "3.1.13"; sha256 = "1sd9xgjcvlnw338dn5rcy5la7gw15yvg4xl85ym7aav5fr97apfs"; libraryHaskellDepends = [ @@ -229730,7 +225849,6 @@ self: { ]; description = "A fancy test runner, including support for golden tests"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty-smallcheck" = callPackage @@ -229828,12 +225946,12 @@ self: { pname = "tasty-travis"; version = "0.2.0.2"; sha256 = "0g1qwmr11rgpvm964367mskgrjzbi34lbxzf9c0knx5ij9565gfg"; + revision = "2"; + editedCabalFile = "0m8h9r1cv38sva9k5aws1l4py4xzzmlfwik2avhm8avdr0hl71dk"; libraryHaskellDepends = [ base tasty ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Fancy Travis CI output for tasty tests"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "tasty-wai" = callPackage @@ -231065,23 +227183,6 @@ self: { ({ mkDerivation, array, base, c2hs }: mkDerivation { pname = "termbox"; - version = "0.1.0"; - sha256 = "1wylp818y65rwdrzmh596sn8csiwjma6gh6wm4fn9m9zb1nvzbsa"; - revision = "1"; - editedCabalFile = "0qwab9ayd9b8gmcnvy6pbbp16vwnqdzji9qi71jmgvviayqdlly5"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ array base ]; - libraryToolDepends = [ c2hs ]; - executableHaskellDepends = [ base ]; - description = "termbox bindings"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "termbox_0_2_0" = callPackage - ({ mkDerivation, array, base, c2hs }: - mkDerivation { - pname = "termbox"; version = "0.2.0"; sha256 = "04y1wj65c6nhv08jd83ihvph45fs5279px4ivm5cinnz5m721jqg"; isLibrary = true; @@ -231091,7 +227192,6 @@ self: { executableHaskellDepends = [ base ]; description = "termbox bindings"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "termbox-banana" = callPackage @@ -231107,8 +227207,6 @@ self: { libraryHaskellDepends = [ base reactive-banana termbox ]; description = "reactive-banana + termbox"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "termbox-bindings" = callPackage @@ -231275,14 +227373,15 @@ self: { , directory, distributive, doctest, dyre, filepath, focuslist , genvalidity-containers, genvalidity-hspec, gi-gdk, gi-gio , gi-glib, gi-gtk, gi-pango, gi-vte, gtk3, haskell-gi-base - , hedgehog, lens, mono-traversable, pretty-simple, QuickCheck - , singletons, tasty, tasty-hedgehog, tasty-hspec, template-haskell - , vte_291, xml-conduit, xml-html-qq + , hedgehog, inline-c, lens, libpcre2, mono-traversable + , pretty-simple, QuickCheck, singletons, tasty, tasty-hedgehog + , tasty-hspec, template-haskell, text, vte_291, xml-conduit + , xml-html-qq }: mkDerivation { pname = "termonad"; - version = "1.3.0.0"; - sha256 = "1vyvh0b7r1l060yhm9j572yzlpvz3pba50snaqi9cicvddrj3aj9"; + version = "2.0.0.0"; + sha256 = "0rprqn5vcvhbqqg0grrmz0ijjpkrprza88la4mbdg6skb34fjsp0"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -231290,11 +227389,11 @@ self: { libraryHaskellDepends = [ adjunctions base classy-prelude colour constraints containers data-default directory distributive dyre filepath focuslist gi-gdk - gi-gio gi-glib gi-gtk gi-pango gi-vte haskell-gi-base lens - mono-traversable pretty-simple QuickCheck singletons xml-conduit - xml-html-qq + gi-gio gi-glib gi-gtk gi-pango gi-vte haskell-gi-base inline-c lens + mono-traversable pretty-simple QuickCheck singletons text + xml-conduit xml-html-qq ]; - libraryPkgconfigDepends = [ gtk3 vte_291 ]; + libraryPkgconfigDepends = [ gtk3 libpcre2 vte_291 ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base doctest genvalidity-containers genvalidity-hspec hedgehog lens @@ -231304,7 +227403,7 @@ self: { license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {inherit (pkgs) gtk3; vte_291 = pkgs.vte;}; + }) {inherit (pkgs) gtk3; libpcre2 = null; vte_291 = pkgs.vte;}; "termplot" = callPackage ({ mkDerivation, base, brick, data-default, optparse-applicative @@ -232079,25 +228178,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "text_1_2_3_1" = callPackage + "text_1_2_4_0" = callPackage ({ mkDerivation, array, base, binary, bytestring, deepseq , directory, ghc-prim, HUnit, integer-gmp, QuickCheck - , quickcheck-unicode, random, test-framework, test-framework-hunit - , test-framework-quickcheck2 + , quickcheck-unicode, random, template-haskell, test-framework + , test-framework-hunit, test-framework-quickcheck2 }: mkDerivation { pname = "text"; - version = "1.2.3.1"; - sha256 = "19j725g8xma1811avl3nz2vndwynsmpx3sqf6bd7iwh1bm6n4q43"; - revision = "2"; - editedCabalFile = "0ax6h9mvs4567nzi936jkd8f94bi8jnxis4wikjzyaxqfwm5zc6f"; + version = "1.2.4.0"; + sha256 = "0k739i0sjrbl029y5j8n5v1hqa68z00xazvrahjhyl69mp4s5qna"; libraryHaskellDepends = [ array base binary bytestring deepseq ghc-prim integer-gmp + template-haskell ]; testHaskellDepends = [ array base binary bytestring deepseq directory ghc-prim HUnit - integer-gmp QuickCheck quickcheck-unicode random test-framework - test-framework-hunit test-framework-quickcheck2 + integer-gmp QuickCheck quickcheck-unicode random template-haskell + test-framework test-framework-hunit test-framework-quickcheck2 ]; doCheck = false; description = "An efficient packed Unicode text type"; @@ -232372,8 +228470,6 @@ self: { ]; description = "ICU transliteration"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) icu;}; "text-json-qq" = callPackage @@ -232606,24 +228702,6 @@ self: { }: mkDerivation { pname = "text-printer"; - version = "0.5"; - sha256 = "02sadjd19dbxzawr1q8z3j7w6vhp5mvz1dbssk118hsvl6k0234g"; - libraryHaskellDepends = [ - base bytestring pretty semigroups text text-latin1 - ]; - testHaskellDepends = [ - base QuickCheck test-framework test-framework-quickcheck2 - ]; - description = "Abstract interface for text builders/printers"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "text-printer_0_5_0_1" = callPackage - ({ mkDerivation, base, bytestring, pretty, QuickCheck, semigroups - , test-framework, test-framework-quickcheck2, text, text-latin1 - }: - mkDerivation { - pname = "text-printer"; version = "0.5.0.1"; sha256 = "065m64f5l4yyccb04c7bwax09wk6aafm2v9sl3w8w1asqw7ni9sq"; libraryHaskellDepends = [ @@ -232634,7 +228712,6 @@ self: { ]; description = "Abstract interface for text builders/printers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-regex-replace" = callPackage @@ -232710,6 +228787,8 @@ self: { testHaskellDepends = [ base hedgehog neat-interpolation text ]; description = "Simple text replacements from a list of search/replace pairs"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "text-short" = callPackage @@ -232719,28 +228798,6 @@ self: { }: mkDerivation { pname = "text-short"; - version = "0.1.2"; - sha256 = "0rqiwgjkgyfy8596swl0s0x2jqk6ddh2h02qxa32az2cs5kviwmk"; - revision = "2"; - editedCabalFile = "106p7c0399zxdlh9f9qkgy7g2gp3bxqdpy6m6lnfhzi0pm5y8mks"; - libraryHaskellDepends = [ - base binary bytestring deepseq ghc-prim hashable text - ]; - testHaskellDepends = [ - base binary quickcheck-instances tasty tasty-hunit tasty-quickcheck - text - ]; - description = "Memory-efficient representation of Unicode text strings"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "text-short_0_1_3" = callPackage - ({ mkDerivation, base, binary, bytestring, deepseq, ghc-prim - , hashable, quickcheck-instances, tasty, tasty-hunit - , tasty-quickcheck, text - }: - mkDerivation { - pname = "text-short"; version = "0.1.3"; sha256 = "0xyrxlb602z8bc9sr2y1fag0x56a20yj5qrkvy7iwc6hnznrynxz"; libraryHaskellDepends = [ @@ -232752,7 +228809,6 @@ self: { ]; description = "Memory-efficient representation of Unicode text strings"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-show" = callPackage @@ -232766,40 +228822,6 @@ self: { }: mkDerivation { pname = "text-show"; - version = "3.7.5"; - sha256 = "1by89i3c6qyjh7jjld06wb2sphb236rbvwb1mmvq8f6mxliiyf1r"; - revision = "1"; - editedCabalFile = "1v8czpi9mn54850k0pilqh1f3yfr5n5vykmg5k57wmrdpx25vkws"; - libraryHaskellDepends = [ - array base base-compat-batteries bifunctors bytestring - bytestring-builder containers contravariant generic-deriving - ghc-boot-th ghc-prim integer-gmp nats semigroups tagged - template-haskell text th-abstraction th-lift transformers - transformers-compat void - ]; - testHaskellDepends = [ - array base base-compat-batteries base-orphans bytestring - bytestring-builder deriving-compat generic-deriving ghc-prim hspec - nats QuickCheck quickcheck-instances semigroups tagged - template-haskell text transformers transformers-compat - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ base criterion deepseq ghc-prim text ]; - description = "Efficient conversion of values into Text"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "text-show_3_8_2" = callPackage - ({ mkDerivation, array, base, base-compat-batteries, base-orphans - , bifunctors, bytestring, bytestring-builder, containers - , contravariant, criterion, deepseq, deriving-compat - , generic-deriving, ghc-boot-th, ghc-prim, hspec, hspec-discover - , integer-gmp, nats, QuickCheck, quickcheck-instances, semigroups - , tagged, template-haskell, text, th-abstraction, th-lift - , transformers, transformers-compat, void - }: - mkDerivation { - pname = "text-show"; version = "3.8.2"; sha256 = "0n46q5gjlxz3g4flj5mn8s78dpdfd65fjl7b5174pykanwqsqqwz"; libraryHaskellDepends = [ @@ -232819,7 +228841,6 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq ghc-prim text ]; description = "Efficient conversion of values into Text"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-show-instances" = callPackage @@ -232853,8 +228874,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Additional instances for text-show"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "text-stream-decode" = callPackage @@ -233034,6 +229053,8 @@ self: { ]; description = "Non-empty values of `Data.Text`."; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "textPlot" = callPackage @@ -233203,20 +229224,6 @@ self: { ({ mkDerivation, base, containers, ghc-prim, template-haskell }: mkDerivation { pname = "th-abstraction"; - version = "0.2.11.0"; - sha256 = "0340w34cqa42m0b9hdys9bfphi13swdp7xc8cwzbj9fq6764p22i"; - libraryHaskellDepends = [ - base containers ghc-prim template-haskell - ]; - testHaskellDepends = [ base containers template-haskell ]; - description = "Nicer interface for reified information about data types"; - license = stdenv.lib.licenses.isc; - }) {}; - - "th-abstraction_0_3_1_0" = callPackage - ({ mkDerivation, base, containers, ghc-prim, template-haskell }: - mkDerivation { - pname = "th-abstraction"; version = "0.3.1.0"; sha256 = "1f81w0gshvc816cf9qz0f19jsrzh6wpzmmy317xrgn63dv61p7jb"; libraryHaskellDepends = [ @@ -233225,7 +229232,6 @@ self: { testHaskellDepends = [ base containers template-haskell ]; description = "Nicer interface for reified information about data types"; license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "th-alpha" = callPackage @@ -233332,6 +229338,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "th-data-compat_0_1_0_0" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "th-data-compat"; + version = "0.1.0.0"; + sha256 = "03d5ddbxzfn60ysxxn17q7gzdlls8hvlsvhzai4mn0qfjpwi6ljx"; + libraryHaskellDepends = [ base template-haskell ]; + description = "Compatibility for data definition template of TH"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "th-desugar" = callPackage ({ mkDerivation, base, containers, hspec, HUnit, mtl, syb , template-haskell, th-expand-syns, th-lift, th-orphans @@ -233529,23 +229547,6 @@ self: { }: mkDerivation { pname = "th-lift"; - version = "0.7.11"; - sha256 = "131360zxb0hazbqwbkk6ab2p77jkxr79bwwm618mrwrwkm3x2g6m"; - revision = "1"; - editedCabalFile = "0whppp0p9df3fphv6pyg8f70bnm2kpyb3ylznknrklsl5vn2c49d"; - libraryHaskellDepends = [ - base ghc-prim template-haskell th-abstraction - ]; - testHaskellDepends = [ base ghc-prim template-haskell ]; - description = "Derive Template Haskell's Lift class for datatypes"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "th-lift_0_8_0_1" = callPackage - ({ mkDerivation, base, ghc-prim, template-haskell, th-abstraction - }: - mkDerivation { - pname = "th-lift"; version = "0.8.0.1"; sha256 = "1a6qlbdg15cfr5rvl9g3blgwx4v1p0xic0pzv13zx165xbc36ld0"; libraryHaskellDepends = [ @@ -233554,19 +229555,19 @@ self: { testHaskellDepends = [ base ghc-prim template-haskell ]; description = "Derive Template Haskell's Lift class for datatypes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "th-lift-instances" = callPackage ({ mkDerivation, base, bytestring, containers, QuickCheck - , template-haskell, text, vector + , template-haskell, text, th-lift, transformers, vector }: mkDerivation { pname = "th-lift-instances"; - version = "0.1.12"; - sha256 = "1kjfwfmkn7r35qlsa0n4la3103jlfbjf3ia1pvsgizgrwxr1zjid"; + version = "0.1.13"; + sha256 = "0zmhz593lfgi194ps8cv592j0wyc37mdn9pf2pchmr7h8bkmbksf"; libraryHaskellDepends = [ - base bytestring containers template-haskell text vector + base bytestring containers template-haskell text th-lift + transformers vector ]; testHaskellDepends = [ base bytestring containers QuickCheck template-haskell text vector @@ -233575,14 +229576,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "th-lift-instances_0_1_13" = callPackage + "th-lift-instances_0_1_14" = callPackage ({ mkDerivation, base, bytestring, containers, QuickCheck , template-haskell, text, th-lift, transformers, vector }: mkDerivation { pname = "th-lift-instances"; - version = "0.1.13"; - sha256 = "0zmhz593lfgi194ps8cv592j0wyc37mdn9pf2pchmr7h8bkmbksf"; + version = "0.1.14"; + sha256 = "0r1b4jnvcj64wp4hfccwkl4a70n1p1q7qzyx6ax7cmd8k961jz78"; libraryHaskellDepends = [ base bytestring containers template-haskell text th-lift transformers vector @@ -233945,7 +229946,7 @@ self: { broken = true; }) {}; - "these" = callPackage + "these_0_7_6" = callPackage ({ mkDerivation, aeson, base, base-compat, bifunctors, binary , containers, data-default-class, deepseq, hashable, keys, lens , mtl, QuickCheck, quickcheck-instances, semigroupoids, tasty @@ -233969,9 +229970,10 @@ self: { ]; description = "An either-or-both data type & a generalized 'zip with padding' typeclass"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "these_1_0_1" = callPackage + "these" = callPackage ({ mkDerivation, aeson, assoc, base, base-compat, binary, deepseq , hashable, QuickCheck, semigroupoids, unordered-containers }: @@ -233985,7 +229987,6 @@ self: { ]; description = "An either-or-both data type"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "these-lens" = callPackage @@ -233997,8 +229998,6 @@ self: { libraryHaskellDepends = [ base base-compat lens these ]; description = "Lenses for These"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "these-skinny" = callPackage @@ -234415,8 +230414,8 @@ self: { pname = "through-text"; version = "0.1.0.0"; sha256 = "1kdl36n98kajaa7v7js2sy8bi09p8rrxmlfcclcfc1l92bd2aclk"; - revision = "3"; - editedCabalFile = "1gia9j7zq3g74kqvkzwp68d690nhddix1kpmj23d5a3zns3rxasn"; + revision = "4"; + editedCabalFile = "1clc4g6rg5970654fd596ygly79axkhyzn773by1wi4grvhw96fi"; libraryHaskellDepends = [ base bytestring case-insensitive text ]; description = "Convert textual types through Text without needing O(n^2) instances"; license = stdenv.lib.licenses.bsd3; @@ -234440,6 +230439,8 @@ self: { testToolDepends = [ tasty-discover ]; description = "throwable-exceptions gives the easy way to throw exceptions"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "thumbnail" = callPackage @@ -234633,25 +230634,6 @@ self: { "tidal" = callPackage ({ mkDerivation, base, bifunctors, bytestring, clock, colour - , containers, hosc, microspec, mwc-random, network, parsec - , template-haskell, text, transformers, vector - }: - mkDerivation { - pname = "tidal"; - version = "1.0.14"; - sha256 = "15bcv5np25sm11ny7b5ak6i321vsy7v1kdxx58y6hqpyn8yx0mx0"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base bifunctors bytestring clock colour containers hosc mwc-random - network parsec template-haskell text transformers vector - ]; - testHaskellDepends = [ base containers microspec parsec ]; - description = "Pattern language for improvised music"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "tidal_1_3_0" = callPackage - ({ mkDerivation, base, bifunctors, bytestring, clock, colour , containers, criterion, deepseq, hosc, microspec, mwc-random , network, parsec, text, transformers, vector, weigh }: @@ -234668,7 +230650,6 @@ self: { benchmarkHaskellDepends = [ base criterion weigh ]; description = "Pattern language for improvised music"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tidal-midi" = callPackage @@ -234898,17 +230879,6 @@ self: { }) {}; "time-compat" = callPackage - ({ mkDerivation, base, old-time, time }: - mkDerivation { - pname = "time-compat"; - version = "0.1.0.3"; - sha256 = "0zqgzr8yjn36rn6gflwh5s0c92vl44xzxiw0jz8d5h0h8lhi21sr"; - libraryHaskellDepends = [ base old-time time ]; - description = "Compatibility with old-time for the time package"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "time-compat_1_9_2_2" = callPackage ({ mkDerivation, base, base-compat, base-orphans, deepseq, HUnit , QuickCheck, tagged, tasty, tasty-hunit, tasty-quickcheck, time }: @@ -234925,7 +230895,6 @@ self: { ]; description = "Compatibility package for time"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "time-extras" = callPackage @@ -235500,23 +231469,6 @@ self: { }) {}; "timer-wheel" = callPackage - ({ mkDerivation, atomic-primops, base, ghc-prim, primitive - , psqueues - }: - mkDerivation { - pname = "timer-wheel"; - version = "0.1.0"; - sha256 = "0wjm767yxf3hg3p80nd0hi0bfvdssq0f3lj9pzkmrsnsqafngs2j"; - revision = "1"; - editedCabalFile = "0vk0p21x90wiazss30zkbzr5fnsc4gih9a6xaa9myyycw078600v"; - libraryHaskellDepends = [ - atomic-primops base ghc-prim primitive psqueues - ]; - description = "A timer wheel"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "timer-wheel_0_2_0_1" = callPackage ({ mkDerivation, atomic-primops, base, psqueues, random, vector }: mkDerivation { pname = "timer-wheel"; @@ -235526,7 +231478,6 @@ self: { testHaskellDepends = [ base random ]; description = "A timer wheel"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "timerep" = callPackage @@ -235666,6 +231617,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "timeutils" = callPackage + ({ mkDerivation, base, brick, hspec, microlens, time, vty }: + mkDerivation { + pname = "timeutils"; + version = "0.1.0"; + sha256 = "12i331hvnbzbln8c38wqj7a7836l40zm4p1b3lb10q81qk4wnygi"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base microlens time ]; + executableHaskellDepends = [ base brick microlens time vty ]; + testHaskellDepends = [ base hspec microlens time ]; + description = "Time utilities"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "timezone-olson" = callPackage ({ mkDerivation, base, binary, bytestring, extensible-exceptions , time, timezone-series @@ -235841,23 +231809,6 @@ self: { }: mkDerivation { pname = "tinylog"; - version = "0.14.1"; - sha256 = "01yz41l45qmc878gzhbchzkvr4ha2cfmvvjv31hwivgwgl8rcgni"; - libraryHaskellDepends = [ - base bytestring containers double-conversion fast-logger text - transformers unix-time - ]; - benchmarkHaskellDepends = [ base bytestring criterion ]; - description = "Simplistic logging using fast-logger"; - license = stdenv.lib.licenses.mpl20; - }) {}; - - "tinylog_0_15_0" = callPackage - ({ mkDerivation, base, bytestring, containers, criterion - , double-conversion, fast-logger, text, transformers, unix-time - }: - mkDerivation { - pname = "tinylog"; version = "0.15.0"; sha256 = "0pwdymx4kx3im9pzah0lmh64x7agdklf6dwqpjx93ybswi61cwfb"; libraryHaskellDepends = [ @@ -235867,7 +231818,6 @@ self: { benchmarkHaskellDepends = [ base bytestring criterion ]; description = "Simplistic logging using fast-logger"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tinytemplate" = callPackage @@ -236189,21 +232139,6 @@ self: { }: mkDerivation { pname = "tls-session-manager"; - version = "0.0.2.1"; - sha256 = "19pygahf2hb5yp06spninqjs7a0078lmggmrqkq16ri9vifq6454"; - libraryHaskellDepends = [ - auto-update base basement bytestring clock memory psqueues tls - ]; - description = "In-memory TLS session manager"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "tls-session-manager_0_0_3" = callPackage - ({ mkDerivation, auto-update, base, basement, bytestring, clock - , memory, psqueues, tls - }: - mkDerivation { - pname = "tls-session-manager"; version = "0.0.3"; sha256 = "0k57flqp2b4bipafiyfipnqmdqv04ky39yr4s4s9sx577zz2j2yi"; libraryHaskellDepends = [ @@ -236211,7 +232146,6 @@ self: { ]; description = "In-memory TLS session manager"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tmapchan" = callPackage @@ -236256,30 +232190,6 @@ self: { }: mkDerivation { pname = "tmp-postgres"; - version = "0.1.2.2"; - sha256 = "1lsf8ydf21dql452jk3x6maicip65r4jyb9xd5a98687j798bm6n"; - libraryHaskellDepends = [ - async base bytestring directory network port-utils - postgresql-simple process temporary unix - ]; - testHaskellDepends = [ - base bytestring directory hspec hspec-discover postgresql-simple - process temporary - ]; - testToolDepends = [ hspec-discover ]; - description = "Start and stop a temporary postgres for testing"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "tmp-postgres_0_2_0_0" = callPackage - ({ mkDerivation, async, base, bytestring, directory, hspec - , hspec-discover, network, port-utils, postgresql-simple, process - , temporary, unix - }: - mkDerivation { - pname = "tmp-postgres"; version = "0.2.0.0"; sha256 = "08w88rh8yap7dmh2jn3x8rd918jxscw46jzljfbdyda9rzfz7kq4"; libraryHaskellDepends = [ @@ -236348,6 +232258,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "to" = callPackage + ({ mkDerivation, base, bytestring, text, utf8-string }: + mkDerivation { + pname = "to"; + version = "1.0.0"; + sha256 = "0lkmxyn3g2blrq9nc1ih46f5qghnida2mdpsx6ixksy12cnxswja"; + libraryHaskellDepends = [ base bytestring text utf8-string ]; + description = "Simple, safe, boring type conversions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "to-haskell" = callPackage ({ mkDerivation, base, containers, haskell-src-exts, transformers }: @@ -236684,38 +232605,6 @@ self: { "tomland" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, deepseq - , gauge, hashable, hedgehog, hspec-megaparsec, htoml - , htoml-megaparsec, megaparsec, mtl, parsec, parser-combinators - , tasty, tasty-discover, tasty-hedgehog, tasty-hspec, tasty-silver - , text, time, transformers, unordered-containers - }: - mkDerivation { - pname = "tomland"; - version = "0.5.0"; - sha256 = "001gw3yj0ibg3dm4q5wz8akjpcdx6zj3jza1y6gq7m5h13fzrvgf"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring containers deepseq hashable megaparsec mtl - parser-combinators text time transformers unordered-containers - ]; - executableHaskellDepends = [ base text time unordered-containers ]; - testHaskellDepends = [ - base hedgehog hspec-megaparsec megaparsec tasty tasty-hedgehog - tasty-hspec tasty-silver text time unordered-containers - ]; - testToolDepends = [ tasty-discover ]; - benchmarkHaskellDepends = [ - aeson base deepseq gauge htoml htoml-megaparsec parsec text time - ]; - description = "Bidirectional TOML parser"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "tomland_1_1_0_1" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, deepseq , directory, gauge, hashable, hedgehog, hspec-megaparsec, htoml , htoml-megaparsec, markdown-unlit, megaparsec, mtl, parsec , parser-combinators, tasty, tasty-discover, tasty-hedgehog @@ -236767,6 +232656,8 @@ self: { ]; description = "Command-line tool to check syntax of TOML files"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tonalude" = callPackage @@ -236919,8 +232810,8 @@ self: { }: mkDerivation { pname = "too-many-cells"; - version = "0.1.12.2"; - sha256 = "01jbz5a51myy4293637c9v2ac87cp60l4rax2gkdiqw8vj8231j4"; + version = "0.1.12.4"; + sha256 = "02qgin4x0vmj56y4yv3zb4fimd6zaqnx344gyj9lrq11fnr202yr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -237385,8 +233276,6 @@ self: { testHaskellDepends = [ base pretty text ]; description = "Data Type for Rewriting Systems"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "tptp" = callPackage @@ -237557,8 +233446,8 @@ self: { }: mkDerivation { pname = "traction"; - version = "0.2.0"; - sha256 = "1rbbp2sw5i1x499bhi1d0f37m34rf6j9p2ndlqsijallmdiawcgq"; + version = "0.3.0"; + sha256 = "1y0l02hcbxmc3vidg477z7dlbikalmi448dv8dl5pl7zpflcp7di"; libraryHaskellDepends = [ base bytestring containers exceptions mmorph postgresql-simple resource-pool syb template-haskell text time transformers @@ -238142,6 +234031,8 @@ self: { testHaskellDepends = [ base doctest ]; description = "Type Safe Web Routing"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "trasa-client" = callPackage @@ -238158,6 +234049,8 @@ self: { ]; description = "Type safe http requests"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "trasa-extra" = callPackage @@ -238195,6 +234088,8 @@ self: { ]; description = "generate forms using lucid, ditto and trasa"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "trasa-reflex" = callPackage @@ -238228,6 +234123,8 @@ self: { ]; description = "Type safe web server"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "trasa-th" = callPackage @@ -238378,31 +234275,6 @@ self: { "tree-diff" = callPackage ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base - , base-compat, bytestring, containers, generics-sop, hashable - , MemoTrie, parsec, parsers, pretty, QuickCheck, scientific, tagged - , tasty, tasty-golden, tasty-quickcheck, text, time, trifecta - , unordered-containers, uuid-types, vector - }: - mkDerivation { - pname = "tree-diff"; - version = "0.0.2.1"; - sha256 = "0hz7jklzb4cc63l68jxc58ik0ybgim9niwq2gfi0cskv5g2yr3ym"; - libraryHaskellDepends = [ - aeson ansi-terminal ansi-wl-pprint base base-compat bytestring - containers generics-sop hashable MemoTrie parsec parsers pretty - QuickCheck scientific tagged text time unordered-containers - uuid-types vector - ]; - testHaskellDepends = [ - ansi-terminal ansi-wl-pprint base base-compat parsec QuickCheck - tasty tasty-golden tasty-quickcheck trifecta - ]; - description = "Diffing of (expression) trees"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "tree-diff_0_1" = callPackage - ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base , base-compat, bytestring, bytestring-builder, containers, hashable , parsec, parsers, pretty, QuickCheck, scientific, tagged, tasty , tasty-golden, tasty-quickcheck, text, time, trifecta @@ -238424,7 +234296,6 @@ self: { ]; description = "Diffing of (expression) trees"; license = stdenv.lib.licenses.gpl2Plus; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tree-fun" = callPackage @@ -238896,6 +234767,8 @@ self: { testHaskellDepends = [ base hspec ]; description = "A command-line tool for trimming whitespace"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "trimpolya" = callPackage @@ -240262,6 +236135,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Twitter API package with conduit interface and Streaming API support"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "twitter-enumerator" = callPackage @@ -240327,6 +236202,8 @@ self: { ]; description = "Twitter JSON parser and types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "twitter-types-lens" = callPackage @@ -240342,6 +236219,8 @@ self: { ]; description = "Twitter JSON types (lens powered)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tx" = callPackage @@ -240651,8 +236530,6 @@ self: { ]; description = "Tools for writing better type errors"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "type-errors-pretty" = callPackage @@ -240976,23 +236853,11 @@ self: { ({ mkDerivation, base, ghc-prim }: mkDerivation { pname = "type-operators"; - version = "0.1.0.4"; - sha256 = "0x0bshb13b7i4imn0pgpljcj109c9z5mgw84mjmlcg62d3ryvg6v"; - libraryHaskellDepends = [ base ghc-prim ]; - description = "Various type-level operators"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "type-operators_0_2_0_0" = callPackage - ({ mkDerivation, base, ghc-prim }: - mkDerivation { - pname = "type-operators"; version = "0.2.0.0"; sha256 = "1cm3vfarjpwm885i5w5mjyg1ibg9bm5q34hbacpl3c9q9l1vwl4j"; libraryHaskellDepends = [ base ghc-prim ]; description = "Various type-level operators"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "type-ord" = callPackage @@ -241040,6 +236905,18 @@ self: { broken = true; }) {}; + "type-sets" = callPackage + ({ mkDerivation, base, cmptype }: + mkDerivation { + pname = "type-sets"; + version = "0.1.1.0"; + sha256 = "0ryrivrhpplck0h6h7d8pfl5bg7lbv2519icz317yp2qy8r3g2l7"; + libraryHaskellDepends = [ base cmptype ]; + testHaskellDepends = [ base cmptype ]; + description = "Type-level sets"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "type-settheory" = callPackage ({ mkDerivation, base, containers, syb, template-haskell , transformers, type-equality @@ -241061,25 +236938,12 @@ self: { ({ mkDerivation, base, pretty }: mkDerivation { pname = "type-spec"; - version = "0.3.0.1"; - sha256 = "0hd2lgfp6vydynr2ip4zy4kg2jzrfkrrqj1vnx1fn4zwkqqimkdf"; - libraryHaskellDepends = [ base pretty ]; - testHaskellDepends = [ base ]; - description = "Type Level Specification by Example"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "type-spec_0_4_0_0" = callPackage - ({ mkDerivation, base, pretty }: - mkDerivation { - pname = "type-spec"; version = "0.4.0.0"; sha256 = "0z94hgvmnpcv9va7spdkmbxz99ri1skdq3kwxbid77cpyh95xsxq"; libraryHaskellDepends = [ base pretty ]; testHaskellDepends = [ base ]; description = "Type Level Specification by Example"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "type-spine" = callPackage @@ -241243,25 +237107,6 @@ self: { "typed-process" = callPackage ({ mkDerivation, async, base, base64-bytestring, bytestring, hspec - , process, stm, temporary, transformers - }: - mkDerivation { - pname = "typed-process"; - version = "0.2.5.0"; - sha256 = "01mx5zsivir6dpw8ih4y801figld65l0anbr1hfl5a6vwnmnjr2r"; - libraryHaskellDepends = [ - async base bytestring process stm transformers - ]; - testHaskellDepends = [ - async base base64-bytestring bytestring hspec process stm temporary - transformers - ]; - description = "Run external processes, with strong typing of streams"; - license = stdenv.lib.licenses.mit; - }) {}; - - "typed-process_0_2_6_0" = callPackage - ({ mkDerivation, async, base, base64-bytestring, bytestring, hspec , process, stm, temporary, transformers, unliftio-core }: mkDerivation { @@ -241277,7 +237122,6 @@ self: { ]; description = "Run external processes, with strong typing of streams"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "typed-spreadsheet" = callPackage @@ -241448,17 +237292,6 @@ self: { }) {}; "typelits-witnesses" = callPackage - ({ mkDerivation, base, constraints, reflection }: - mkDerivation { - pname = "typelits-witnesses"; - version = "0.3.0.3"; - sha256 = "078r9pbkzwzm1q821zqisj0wrx1rdk9w8c3ip0g1m5j97zzlmpaf"; - libraryHaskellDepends = [ base constraints reflection ]; - description = "Existential witnesses, singletons, and classes for operations on GHC TypeLits"; - license = stdenv.lib.licenses.mit; - }) {}; - - "typelits-witnesses_0_4_0_0" = callPackage ({ mkDerivation, base, dependent-sum }: mkDerivation { pname = "typelits-witnesses"; @@ -241467,7 +237300,6 @@ self: { libraryHaskellDepends = [ base dependent-sum ]; description = "Existential witnesses, singletons, and classes for operations on GHC TypeLits"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "typenums" = callPackage @@ -241521,37 +237353,6 @@ self: { }: mkDerivation { pname = "typerep-map"; - version = "0.3.1"; - sha256 = "1ycyk47h578vf4kpf1y708zg9cc6i028jv1fdaw3zy59wrbl8y74"; - revision = "2"; - editedCabalFile = "0zcvg2kr3kcnhxdndw6fcjdd1421ncglr34mc8d9sw1hjjcb5w38"; - libraryHaskellDepends = [ - base containers deepseq ghc-prim primitive vector - ]; - testHaskellDepends = [ - base ghc-typelits-knownnat hedgehog QuickCheck tasty tasty-discover - tasty-hedgehog tasty-hspec - ]; - testToolDepends = [ tasty-discover ]; - benchmarkHaskellDepends = [ - base criterion deepseq dependent-map dependent-sum - ghc-typelits-knownnat - ]; - doHaddock = false; - description = "Efficient implementation of a dependent map with types as keys"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "typerep-map_0_3_2" = callPackage - ({ mkDerivation, base, containers, criterion, deepseq - , dependent-map, dependent-sum, ghc-prim, ghc-typelits-knownnat - , hedgehog, primitive, QuickCheck, tasty, tasty-discover - , tasty-hedgehog, tasty-hspec, vector - }: - mkDerivation { - pname = "typerep-map"; version = "0.3.2"; sha256 = "0s77hj0m9jiqgybccdfl1x88j05fx7grkg16q6kldd1lgqrvrgb0"; revision = "3"; @@ -241678,6 +237479,8 @@ self: { ]; description = "Just let me draw nice text already"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "typography-geometry" = callPackage @@ -242131,8 +237934,6 @@ self: { ]; description = "Minimal HTTP client library optimized for benchmarking"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ui-command" = callPackage @@ -242232,10 +238033,8 @@ self: { }: mkDerivation { pname = "unagi-chan"; - version = "0.4.1.0"; - sha256 = "0nya6srsnj7f10jim3iqlmdi71n6fl8ly9sqpccgnivnd8i5iavb"; - revision = "2"; - editedCabalFile = "06iygfs8k6agspfhci3p76chc84z0pcyq918fr10xnjbzpjfkrrg"; + version = "0.4.1.2"; + sha256 = "1lnl5n4jnjmm4chp461glcwkrrw63rjz3fvprwxcy3lkpbkrqvgn"; libraryHaskellDepends = [ atomic-primops base ghc-prim primitive ]; testHaskellDepends = [ atomic-primops base containers ghc-prim primitive @@ -242544,6 +238343,8 @@ self: { ]; description = "Class of data structures that can be unfolded"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "unfoldable-restricted" = callPackage @@ -242560,6 +238361,8 @@ self: { ]; description = "An alternative to the Unfoldable typeclass"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ungadtagger" = callPackage @@ -242897,6 +238700,8 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq lens ]; description = "Extensible type-safe unions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "union-find" = callPackage @@ -243130,8 +238935,8 @@ self: { ({ mkDerivation, base, template-haskell, units }: mkDerivation { pname = "units-defs"; - version = "2.0.1.1"; - sha256 = "0p99gchk3m4ibmhr6jws57sv083q142rhxjavq9laz97gjm2r9w2"; + version = "2.1.0.1"; + sha256 = "1ck50r8mhcvjyfx3wdkn8s89rrzjkxpn439zarg5s2vqmqji7gyy"; libraryHaskellDepends = [ base template-haskell units ]; description = "Definitions for use with the units package"; license = stdenv.lib.licenses.bsd3; @@ -243275,22 +239080,9 @@ self: { ]; description = "A class for finite and recursively enumerable types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "universe-base" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "universe-base"; - version = "1.0.2.1"; - sha256 = "0ldvk0bj16hl1v824vvsich3rzx84xm3sbppd5ahpp5cmx887i07"; - libraryHaskellDepends = [ base ]; - description = "A class for finite and recursively enumerable types and some helper functions for enumerating them"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "universe-base_1_1_1" = callPackage ({ mkDerivation, base, containers, QuickCheck, tagged, transformers }: mkDerivation { @@ -243301,7 +239093,6 @@ self: { testHaskellDepends = [ base containers QuickCheck ]; description = "A class for finite and recursively enumerable types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "universe-dependent-sum" = callPackage @@ -243323,24 +239114,9 @@ self: { ]; description = "Universe instances for types from dependent-sum"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "universe-instances-base" = callPackage - ({ mkDerivation, base, containers, universe-base }: - mkDerivation { - pname = "universe-instances-base"; - version = "1.0"; - sha256 = "04njgl32lk5a0masjdjkm4l2wsyrr29g0fsp599864mp7gp504d2"; - revision = "2"; - editedCabalFile = "0c9zxmifhy2qjvsikgm168n8k8ka8ia88ldy8qjqkz5pqknlr9sj"; - libraryHaskellDepends = [ base containers universe-base ]; - description = "Universe instances for types from the base package"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "universe-instances-base_1_1" = callPackage ({ mkDerivation, base, universe-base }: mkDerivation { pname = "universe-instances-base"; @@ -243351,7 +239127,6 @@ self: { libraryHaskellDepends = [ base universe-base ]; description = "Universe instances for types from the base package"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "universe-instances-extended" = callPackage @@ -243365,28 +239140,9 @@ self: { libraryHaskellDepends = [ adjunctions base comonad universe-base ]; description = "Universe instances for types from selected extra packages"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "universe-instances-trans" = callPackage - ({ mkDerivation, base, mtl, transformers, universe-base - , universe-instances-base - }: - mkDerivation { - pname = "universe-instances-trans"; - version = "1.0.0.1"; - sha256 = "03iix0bdhfi4qlgwr8sl3gsqck6lsbkqgx245w2z5yaaxgqpq10d"; - revision = "1"; - editedCabalFile = "0dcwgbgmbkjwzbxlncpl1b5hgjrmkl73djknjkhbnh02pysbwv69"; - libraryHaskellDepends = [ - base mtl transformers universe-base universe-instances-base - ]; - description = "Universe instances for types from the transformers and mtl packages"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "universe-instances-trans_1_1" = callPackage ({ mkDerivation, base, universe-base }: mkDerivation { pname = "universe-instances-trans"; @@ -243397,25 +239153,9 @@ self: { libraryHaskellDepends = [ base universe-base ]; description = "Universe instances for types from the transformers and mtl packages"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "universe-reverse-instances" = callPackage - ({ mkDerivation, base, containers, universe-instances-base }: - mkDerivation { - pname = "universe-reverse-instances"; - version = "1.0"; - sha256 = "0jcd7qyvzq8xxv9d3hfi0f1h48xdsy9r9xnxgxc7ggga4szirm79"; - revision = "2"; - editedCabalFile = "0cpnsip1iakwkgnwnd21gwrc8qbifzpff6agjwm34jgkq9j646k8"; - libraryHaskellDepends = [ - base containers universe-instances-base - ]; - description = "instances of standard classes that are made possible by enumerations"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "universe-reverse-instances_1_1" = callPackage ({ mkDerivation, base, containers, universe-base }: mkDerivation { pname = "universe-reverse-instances"; @@ -243426,7 +239166,6 @@ self: { libraryHaskellDepends = [ base containers universe-base ]; description = "Instances of standard classes that are made possible by enumerations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "universe-th" = callPackage @@ -243510,10 +239249,8 @@ self: { ({ mkDerivation, base, unix }: mkDerivation { pname = "unix-compat"; - version = "0.5.1"; - sha256 = "0llwl7rp63fy2ychwdclz1afj45pbin5pfl01dvn6rwhvmwhr7d3"; - revision = "1"; - editedCabalFile = "0c4ak3y72nhv3nf025cyfi1dri2wjmsal3icjwj0aczmlb0imwrd"; + version = "0.5.2"; + sha256 = "1a8brv9fax76b1fymslzyghwa6ma8yijiyyhn12msl3i5x24x6k5"; libraryHaskellDepends = [ base unix ]; description = "Portable POSIX-compatibility layer"; license = stdenv.lib.licenses.bsd3; @@ -243647,6 +239384,8 @@ self: { ]; description = "Bidirectional JSON parsing and generation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "unlambda" = callPackage @@ -243675,31 +239414,6 @@ self: { }) {}; "unliftio" = callPackage - ({ mkDerivation, async, base, containers, deepseq, directory - , filepath, gauge, hspec, process, QuickCheck, stm, time - , transformers, unix, unliftio-core - }: - mkDerivation { - pname = "unliftio"; - version = "0.2.11"; - sha256 = "1bc80845pbrs19xh0557w14k1ymzdysc8sf5vh63cfx63vpkw772"; - libraryHaskellDepends = [ - async base deepseq directory filepath process stm time transformers - unix unliftio-core - ]; - testHaskellDepends = [ - async base containers deepseq directory filepath hspec process - QuickCheck stm time transformers unix unliftio-core - ]; - benchmarkHaskellDepends = [ - async base deepseq directory filepath gauge process stm time - transformers unix unliftio-core - ]; - description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)"; - license = stdenv.lib.licenses.mit; - }) {}; - - "unliftio_0_2_12" = callPackage ({ mkDerivation, async, base, bytestring, containers, deepseq , directory, filepath, gauge, hspec, process, QuickCheck, stm, time , transformers, unix, unliftio-core @@ -243722,7 +239436,6 @@ self: { ]; description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unliftio-core" = callPackage @@ -244888,6 +240601,8 @@ self: { ]; description = "The UserId type and useful instances for web development"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "users" = callPackage @@ -245151,6 +240866,8 @@ self: { testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ]; description = "Utilities for universal types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "utility-ht" = callPackage @@ -245595,6 +241312,8 @@ self: { testHaskellDepends = [ base process ]; description = "the cabal companion"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vabal-lib" = callPackage @@ -245779,6 +241498,8 @@ self: { pname = "validated-literals"; version = "0.3.0"; sha256 = "1k77jp19kl7h4v9hl2jhsmbq8dhzl8z9sgkw1jxx1rblm3fszjx1"; + revision = "1"; + editedCabalFile = "1l6b488pnarmx4a1cysbx0lpcx0kvrs4x3bc4sinpnzv0r5az4z4"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base bytestring deepseq tasty tasty-hunit tasty-travis @@ -245786,8 +241507,6 @@ self: { ]; description = "Compile-time checking for partial smart-constructors"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "validated-types" = callPackage @@ -245810,24 +241529,6 @@ self: { }: mkDerivation { pname = "validation"; - version = "1"; - sha256 = "08drmdvyzg2frbb26icy1mlz52xv0l6gi3v8gb7xp0vrcci5libh"; - revision = "1"; - editedCabalFile = "1x1g4nannz81j1h64l1m3ancc96zc57d1bjhj1wk7bwn1xxbi5h3"; - libraryHaskellDepends = [ - base bifunctors deepseq lens semigroupoids semigroups - ]; - testHaskellDepends = [ base hedgehog HUnit lens semigroups ]; - description = "A data-type like Either but with an accumulating Applicative"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "validation_1_1" = callPackage - ({ mkDerivation, base, bifunctors, deepseq, hedgehog, HUnit, lens - , semigroupoids, semigroups - }: - mkDerivation { - pname = "validation"; version = "1.1"; sha256 = "1acj7mh3581ks405xswxw6667z7y1y0slisg6jvp6chc191ji9l5"; revision = "1"; @@ -245838,7 +241539,6 @@ self: { testHaskellDepends = [ base hedgehog HUnit lens semigroups ]; description = "A data-type like Either but with an accumulating Applicative"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "validations" = callPackage @@ -246197,21 +241897,6 @@ self: { }: mkDerivation { pname = "vault"; - version = "0.3.1.2"; - sha256 = "072mbrihsdsb8c6xvg6lvk0rqjgvxvi8qkg4n6wwym5hq0pfa04y"; - libraryHaskellDepends = [ - base containers hashable semigroups unordered-containers - ]; - description = "a persistent store for values of arbitrary types"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "vault_0_3_1_3" = callPackage - ({ mkDerivation, base, containers, hashable, semigroups - , unordered-containers - }: - mkDerivation { - pname = "vault"; version = "0.3.1.3"; sha256 = "0vdm472vn734xa27jjm2mjacl37mxiqaaahvm4hzqjgyh4cqq377"; libraryHaskellDepends = [ @@ -246219,7 +241904,6 @@ self: { ]; description = "a persistent store for values of arbitrary types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vault-tool" = callPackage @@ -246472,27 +242156,6 @@ self: { }: mkDerivation { pname = "vec"; - version = "0.1.1"; - sha256 = "1ryc6jshm26dh21xlf4wg4fhkw035bxx4smd3xyisjqm7nncq7n5"; - revision = "1"; - editedCabalFile = "0yaqc8ci0iy46fimznmr499c5ygrvhfspwbkxdhn112zrci3b7af"; - libraryHaskellDepends = [ - adjunctions base base-compat deepseq distributive fin hashable lens - semigroupoids transformers - ]; - testHaskellDepends = [ base fin inspection-testing tagged ]; - benchmarkHaskellDepends = [ base criterion fin vector ]; - description = "Vec: length-indexed (sized) list"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "vec_0_1_1_1" = callPackage - ({ mkDerivation, adjunctions, base, base-compat, criterion, deepseq - , distributive, fin, hashable, inspection-testing, lens - , semigroupoids, tagged, transformers, vector - }: - mkDerivation { - pname = "vec"; version = "0.1.1.1"; sha256 = "0gzypyi4vv5ajysbmnpicm8r2qh95nmmrj9l6hp30b95i36cb5as"; libraryHaskellDepends = [ @@ -246503,7 +242166,6 @@ self: { benchmarkHaskellDepends = [ base criterion fin vector ]; description = "Vec: length-indexed (sized) list"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vect" = callPackage @@ -246919,25 +242581,11 @@ self: { ({ mkDerivation, base, Boolean, MemoTrie, NumInstances }: mkDerivation { pname = "vector-space"; - version = "0.15"; - sha256 = "03swlbn0x8gfb7bilxmh3zckprjc6v64bildmhwzlimjvd1v8jb8"; - revision = "1"; - editedCabalFile = "19549mrhg3x0d1ancrxyvrskd6p4x11iprnv0b0d84q7sc40fa8w"; - libraryHaskellDepends = [ base Boolean MemoTrie NumInstances ]; - description = "Vector & affine spaces, linear maps, and derivatives"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "vector-space_0_16" = callPackage - ({ mkDerivation, base, Boolean, MemoTrie, NumInstances }: - mkDerivation { - pname = "vector-space"; version = "0.16"; sha256 = "17676s2f8i45dj5gk370nc8585aylah7m34nbf34al7r1492y2qc"; libraryHaskellDepends = [ base Boolean MemoTrie NumInstances ]; description = "Vector & affine spaces, linear maps, and derivatives"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vector-space-map" = callPackage @@ -246950,6 +242598,8 @@ self: { testHaskellDepends = [ base doctest ]; description = "vector-space operations for finite maps using Data.Map"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vector-space-opengl" = callPackage @@ -247098,17 +242748,6 @@ self: { }) {}; "verbosity" = callPackage - ({ mkDerivation, base, binary, data-default-class, deepseq }: - mkDerivation { - pname = "verbosity"; - version = "0.2.3.0"; - sha256 = "0r7jj2h7xzz3i8ck00z19h4bfr4r4nxfzi6ya9kppcda92myak4b"; - libraryHaskellDepends = [ base binary data-default-class deepseq ]; - description = "Simple enum that encodes application verbosity"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "verbosity_0_3_0_0" = callPackage ({ mkDerivation, base, binary, data-default-class, deepseq, dhall , generic-lens, serialise }: @@ -247121,7 +242760,6 @@ self: { ]; description = "Simple enum that encodes application verbosity"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "verdict" = callPackage @@ -247565,28 +243203,6 @@ self: { }: mkDerivation { pname = "vinyl"; - version = "0.10.0.1"; - sha256 = "1x2x40cgyhj3yzw4kajssjvlnwlcrrnz7vaa8as2k9xmv9x76ig4"; - libraryHaskellDepends = [ array base ghc-prim ]; - testHaskellDepends = [ - aeson base doctest hspec lens lens-aeson microlens mtl - should-not-typecheck singletons text unordered-containers vector - ]; - benchmarkHaskellDepends = [ - base criterion linear microlens mwc-random primitive tagged vector - ]; - description = "Extensible Records"; - license = stdenv.lib.licenses.mit; - }) {}; - - "vinyl_0_11_0" = callPackage - ({ mkDerivation, aeson, array, base, criterion, doctest, ghc-prim - , hspec, lens, lens-aeson, linear, microlens, mtl, mwc-random - , primitive, should-not-typecheck, singletons, tagged, text - , unordered-containers, vector - }: - mkDerivation { - pname = "vinyl"; version = "0.11.0"; sha256 = "0sqa4x8cwg6hdx3lrnq9pbggsh5vv6rhng2az4grl60c4kw6zr08"; libraryHaskellDepends = [ array base ghc-prim ]; @@ -247600,6 +243216,7 @@ self: { description = "Extensible Records"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vinyl-generics" = callPackage @@ -247617,6 +243234,8 @@ self: { ]; description = "Convert plain records to vinyl (and vice versa), generically"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vinyl-gl" = callPackage @@ -247638,6 +243257,8 @@ self: { ]; description = "Utilities for working with OpenGL's GLSL shading language and vinyl records"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vinyl-json" = callPackage @@ -247667,6 +243288,8 @@ self: { libraryHaskellDepends = [ base vinyl ]; description = "Syntax sugar for vinyl records using overloaded labels"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vinyl-operational" = callPackage @@ -248484,24 +244107,6 @@ self: { }) {}; "wai-cli" = callPackage - ({ mkDerivation, ansi-terminal, base, http-types, monads-tf - , network, options, socket-activation, stm, streaming-commons, unix - , wai, wai-extra, warp, warp-tls - }: - mkDerivation { - pname = "wai-cli"; - version = "0.1.1"; - sha256 = "0qi84p1x5b0hvsdgd03fn80j3ai0s0svcl340z9fvz6lrgcfnhq6"; - libraryHaskellDepends = [ - ansi-terminal base http-types monads-tf network options - socket-activation stm streaming-commons unix wai wai-extra warp - warp-tls - ]; - description = "Command line runner for Wai apps (using Warp) with TLS, CGI, socket activation & graceful shutdown"; - license = stdenv.lib.licenses.publicDomain; - }) {}; - - "wai-cli_0_2_1" = callPackage ({ mkDerivation, ansi-terminal, base, http-types, iproute , monads-tf, network, options, socket-activation, stm , streaming-commons, unix, wai, wai-extra, warp, warp-tls @@ -248519,7 +244124,6 @@ self: { ]; description = "Command line runner for Wai apps (using Warp) with TLS, CGI, socket activation & graceful shutdown"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-conduit" = callPackage @@ -248663,8 +244267,8 @@ self: { }: mkDerivation { pname = "wai-extra"; - version = "3.0.26.1"; - sha256 = "1gsjji9i471j224sfp4xdm4vga3jcbdvdg7f40y3l58pplf6a3qd"; + version = "3.0.27"; + sha256 = "1p8x61xjbwjif10iibc3b2gxh3dd3rymrfvinrdn0h9wn7qsyh2x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -248682,7 +244286,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "wai-extra_3_0_27" = callPackage + "wai-extra_3_0_28" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring , bytestring, case-insensitive, containers, cookie , data-default-class, deepseq, directory, fast-logger, hspec @@ -248692,8 +244296,8 @@ self: { }: mkDerivation { pname = "wai-extra"; - version = "3.0.27"; - sha256 = "1p8x61xjbwjif10iibc3b2gxh3dd3rymrfvinrdn0h9wn7qsyh2x"; + version = "3.0.28"; + sha256 = "0iky7k4kirngvk1p2nz19zgzffb5hppfaxdjan80v06ikc8w1wm7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -249825,6 +245429,8 @@ self: { ]; description = "Typesafe URLs for Wai applications"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wai-routing" = callPackage @@ -250568,28 +246174,6 @@ self: { }) {}; "wave" = callPackage - ({ mkDerivation, base, bytestring, cereal, containers - , data-default-class, hspec, QuickCheck, temporary, transformers - }: - mkDerivation { - pname = "wave"; - version = "0.1.5"; - sha256 = "03zycmwrchhqvi37fdvlzz2d1vl4hy0i8xyys1zznw38qfq0h2i5"; - revision = "2"; - editedCabalFile = "0zs0mw42z9xzs1r935pd5dssf0x10qbkhxlpfknv0x75n2k0azzj"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base bytestring cereal containers data-default-class transformers - ]; - testHaskellDepends = [ - base bytestring containers data-default-class hspec QuickCheck - temporary - ]; - description = "Work with WAVE and RF64 files"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "wave_0_2_0" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, hspec , hspec-discover, QuickCheck, temporary, transformers }: @@ -250607,7 +246191,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Work with WAVE and RF64 files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wavefront" = callPackage @@ -250808,6 +246391,8 @@ self: { testHaskellDepends = [ base bytestring HUnit network-uri text ]; description = "Composable, reversible, efficient web routing using invertible invariants and bijections"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "web-mongrel2" = callPackage @@ -250961,6 +246546,8 @@ self: { ]; description = "Adds support for using web-routes with Happstack"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "web-routes-hsp" = callPackage @@ -251027,6 +246614,8 @@ self: { testHaskellDepends = [ base hspec HUnit QuickCheck web-routes ]; description = "Support for deriving PathInfo using Template Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "web-routes-transformers" = callPackage @@ -251187,6 +246776,8 @@ self: { ]; description = "A super-simple web server framework"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "webcloud" = callPackage @@ -251274,29 +246865,6 @@ self: { "webdriver" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring - , bytestring, data-default-class, directory, directory-tree - , exceptions, filepath, http-client, http-types, lifted-base - , monad-control, network, network-uri, scientific, temporary, text - , time, transformers, transformers-base, unordered-containers - , vector, zip-archive - }: - mkDerivation { - pname = "webdriver"; - version = "0.8.5"; - sha256 = "1gn168cjwlpv2f4jchj48a9pvk8zqdxsf9qpx0lsj4bl2j5pl5m8"; - libraryHaskellDepends = [ - aeson attoparsec base base64-bytestring bytestring - data-default-class directory directory-tree exceptions filepath - http-client http-types lifted-base monad-control network - network-uri scientific temporary text time transformers - transformers-base unordered-containers vector zip-archive - ]; - description = "a Haskell client for the Selenium WebDriver protocol"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "webdriver_0_9_0_1" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , bytestring, call-stack, data-default-class, directory , directory-tree, exceptions, filepath, http-client, http-types , lifted-base, monad-control, network, network-uri, scientific @@ -251316,7 +246884,6 @@ self: { ]; description = "a Haskell client for the Selenium WebDriver protocol"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "webdriver-angular" = callPackage @@ -251338,6 +246905,8 @@ self: { ]; description = "Webdriver actions to assist with testing a webpage which uses Angular.Js"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "webdriver-snoy" = callPackage @@ -251793,6 +247362,8 @@ self: { ]; description = "Composable websockets clients"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "websockets-snap" = callPackage @@ -251912,8 +247483,6 @@ self: { ]; description = "A school-timetable problem-solver"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "weigh" = callPackage @@ -252222,6 +247791,8 @@ self: { ]; description = "Data types for large but fixed width signed and unsigned integers"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wigner-symbols" = callPackage @@ -252437,44 +248008,6 @@ self: { }) {}; "winery" = callPackage - ({ mkDerivation, aeson, base, binary, bytestring, cassava - , containers, cpu, deepseq, directory, gauge, hashable, megaparsec - , mtl, prettyprinter, prettyprinter-ansi-terminal, QuickCheck - , scientific, semigroups, serialise, text, time, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "winery"; - version = "0.3.1"; - sha256 = "1f63fgw7ky6kd0dk41rhqjxgvi33pa5ffrv0vk2i7dr88bmc1wgy"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring containers cpu hashable megaparsec mtl - prettyprinter prettyprinter-ansi-terminal scientific semigroups - text time transformers unordered-containers vector - ]; - executableHaskellDepends = [ - aeson base bytestring containers cpu hashable megaparsec mtl - prettyprinter prettyprinter-ansi-terminal scientific semigroups - text time transformers unordered-containers vector - ]; - testHaskellDepends = [ - aeson base bytestring containers cpu hashable megaparsec mtl - prettyprinter prettyprinter-ansi-terminal QuickCheck scientific - semigroups text time transformers unordered-containers vector - ]; - benchmarkHaskellDepends = [ - aeson base binary bytestring cassava containers cpu deepseq - directory gauge hashable megaparsec mtl prettyprinter - prettyprinter-ansi-terminal scientific semigroups serialise text - time transformers unordered-containers vector - ]; - description = "Sustainable serialisation library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "winery_1_1_2" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, cereal , containers, cpu, deepseq, directory, fast-builder, gauge , hashable, HUnit, megaparsec, mtl, prettyprinter @@ -252509,7 +248042,6 @@ self: { ]; description = "A compact, well-typed seralisation format for Haskell values"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "winio" = callPackage @@ -252647,15 +248179,16 @@ self: { "witherable" = callPackage ({ mkDerivation, base, base-orphans, containers, hashable - , transformers, transformers-compat, unordered-containers, vector + , monoidal-containers, transformers, transformers-compat + , unordered-containers, vector }: mkDerivation { pname = "witherable"; - version = "0.3.1"; - sha256 = "0sjpr1fnmxicpiyhh715fh8cznc971awhhd1mzqn03ybrja8278l"; + version = "0.3.2"; + sha256 = "1iqf3kc9h599lbiym8rf9b4fhj31lqwm1cxqz6x02q9dxyrcprmi"; libraryHaskellDepends = [ - base base-orphans containers hashable transformers - transformers-compat unordered-containers vector + base base-orphans containers hashable monoidal-containers + transformers transformers-compat unordered-containers vector ]; description = "filterable traversable"; license = stdenv.lib.licenses.bsd3; @@ -253005,6 +248538,8 @@ self: { testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ]; description = "Words of arbitrary size"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "word-trie" = callPackage @@ -253429,20 +248964,6 @@ self: { "world-peace" = callPackage ({ mkDerivation, aeson, base, deepseq, doctest, Glob, profunctors - , tagged - }: - mkDerivation { - pname = "world-peace"; - version = "0.1.0.0"; - sha256 = "19anwyh9n9agpcdhzfbh0l28nm0mdn8616klihbw55yxkiwqaxkk"; - libraryHaskellDepends = [ aeson base deepseq profunctors tagged ]; - testHaskellDepends = [ base doctest Glob ]; - description = "Open Union and Open Product Types"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "world-peace_1_0_1_0" = callPackage - ({ mkDerivation, aeson, base, deepseq, doctest, Glob, profunctors , should-not-typecheck, tagged, tasty, tasty-hunit, text }: mkDerivation { @@ -253455,7 +248976,6 @@ self: { ]; description = "Open Union and Open Product Types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wp-archivebot" = callPackage @@ -253609,46 +249129,6 @@ self: { }: mkDerivation { pname = "wreq"; - version = "0.5.3.1"; - sha256 = "1i2f2bxx84l8qzkz9v3qhx5sbl78ysc3vqadfhrxk3h0ljklwfz3"; - revision = "2"; - editedCabalFile = "1rjz4012vp9q7a3szpm8a7rnn62d5cbbp1pp3qwfyi1fgyd5rp6c"; - isLibrary = true; - isExecutable = true; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - aeson attoparsec authenticate-oauth base base16-bytestring - bytestring case-insensitive containers cryptonite exceptions - ghc-prim hashable http-client http-client-tls http-types lens - lens-aeson memory mime-types psqueues template-haskell text time - time-locale-compat unordered-containers - ]; - testHaskellDepends = [ - aeson aeson-pretty base base64-bytestring bytestring - case-insensitive containers directory doctest filepath hashable - http-client http-types HUnit lens lens-aeson network-info - QuickCheck snap-core snap-server temporary test-framework - test-framework-hunit test-framework-quickcheck2 text time - transformers unix-compat unordered-containers uuid vector - ]; - description = "An easy-to-use HTTP client library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "wreq_0_5_3_2" = callPackage - ({ mkDerivation, aeson, aeson-pretty, attoparsec - , authenticate-oauth, base, base16-bytestring, base64-bytestring - , bytestring, Cabal, cabal-doctest, case-insensitive, containers - , cryptonite, directory, doctest, exceptions, filepath, ghc-prim - , hashable, http-client, http-client-tls, http-types, HUnit, lens - , lens-aeson, memory, mime-types, network-info, psqueues - , QuickCheck, snap-core, snap-server, template-haskell, temporary - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , text, time, time-locale-compat, transformers, unix-compat - , unordered-containers, uuid, vector - }: - mkDerivation { - pname = "wreq"; version = "0.5.3.2"; sha256 = "16xls71aby6jqc1frhwnlfvz1iwj1ms0rw9xzif02sn84470gn36"; revision = "1"; @@ -253673,7 +249153,6 @@ self: { ]; description = "An easy-to-use HTTP client library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wreq-sb" = callPackage @@ -254072,6 +249551,21 @@ self: { broken = true; }) {}; + "wu-wei" = callPackage + ({ mkDerivation, base, directory, symbolic-link, unix, yaml }: + mkDerivation { + pname = "wu-wei"; + version = "0.1.0.2"; + sha256 = "001bs5s92wpj1s7pjg7knc9w4czjq2zwm0wj6gjjxgymvvwjax7w"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base directory symbolic-link unix yaml + ]; + description = "Unimportant Unix adminstration tool"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "wumpus-basic" = callPackage ({ mkDerivation, base, containers, directory, filepath , vector-space, wumpus-core @@ -255121,6 +250615,8 @@ self: { benchmarkHaskellDepends = [ base bytestring criterion ]; description = "Simple and incomplete Excel file parser/writer"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "xlsx-tabular" = callPackage @@ -255137,6 +250633,8 @@ self: { testHaskellDepends = [ base ]; description = "Xlsx table cell value extraction utility"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "xlsx-templater" = callPackage @@ -255298,6 +250796,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "xml-conduit-stylist" = callPackage + ({ mkDerivation, base, containers, css-syntax, network-uri, stylist + , text, unordered-containers, xml-conduit + }: + mkDerivation { + pname = "xml-conduit-stylist"; + version = "1.0.0.0"; + sha256 = "1w9ig4mr0l0kj8mk7sfsyv8p77k91l93cfpbpvmg32q9wffz2r02"; + libraryHaskellDepends = [ + base containers css-syntax network-uri stylist text + unordered-containers xml-conduit + ]; + description = "Bridge between xml-conduit/html-conduit and stylist"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "xml-conduit-writer" = callPackage ({ mkDerivation, base, containers, data-default, dlist, mtl, text , xml-conduit, xml-types @@ -255799,28 +251315,6 @@ self: { }) {}; "xmlbf" = callPackage - ({ mkDerivation, base, bytestring, containers, QuickCheck - , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck, text - , transformers, unordered-containers - }: - mkDerivation { - pname = "xmlbf"; - version = "0.4.1"; - sha256 = "0xfw9z1l3ja4qq0lj9i2n81fdh43ggprsy8rm71pcdacnpl056hq"; - revision = "1"; - editedCabalFile = "0j5yvsz0ib5w80wp1gc0li376adw8l861xvf5paa2hdq55jkxvi6"; - libraryHaskellDepends = [ - base bytestring containers text transformers unordered-containers - ]; - testHaskellDepends = [ - base bytestring QuickCheck quickcheck-instances tasty tasty-hunit - tasty-quickcheck text transformers unordered-containers - ]; - description = "XML back and forth! Parser, renderer, ToXml, FromXml, fixpoints"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "xmlbf_0_6" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, QuickCheck , quickcheck-instances, selective, tasty, tasty-hunit , tasty-quickcheck, text, transformers, unordered-containers @@ -255839,7 +251333,6 @@ self: { ]; description = "XML back and forth! Parser, renderer, ToXml, FromXml, fixpoints"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xmlbf-xeno" = callPackage @@ -255849,26 +251342,6 @@ self: { }: mkDerivation { pname = "xmlbf-xeno"; - version = "0.1.1"; - sha256 = "0cnxcw1sh92ljcpla2j7pg0md8yj7j48jgjlsn0f9ha0j90lw73c"; - libraryHaskellDepends = [ - base bytestring html-entities text unordered-containers xeno xmlbf - ]; - testHaskellDepends = [ - base bytestring QuickCheck quickcheck-instances tasty tasty-hunit - tasty-quickcheck text unordered-containers xmlbf - ]; - description = "xeno backend support for the xmlbf library"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "xmlbf-xeno_0_2" = callPackage - ({ mkDerivation, base, bytestring, html-entities, QuickCheck - , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck, text - , unordered-containers, xeno, xmlbf - }: - mkDerivation { - pname = "xmlbf-xeno"; version = "0.2"; sha256 = "1x33885kjddmc39p2jxafypcgpm5fajdxzdd6l9z5bpihlpgk7ig"; libraryHaskellDepends = [ @@ -255881,6 +251354,7 @@ self: { description = "xeno backend support for the xmlbf library"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "xmlbf-xmlhtml" = callPackage @@ -255902,8 +251376,6 @@ self: { ]; description = "xmlhtml backend support for the xmlbf library"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "xmlgen" = callPackage @@ -256844,37 +252316,6 @@ self: { "yam" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, binary, bytestring - , data-default, fast-logger, hspec, http-client, http-types, lens - , menshen, monad-logger, mtl, mwc-random, QuickCheck, reflection - , salak, scientific, servant-client, servant-server - , servant-swagger, servant-swagger-ui, swagger2, text - , unliftio-core, unordered-containers, vault, vector, wai, warp - }: - mkDerivation { - pname = "yam"; - version = "0.5.17"; - sha256 = "128h0j2v9jsr8hpk43hd75i62xasq3g40v0fk20yzp82avyirqzq"; - libraryHaskellDepends = [ - aeson base base16-bytestring binary bytestring data-default - fast-logger http-client http-types lens menshen monad-logger mtl - mwc-random reflection salak scientific servant-client - servant-server servant-swagger servant-swagger-ui swagger2 text - unliftio-core unordered-containers vault vector wai warp - ]; - testHaskellDepends = [ - aeson base base16-bytestring binary bytestring data-default - fast-logger hspec http-client http-types lens menshen monad-logger - mtl mwc-random QuickCheck reflection salak scientific - servant-client servant-server servant-swagger servant-swagger-ui - swagger2 text unliftio-core unordered-containers vault vector wai - warp - ]; - description = "Yam Web"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "yam_0_7" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, binary, bytestring , data-default, exceptions, fast-logger, hspec, http-client , http-types, lens, menshen, monad-logger, mtl, mwc-random , QuickCheck, reflection, salak, scientific, servant-client @@ -256904,7 +252345,6 @@ self: { ]; description = "A wrapper of servant"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yam-app" = callPackage @@ -256947,21 +252387,6 @@ self: { }) {}; "yam-datasource" = callPackage - ({ mkDerivation, base, conduit, persistent, resource-pool - , resourcet, unliftio-core, yam - }: - mkDerivation { - pname = "yam-datasource"; - version = "0.5.17"; - sha256 = "1ah2y614l0a3mkdrv6a4arbsy0a2wz7w7dwmkdf4rfl9zpm1lfsf"; - libraryHaskellDepends = [ - base conduit persistent resource-pool resourcet unliftio-core yam - ]; - description = "Yam DataSource Middleware"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "yam-datasource_0_7" = callPackage ({ mkDerivation, base, conduit, data-default, monad-logger , persistent, resource-pool, resourcet, salak, servant-server, text , unliftio-core, yam @@ -256976,7 +252401,6 @@ self: { ]; description = "Yam DataSource Middleware"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yam-job" = callPackage @@ -257020,8 +252444,6 @@ self: { ]; description = "Yam Redis Middleware"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "yam-servant" = callPackage @@ -258838,6 +254260,8 @@ self: { ]; description = "Utilities for using the Fay Haskell-to-JS compiler with Yesod"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yesod-fb" = callPackage @@ -258889,28 +254313,6 @@ self: { }: mkDerivation { pname = "yesod-form"; - version = "1.6.5"; - sha256 = "007six9sky5qc979jiagannfd5163vijl7g6grf9rlwbqdc8x7dg"; - libraryHaskellDepends = [ - aeson attoparsec base blaze-builder blaze-html blaze-markup - byteable bytestring containers data-default email-validate - network-uri persistent resourcet semigroups shakespeare text time - transformers wai xss-sanitize yesod-core yesod-persistent - ]; - testHaskellDepends = [ base hspec text time ]; - description = "Form handling support for Yesod Web Framework"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-form_1_6_6" = callPackage - ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html - , blaze-markup, byteable, bytestring, containers, data-default - , email-validate, hspec, network-uri, persistent, resourcet - , semigroups, shakespeare, text, time, transformers, wai - , xss-sanitize, yesod-core, yesod-persistent - }: - mkDerivation { - pname = "yesod-form"; version = "1.6.6"; sha256 = "16m7m7yixsnka926znjy0xn0kp30mbvjq2f46rh987kdr28dks9p"; libraryHaskellDepends = [ @@ -258922,7 +254324,6 @@ self: { testHaskellDepends = [ base hspec text time ]; description = "Form handling support for Yesod Web Framework"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-form-bootstrap4" = callPackage @@ -260083,6 +255484,8 @@ self: { ]; description = "Yet Another Logger"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yggdrasil" = callPackage @@ -260219,6 +255622,8 @@ self: { libraryHaskellDepends = [ base containers split yi-language ]; description = "Simple mapping from colour names used in emacs to Color"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yi-frontend-pango" = callPackage @@ -260399,6 +255804,8 @@ self: { ]; description = "Collection of language-related Yi libraries"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yi-misc-modes" = callPackage @@ -261394,27 +256801,6 @@ self: { }: mkDerivation { pname = "zeromq4-haskell"; - version = "0.7.0"; - sha256 = "17q756mldxx9b8a2nx9lvjrgvbmgjbnp896sqcgnijq7wr751m2q"; - libraryHaskellDepends = [ - async base bytestring containers exceptions monad-control - semigroups transformers transformers-base - ]; - libraryPkgconfigDepends = [ zeromq ]; - testHaskellDepends = [ - async base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck - ]; - description = "Bindings to ZeroMQ 4.x"; - license = stdenv.lib.licenses.mit; - }) {inherit (pkgs) zeromq;}; - - "zeromq4-haskell_0_8_0" = callPackage - ({ mkDerivation, async, base, bytestring, containers, exceptions - , monad-control, QuickCheck, semigroups, tasty, tasty-hunit - , tasty-quickcheck, transformers, transformers-base, zeromq - }: - mkDerivation { - pname = "zeromq4-haskell"; version = "0.8.0"; sha256 = "0sznvz842ycbd73y8q09s6hs4i3yj1b5qm00n06f69p1i5jrkgnk"; libraryHaskellDepends = [ @@ -261427,7 +256813,6 @@ self: { ]; description = "Bindings to ZeroMQ 4.x"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) zeromq;}; "zeromq4-patterns" = callPackage @@ -261814,26 +257199,6 @@ self: { "zippers" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, criterion, doctest - , lens, profunctors, semigroupoids, semigroups - }: - mkDerivation { - pname = "zippers"; - version = "0.2.5"; - sha256 = "11f0jx0dbm2y9y5hnpakdvk9fmsm3awr2lcxp46dyma6arr7f4id"; - revision = "3"; - editedCabalFile = "0y0klc2jaj611cjvmqi95dyj9yvribf9xhibn1andrz5rs6ysz3p"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - base lens profunctors semigroupoids semigroups - ]; - testHaskellDepends = [ base doctest ]; - benchmarkHaskellDepends = [ base criterion lens ]; - description = "Traversal based zippers"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "zippers_0_3" = callPackage - ({ mkDerivation, base, Cabal, cabal-doctest, criterion, doctest , fail, lens, profunctors, semigroupoids, semigroups }: mkDerivation { @@ -261848,7 +257213,6 @@ self: { benchmarkHaskellDepends = [ base criterion lens ]; description = "Traversal based zippers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "zippo" = callPackage diff --git a/pkgs/development/haskell-modules/patches/clock-0.7.2.patch b/pkgs/development/haskell-modules/patches/clock-0.7.2.patch deleted file mode 100644 index 8354c7fa589..00000000000 --- a/pkgs/development/haskell-modules/patches/clock-0.7.2.patch +++ /dev/null @@ -1,59 +0,0 @@ -diff --git a/System/Clock.hsc b/System/Clock.hsc -index 297607b..c21196b 100644 ---- a/System/Clock.hsc -+++ b/System/Clock.hsc -@@ -41,7 +41,9 @@ import GHC.Generics (Generic) - # endif - #endif - --#let alignment t = "%lu", (unsigned long)offsetof(struct {char x__; t (y__); }, y__) -+#if __GLASGOW_HASKELL__ < 800 -+# let alignment t = "%lu", (unsigned long)offsetof(struct {char x__; t (y__); }, y__) -+#endif - - -- | Clock types. A clock may be system-wide (that is, visible to all processes) - -- or per-process (measuring time that is meaningful only within a process). -diff --git a/cbits/hs_clock_win32.c b/cbits/hs_clock_win32.c -index 5dcc2a9..ebdb7fe 100644 ---- a/cbits/hs_clock_win32.c -+++ b/cbits/hs_clock_win32.c -@@ -28,12 +28,22 @@ static void to_timespec_from_100ns(ULONGLONG t_100ns, long long *t) - t[1] = 100*(long)(t_100ns % 10000000UL); - } - -+/* See https://ghc.haskell.org/trac/ghc/ticket/15094 */ -+#if defined(_WIN32) && !defined(_WIN64) -+__attribute__((optimize("-fno-expensive-optimizations"))) -+#endif - void hs_clock_win32_gettime_monotonic(long long* t) - { - LARGE_INTEGER time; -- LARGE_INTEGER frequency; -+ static LARGE_INTEGER frequency; -+ static int hasFreq = 0; -+ - QueryPerformanceCounter(&time); -- QueryPerformanceFrequency(&frequency); -+ if (!hasFreq) -+ { -+ hasFreq = 1; -+ QueryPerformanceFrequency(&frequency); -+ } - // seconds - t[0] = time.QuadPart / frequency.QuadPart; - // nanos = -diff --git a/clock.cabal b/clock.cabal -index 0f2d18a..67d232e 100644 ---- a/clock.cabal -+++ b/clock.cabal -@@ -41,8 +41,8 @@ description: A package for convenient access to high-resolution clock and - copyright: Copyright © Cetin Sert 2009-2016, Eugene Kirpichov 2010, Finn Espen Gundersen 2013, Gerolf Seitz 2013, Mathieu Boespflug 2014 2015, Chris Done 2015, Dimitri Sabadie 2015, Christian Burger 2015, Mario Longobardi 2016 - license: BSD3 - license-file: LICENSE --author: Cetin Sert <cetin@corsis.eu>, Corsis Research --maintainer: Cetin Sert <cetin@corsis.eu>, Corsis Research -+author: Cetin Sert <cetin@corsis.tech>, Corsis Research -+maintainer: Cetin Sert <cetin@corsis.tech>, Corsis Research - homepage: https://github.com/corsis/clock - bug-reports: https://github.com/corsis/clock/issues - category: System diff --git a/pkgs/development/idris-modules/build-idris-package.nix b/pkgs/development/idris-modules/build-idris-package.nix index 28bac4e981b..ac0555636be 100644 --- a/pkgs/development/idris-modules/build-idris-package.nix +++ b/pkgs/development/idris-modules/build-idris-package.nix @@ -7,6 +7,10 @@ , version , ipkgName ? name , extraBuildInputs ? [] + , idrisBuildOptions ? [] + , idrisTestOptions ? [] + , idrisInstallOptions ? [] + , idrisDocOptions ? [] , ... }@attrs: let @@ -39,14 +43,14 @@ stdenv.mkDerivation ({ buildPhase = '' runHook preBuild - idris --build ${ipkgName}.ipkg + idris --build ${ipkgName}.ipkg ${lib.escapeShellArgs idrisBuildOptions} runHook postBuild ''; checkPhase = '' runHook preCheck if grep -q tests ${ipkgName}.ipkg; then - idris --testpkg ${ipkgName}.ipkg + idris --testpkg ${ipkgName}.ipkg ${lib.escapeShellArgs idrisTestOptions} fi runHook postCheck ''; @@ -54,9 +58,9 @@ stdenv.mkDerivation ({ installPhase = '' runHook preInstall - idris --install ${ipkgName}.ipkg --ibcsubdir $out/libs + idris --install ${ipkgName}.ipkg --ibcsubdir $out/libs ${lib.escapeShellArgs idrisInstallOptions} - IDRIS_DOC_PATH=$out/doc idris --installdoc ${ipkgName}.ipkg || true + IDRIS_DOC_PATH=$out/doc idris --installdoc ${ipkgName}.ipkg ${lib.escapeShellArgs idrisDocOptions} || true # If the ipkg file defines an executable, install that executable=$(grep -Po '^executable = \K.*' ${ipkgName}.ipkg || true) diff --git a/pkgs/development/interpreters/erlang/R19.nix b/pkgs/development/interpreters/erlang/R19.nix index e0d4ecbc95a..25a3f662565 100644 --- a/pkgs/development/interpreters/erlang/R19.nix +++ b/pkgs/development/interpreters/erlang/R19.nix @@ -14,6 +14,6 @@ mkDerivation rec { ]; prePatch = '' - substituteInPlace configure.in --replace '`sw_vers -productVersion`' '10.10' + substituteInPlace configure.in --replace '`sw_vers -productVersion`' "''${MACOSX_DEPLOYMENT_TARGET:-10.12}" ''; } diff --git a/pkgs/development/interpreters/erlang/R20.nix b/pkgs/development/interpreters/erlang/R20.nix index c408d21d9b3..016e175d6b5 100644 --- a/pkgs/development/interpreters/erlang/R20.nix +++ b/pkgs/development/interpreters/erlang/R20.nix @@ -5,6 +5,6 @@ mkDerivation rec { sha256 = "0v2iiyzss8hiih98wvj0gi2qzdmmhh7bvc9p025wlfm4k7r1109a"; prePatch = '' - substituteInPlace configure.in --replace '`sw_vers -productVersion`' '10.10' + substituteInPlace configure.in --replace '`sw_vers -productVersion`' "''${MACOSX_DEPLOYMENT_TARGET:-10.12}" ''; } diff --git a/pkgs/development/interpreters/erlang/R21.nix b/pkgs/development/interpreters/erlang/R21.nix index 60eb6c8a6a5..e21bf6dafbf 100644 --- a/pkgs/development/interpreters/erlang/R21.nix +++ b/pkgs/development/interpreters/erlang/R21.nix @@ -5,6 +5,6 @@ mkDerivation rec { sha256 = "1szybirrcpqsl2nmlmpbkxjqnm6i7l7bma87m5cpwi0kpvlxwmcw"; prePatch = '' - substituteInPlace configure.in --replace '`sw_vers -productVersion`' '10.10' + substituteInPlace configure.in --replace '`sw_vers -productVersion`' "''${MACOSX_DEPLOYMENT_TARGET:-10.12}" ''; } diff --git a/pkgs/development/interpreters/erlang/R22.nix b/pkgs/development/interpreters/erlang/R22.nix index 1af047f43bd..a8c05513c5a 100644 --- a/pkgs/development/interpreters/erlang/R22.nix +++ b/pkgs/development/interpreters/erlang/R22.nix @@ -5,7 +5,7 @@ mkDerivation rec { sha256 = "1aqkhd6nwdn4xp5yz02zbymd4x8ij8fjw9ji8kh860n1a513k9ai"; prePatch = '' - substituteInPlace make/configure.in --replace '`sw_vers -productVersion`' '10.10' + substituteInPlace make/configure.in --replace '`sw_vers -productVersion`' "''${MACOSX_DEPLOYMENT_TARGET:-10.12}" substituteInPlace erts/configure.in --replace '-Wl,-no_weak_imports' "" ''; } diff --git a/pkgs/development/interpreters/gnu-apl/default.nix b/pkgs/development/interpreters/gnu-apl/default.nix index f60e5d28614..cd7dacf6527 100644 --- a/pkgs/development/interpreters/gnu-apl/default.nix +++ b/pkgs/development/interpreters/gnu-apl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gnu-apl-${version}"; - version = "1.7"; + version = "1.8"; src = fetchurl { url = "mirror://gnu/apl/apl-${version}.tar.gz"; - sha256 = "07xq8ddlmz8psvsmwr23gar108ri0lwmw0n6kpxcv8ypas1f5xlg"; + sha256 = "1jxvv2h3y1am1fw6r5sn3say1n0dj8shmscbybl0qhqdia2lqkql"; }; buildInputs = [ readline gettext ncurses ]; diff --git a/pkgs/development/interpreters/icon-lang/default.nix b/pkgs/development/interpreters/icon-lang/default.nix index 3bec73ea036..56becd3d6c9 100644 --- a/pkgs/development/interpreters/icon-lang/default.nix +++ b/pkgs/development/interpreters/icon-lang/default.nix @@ -1,19 +1,24 @@ -{ stdenv, fetchFromGitHub, libX11, libXt }: +{ stdenv, fetchFromGitHub, libX11, libXt , withGraphics ? true }: stdenv.mkDerivation rec { name = "icon-lang-${version}"; version = "9.5.1"; src = fetchFromGitHub { - rev = "39d7438e8d23ccfe20c0af8bbbf61e34d9c715e9"; owner = "gtownsend"; repo = "icon"; + rev = "rel${builtins.replaceStrings ["."] [""] version}"; sha256 = "1gkvj678ldlr1m5kjhx6zpmq11nls8kxa7pyy64whgakfzrypynw"; }; - buildInputs = [ libX11 libXt ]; - configurePhase = '' - make X-Configure name=linux - ''; + buildInputs = stdenv.lib.optionals withGraphics [ libX11 libXt ]; + + configurePhase = + let + _name = if stdenv.isDarwin then "macintosh" else "linux"; + in + '' + make ${stdenv.lib.optionalString withGraphics "X-"}Configure name=${_name} + ''; installPhase = '' make Install dest=$out @@ -21,8 +26,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = ''A very high level general-purpose programming language''; - maintainers = with maintainers; [ vrthra ]; - platforms = platforms.linux; + maintainers = with maintainers; [ vrthra yurrriq ]; + platforms = with platforms; linux ++ darwin; license = licenses.publicDomain; homepage = https://www.cs.arizona.edu/icon/; }; diff --git a/pkgs/development/interpreters/love/0.7-gl-prototypes.patch b/pkgs/development/interpreters/love/0.7-gl-prototypes.patch new file mode 100644 index 00000000000..0b6778f6a90 --- /dev/null +++ b/pkgs/development/interpreters/love/0.7-gl-prototypes.patch @@ -0,0 +1,21 @@ +diff --unified --recursive --text love-HEAD.orig/src/modules/graphics/opengl/Framebuffer.cpp love-HEAD.new/src/modules/graphics/opengl/Framebuffer.cpp +--- love-HEAD.orig/src/modules/graphics/opengl/Framebuffer.cpp 2019-03-14 12:46:55.032982224 -0400 ++++ love-HEAD.new/src/modules/graphics/opengl/Framebuffer.cpp 2019-03-14 12:47:22.356175299 -0400 +@@ -1,3 +1,5 @@ ++#define GL_GLEXT_PROTOTYPES ++ + #include "Framebuffer.h" + #include <common/Matrix.h> + +diff --unified --recursive --text love-HEAD.orig/src/modules/graphics/opengl/SpriteBatch.cpp love-HEAD.new/src/modules/graphics/opengl/SpriteBatch.cpp +--- love-HEAD.orig/src/modules/graphics/opengl/SpriteBatch.cpp 2019-03-14 12:46:55.032982224 -0400 ++++ love-HEAD.new/src/modules/graphics/opengl/SpriteBatch.cpp 2019-03-14 12:47:33.346119890 -0400 +@@ -18,6 +18,8 @@ + * 3. This notice may not be removed or altered from any source distribution. + **/ + ++#define GL_GLEXT_PROTOTYPES ++ + #include "SpriteBatch.h" + + // STD diff --git a/pkgs/development/interpreters/love/0.7.nix b/pkgs/development/interpreters/love/0.7.nix index 884225b6483..7f39259c298 100644 --- a/pkgs/development/interpreters/love/0.7.nix +++ b/pkgs/development/interpreters/love/0.7.nix @@ -2,6 +2,7 @@ , SDL, libGLU_combined, openal, lua , libdevil, freetype, physfs , libmodplug, mpg123, libvorbis, libogg +, libmng }: stdenv.mkDerivation rec { @@ -11,10 +12,13 @@ stdenv.mkDerivation rec { sha256 = "0s7jywkvydlshlgy11ilzngrnybmq5xlgzp2v2dhlffwrfqdqym5"; }; + # see discussion on arch linux user repository (https://aur.archlinux.org/packages/love07/?setlang=cs#comment-684696) + patches = [ ./0.7-gl-prototypes.patch ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ SDL libGLU_combined openal lua - libdevil freetype physfs libmodplug mpg123 libvorbis libogg + libdevil freetype physfs libmodplug mpg123 libvorbis libogg libmng ]; preConfigure = '' diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 3bcedc47c4b..2ecc5cbb2ef 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -43,7 +43,9 @@ let patches = [ # Do not look in /usr etc. for dependencies. - (if (versionOlder version "5.29.6") then ./no-sys-dirs-5.26.patch else ./no-sys-dirs-5.29.patch) + (if (versionOlder version "5.29.6") then ./no-sys-dirs-5.26.patch + else if (versionOlder version "5.31.1") then ./no-sys-dirs-5.29.patch + else ./no-sys-dirs-5.31.patch) ] ++ optional (versionOlder version "5.29.6") # Fix parallel building: https://rt.perl.org/Public/Bug/Display.html?id=132360 @@ -171,11 +173,11 @@ let priority = 6; # in `buildEnv' (including the one inside `perl.withPackages') the library files will have priority over files in `perl` }; } // stdenv.lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec { - crossVersion = "2152db1ea241f796206ab309036be1a7d127b370"; # May 25, 2019 + crossVersion = "980998f7d11baf97284426ca91f84681d49a08f5"; # Jul 20, 2019 perl-cross-src = fetchurl { url = "https://github.com/arsv/perl-cross/archive/${crossVersion}.tar.gz"; - sha256 = "1k08iqdkf9q00hbcq2b933w3vmds7xkfr90phhk0qf64l18wdrkf"; + sha256 = "1hg3k2rhjs5gclrm05z87nvlh4j9pg7mkm9998h9gy6mzk8224q5"; }; depsBuildBuild = [ buildPackages.stdenv.cc makeWrapper ]; @@ -191,7 +193,7 @@ let setupHook = ./setup-hook-cross.sh; }); in { - # the latest Maint version + # Maint version perl528 = common { perl = pkgs.perl528; buildPerl = buildPackages.perl528; @@ -199,6 +201,7 @@ in { sha256 = "1iynpsxdym4h76kgndmn3ykvwxhqz444xvaz8z2irsxkvmnlb5da"; }; + # Maint version perl530 = common { perl = pkgs.perl530; buildPerl = buildPackages.perl530; @@ -210,7 +213,7 @@ in { perldevel = common { perl = pkgs.perldevel; buildPerl = buildPackages.perldevel; - version = "5.30.0"; - sha256 = "1wkmz6xn3fswpqhz29akiklcxclnlykhp96a8bqcz36rak3i64l5"; + version = "5.31.2"; + sha256 = "00bdh9lmjb0m7dhk8mj7kab7cg2zn9zgw82y4hgkwydzg6d1jis0"; }; } diff --git a/pkgs/development/interpreters/perl/no-sys-dirs-5.31.patch b/pkgs/development/interpreters/perl/no-sys-dirs-5.31.patch new file mode 100644 index 00000000000..62dce0e25b9 --- /dev/null +++ b/pkgs/development/interpreters/perl/no-sys-dirs-5.31.patch @@ -0,0 +1,254 @@ +diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/Configure perl-5.20.0/Configure +--- perl-5.20.0-orig/Configure 2014-05-26 15:34:18.000000000 +0200 ++++ perl-5.20.0/Configure 2014-06-25 10:43:35.368285986 +0200 +@@ -106,15 +106,7 @@ + fi + + : Proper PATH setting +-paths='/bin /usr/bin /usr/local/bin /usr/ucb /usr/local /usr/lbin' +-paths="$paths /opt/bin /opt/local/bin /opt/local /opt/lbin" +-paths="$paths /usr/5bin /etc /usr/gnu/bin /usr/new /usr/new/bin /usr/nbin" +-paths="$paths /opt/gnu/bin /opt/new /opt/new/bin /opt/nbin" +-paths="$paths /sys5.3/bin /sys5.3/usr/bin /bsd4.3/bin /bsd4.3/usr/ucb" +-paths="$paths /bsd4.3/usr/bin /usr/bsd /bsd43/bin /opt/ansic/bin /usr/ccs/bin" +-paths="$paths /etc /usr/lib /usr/ucblib /lib /usr/ccs/lib" +-paths="$paths /sbin /usr/sbin /usr/libexec" +-paths="$paths /system/gnu_library/bin" ++paths='' + + for p in $paths + do +@@ -1337,8 +1329,7 @@ + archname='' + : Possible local include directories to search. + : Set locincpth to "" in a hint file to defeat local include searches. +-locincpth="/usr/local/include /opt/local/include /usr/gnu/include" +-locincpth="$locincpth /opt/gnu/include /usr/GNU/include /opt/GNU/include" ++locincpth="" + : + : no include file wanted by default + inclwanted='' +@@ -1349,17 +1340,12 @@ + + libnames='' + : change the next line if compiling for Xenix/286 on Xenix/386 +-xlibpth='/usr/lib/386 /lib/386' ++xlibpth='' + : Possible local library directories to search. +-loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib" +-loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib" ++loclibpth="" + + : general looking path for locating libraries +-glibpth="/lib /usr/lib $xlibpth" +-glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib" +-test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth" +-test -f /shlib/libc.so && glibpth="/shlib $glibpth" +-test -d /usr/lib64 && glibpth="$glibpth /lib64 /usr/lib64 /usr/local/lib64" ++glibpth="" + + : Private path used by Configure to find libraries. Its value + : is prepended to libpth. This variable takes care of special +@@ -1391,8 +1377,6 @@ + libswanted="$libswanted m crypt sec util c cposix posix ucb bsd BSD" + : We probably want to search /usr/shlib before most other libraries. + : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist. +-glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'` +-glibpth="/usr/shlib $glibpth" + : Do not use vfork unless overridden by a hint file. + usevfork=false + +@@ -2446,7 +2430,6 @@ + zip + " + pth=`echo $PATH | sed -e "s/$p_/ /g"` +-pth="$pth $sysroot/lib $sysroot/usr/lib" + for file in $loclist; do + eval xxx=\$$file + case "$xxx" in +@@ -4936,7 +4919,7 @@ + : Set private lib path + case "$plibpth" in + '') if ./mips; then +- plibpth="$incpath/usr/lib $sysroot/usr/local/lib $sysroot/usr/ccs/lib" ++ plibpth="$incpath/usr/lib" + fi;; + esac + case "$libpth" in +@@ -8600,13 +8583,8 @@ + echo " " + case "$sysman" in + '') +- syspath='/usr/share/man/man1 /usr/man/man1' +- syspath="$syspath /usr/man/mann /usr/man/manl /usr/man/local/man1" +- syspath="$syspath /usr/man/u_man/man1" +- syspath="$syspath /usr/catman/u_man/man1 /usr/man/l_man/man1" +- syspath="$syspath /usr/local/man/u_man/man1 /usr/local/man/l_man/man1" +- syspath="$syspath /usr/man/man.L /local/man/man1 /usr/local/man/man1" +- sysman=`./loc . /usr/man/man1 $syspath` ++ syspath='' ++ sysman='' + ;; + esac + if $test -d "$sysman"; then +@@ -19900,9 +19878,10 @@ + case "$full_ar" in + '') full_ar=$ar ;; + esac ++full_ar=ar + + : Store the full pathname to the sed program for use in the C program +-full_sed=$sed ++full_sed=sed + + : see what type gids are declared as in the kernel + echo " " +Only in perl-5.20.0/: Configure.orig +diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/ext/Errno/Errno_pm.PL perl-5.20.0/ext/Errno/Errno_pm.PL +--- perl-5.20.0-orig/ext/Errno/Errno_pm.PL 2014-05-26 15:34:20.000000000 +0200 ++++ perl-5.20.0/ext/Errno/Errno_pm.PL 2014-06-25 10:31:24.317970047 +0200 +@@ -134,12 +126,7 @@ + if ($dep =~ /(\S+errno\.h)/) { + $file{$1} = 1; + } +- } elsif ($^O eq 'linux' && +- $Config{gccversion} ne '' && +- $Config{gccversion} !~ /intel/i && +- # might be using, say, Intel's icc +- $linux_errno_h +- ) { ++ } elsif (0) { + $file{$linux_errno_h} = 1; + } elsif ($^O eq 'haiku') { + # hidden in a special place +Only in perl-5.20.0/ext/Errno: Errno_pm.PL.orig +diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/hints/freebsd.sh perl-5.20.0/hints/freebsd.sh +--- perl-5.20.0-orig/hints/freebsd.sh 2014-01-31 22:55:51.000000000 +0100 ++++ perl-5.20.0/hints/freebsd.sh 2014-06-25 10:25:53.263964680 +0200 +@@ -119,21 +119,21 @@ + objformat=`/usr/bin/objformat` + if [ x$objformat = xaout ]; then + if [ -e /usr/lib/aout ]; then +- libpth="/usr/lib/aout /usr/local/lib /usr/lib" +- glibpth="/usr/lib/aout /usr/local/lib /usr/lib" ++ libpth="" ++ glibpth="" + fi + lddlflags='-Bshareable' + else +- libpth="/usr/lib /usr/local/lib" +- glibpth="/usr/lib /usr/local/lib" ++ libpth="" ++ glibpth="" + ldflags="-Wl,-E " + lddlflags="-shared " + fi + cccdlflags='-DPIC -fPIC' + ;; + *) +- libpth="/usr/lib /usr/local/lib" +- glibpth="/usr/lib /usr/local/lib" ++ libpth="" ++ glibpth="" + ldflags="-Wl,-E " + lddlflags="-shared " + cccdlflags='-DPIC -fPIC' +diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/hints/linux.sh perl-5.20.0/hints/linux.sh +--- perl-5.20.0-orig/hints/linux.sh 2014-05-26 15:34:20.000000000 +0200 ++++ perl-5.20.0/hints/linux.sh 2014-06-25 10:33:47.354883843 +0200 +@@ -150,28 +150,6 @@ case "$optimize" in + ;; + esac + +-# Ubuntu 11.04 (and later, presumably) doesn't keep most libraries +-# (such as -lm) in /lib or /usr/lib. So we have to ask gcc to tell us +-# where to look. We don't want gcc's own libraries, however, so we +-# filter those out. +-# This could be conditional on Unbuntu, but other distributions may +-# follow suit, and this scheme seems to work even on rather old gcc's. +-# This unconditionally uses gcc because even if the user is using another +-# compiler, we still need to find the math library and friends, and I don't +-# know how other compilers will cope with that situation. +-# Morever, if the user has their own gcc earlier in $PATH than the system gcc, +-# we don't want its libraries. So we try to prefer the system gcc +-# Still, as an escape hatch, allow Configure command line overrides to +-# plibpth to bypass this check. +-if [ -x /usr/bin/gcc ] ; then +- gcc=/usr/bin/gcc +-# clang also provides -print-search-dirs +-elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then +- gcc=${cc:-cc} +-else +- gcc=gcc +-fi +- + case "$plibpth" in + '') plibpth=`LANG=C LC_ALL=C $gcc $ccflags $ldflags -print-search-dirs | grep libraries | + cut -f2- -d= | tr ':' $trnl | grep -v 'gcc' | sed -e 's:/$::'` +@@ -208,32 +186,6 @@ case "$usequadmath" in + ;; + esac + +-case "$libc" in +-'') +-# If you have glibc, then report the version for ./myconfig bug reporting. +-# (Configure doesn't need to know the specific version since it just uses +-# gcc to load the library for all tests.) +-# We don't use __GLIBC__ and __GLIBC_MINOR__ because they +-# are insufficiently precise to distinguish things like +-# libc-2.0.6 and libc-2.0.7. +- for p in $plibpth +- do +- for trylib in libc.so.6 libc.so +- do +- if $test -e $p/$trylib; then +- libc=`ls -l $p/$trylib | awk '{print $NF}'` +- if $test "X$libc" != X; then +- break +- fi +- fi +- done +- if $test "X$libc" != X; then +- break +- fi +- done +- ;; +-esac +- + if ${sh:-/bin/sh} -c exit; then + echo '' + echo 'You appear to have a working bash. Good.' +@@ -311,33 +263,6 @@ sparc*) + ;; + esac + +-# SuSE8.2 has /usr/lib/libndbm* which are ld scripts rather than +-# true libraries. The scripts cause binding against static +-# version of -lgdbm which is a bad idea. So if we have 'nm' +-# make sure it can read the file +-# NI-S 2003/08/07 +-case "$nm" in +- '') ;; +- *) +- for p in $plibpth +- do +- if $test -r $p/libndbm.so; then +- if $nm $p/libndbm.so >/dev/null 2>&1 ; then +- echo 'Your shared -lndbm seems to be a real library.' +- _libndbm_real=1 +- break +- fi +- fi +- done +- if $test "X$_libndbm_real" = X; then +- echo 'Your shared -lndbm is not a real library.' +- set `echo X "$libswanted "| sed -e 's/ ndbm / /'` +- shift +- libswanted="$*" +- fi +- ;; +-esac +- + # Linux on Synology. + if [ -f /etc/synoinfo.conf -a -d /usr/syno ]; then + # Tested on Synology DS213 and DS413 diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index ea314789ce7..17a56665c5a 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -254,16 +254,16 @@ let in { php72 = generic { - version = "7.2.20"; - sha256 = "116a1m0xjn2yi8d5kwzjk335q4brgl7xplcji2p87i2l9vjjkf4z"; + version = "7.2.21"; + sha256 = "1vqldc2namfblwyv87fgpfffkjpzawfpcp48f40nfdl3pshq6c9l"; # https://bugs.php.net/bug.php?id=76826 extraPatches = optional stdenv.isDarwin ./php72-darwin-isfinite.patch; }; php73 = generic { - version = "7.3.7"; - sha256 = "065z2q6imjxlbh6w1r7565ygqhigfbzcz70iaic74hj626kqyq63"; + version = "7.3.8"; + sha256 = "1xbndimrfamf97m3vln842g9w1ikq071gjfkk15ai7sx2wqccrnm"; # https://bugs.php.net/bug.php?id=76826 extraPatches = optional stdenv.isDarwin ./php73-darwin-isfinite.patch; diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index b3b506783cd..c8856ea2aa3 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -115,25 +115,25 @@ in { self = pypy27; sourceVersion = { major = "7"; - minor = "0"; - patch = "0"; + minor = "1"; + patch = "1"; }; - sha256 = "1m6ja79sbkl38p1hs7c0n4kq5xzn01wp7wl5456hsw9q6cwg6894"; + sha256 = "0yq6ln1ic476sasp8zs4mg5i9524l1p96qwanp486rr1yza1grlg"; pythonVersion = "2.7"; db = db.override { dbmSupport = true; }; python = python27; inherit passthruFun; }; - pypy35 = callPackage ./pypy { - self = pypy35; + pypy36 = callPackage ./pypy { + self = pypy36; sourceVersion = { major = "7"; - minor = "0"; - patch = "0"; + minor = "1"; + patch = "1"; }; - sha256 = "0hbv9ziv8n9lqnr6cndrw70p6g40c00w1ds7lmzgrr153myxkp7w"; - pythonVersion = "3.5"; + sha256 = "1hqvnran7d2dzj5555n7q680dyzhmbklz04pvkxgb5j604v7kkx1"; + pythonVersion = "3.6"; db = db.override { dbmSupport = true; }; python = python27; inherit passthruFun; @@ -143,26 +143,26 @@ in { # Not included at top-level self = pythonInterpreters.pypy27_prebuilt; sourceVersion = { - major = "6"; - minor = "0"; - patch = "0"; + major = "7"; + minor = "1"; + patch = "1"; }; - sha256 = "0rxgnp3fm18b87ln8bbjr13g2fsf4ka4abkaim6m03y9lwmr9gvc"; # linux64 + sha256 = "0rlx4x9xy9h989w6sy4h7lknm00956r30c5gjxwsvf8fhvq9xc3k"; # linux64 pythonVersion = "2.7"; inherit passthruFun; ncurses = ncurses5; }; - pypy35_prebuilt = callPackage ./pypy/prebuilt.nix { - # Not included at top-level - self = pythonInterpreters.pypy35_prebuilt; + pypy36_prebuilt = callPackage ./pypy/prebuilt.nix { + # Not included at top-level + self = pythonInterpreters.pypy36_prebuilt; sourceVersion = { - major = "6"; - minor = "0"; - patch = "0"; + major = "7"; + minor = "1"; + patch = "1"; }; - sha256 = "0j3h08s7wpglghasmym3baycpif5jshvmk9rpav4pwwy5clzmzsc"; # linux64 - pythonVersion = "3.5"; + sha256 = "1c1xx6dm1n4xvh1vd3rcvyyixm5jm9rvzisji1a5bc9l38xzc540"; # linux64 + pythonVersion = "3.6"; inherit passthruFun; ncurses = ncurses5; }; diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix index db7e51a51f3..7ec476b1ea4 100644 --- a/pkgs/development/interpreters/python/pypy/default.nix +++ b/pkgs/development/interpreters/python/pypy/default.nix @@ -88,7 +88,9 @@ in with passthru; stdenv.mkDerivation rec { setupHook = python-setup-hook sitePackages; - doCheck = true; + # TODO: A bunch of tests are failing as of 7.1.1, please feel free to + # fix and re-enable if you have the patience and tenacity. + doCheck = false; checkPhase = let disabledTests = [ # disable shutils because it assumes gid 0 exists @@ -139,7 +141,7 @@ in with passthru; stdenv.mkDerivation rec { echo "manylinux1_compatible=False" >> $out/lib/${libPrefix}/_manylinux.py # Include a sitecustomize.py file - cp ${../sitecustomize.py} $out/${sitePackages}/sitecustomize.py + cp ${../sitecustomize.py} $out/lib/${libPrefix}/${sitePackages}/sitecustomize.py ''; inherit passthru; @@ -149,8 +151,7 @@ in with passthru; stdenv.mkDerivation rec { homepage = http://pypy.org/; description = "Fast, compliant alternative implementation of the Python language (${pythonVersion})"; license = licenses.mit; - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; maintainers = with maintainers; [ andersk ]; - broken = true; # TODO: Tests are failing! }; } diff --git a/pkgs/development/interpreters/python/pypy/prebuilt.nix b/pkgs/development/interpreters/python/pypy/prebuilt.nix index 1ac779ed25e..af933f0a4bd 100644 --- a/pkgs/development/interpreters/python/pypy/prebuilt.nix +++ b/pkgs/development/interpreters/python/pypy/prebuilt.nix @@ -56,7 +56,7 @@ in with passthru; stdenv.mkDerivation { inherit pname version; src = fetchurl { - url= "https://bitbucket.org/pypy/pypy/downloads/pypy${majorVersion}-v${version}-linux64.tar.bz2"; + url = "https://bitbucket.org/pypy/pypy/downloads/pypy${pythonVersion}-v${version}-linux64.tar.bz2"; inherit sha256; }; @@ -123,4 +123,4 @@ in with passthru; stdenv.mkDerivation { platforms = [ "x86_64-linux" ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/interpreters/spidermonkey/38.nix b/pkgs/development/interpreters/spidermonkey/38.nix index d48cf841b04..2c45ba58976 100644 --- a/pkgs/development/interpreters/spidermonkey/38.nix +++ b/pkgs/development/interpreters/spidermonkey/38.nix @@ -1,6 +1,8 @@ -{ stdenv, fetchurl, pkgconfig, gnused_422, perl, python2, zip, libffi, readline, icu, zlib, nspr +{ stdenv, fetchurl, pkgconfig, gnused_422, perl, python2, zip, libffi, readline, icu, zlib, buildPackages , libobjc }: +with stdenv.lib; + stdenv.mkDerivation rec { version = "38.8.0"; name = "spidermonkey-${version}"; @@ -10,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "10lrync6cxnjlnadc0j3vg8r2dq9b3wwanw8qj1h6ncxwb7asxcl"; }; - buildInputs = [ libffi readline icu zlib nspr ] + buildInputs = [ libffi readline icu zlib ] ++ stdenv.lib.optional stdenv.isDarwin libobjc; nativeBuildInputs = [ pkgconfig perl python2 zip gnused_422 ]; @@ -19,13 +21,13 @@ stdenv.mkDerivation rec { preConfigure = '' export CXXFLAGS="-fpermissive" export LIBXUL_DIST=$out - export PYTHON="${python2.interpreter}" + export PYTHON="${buildPackages.python2.interpreter}" ''; configureFlags = [ "--enable-threadsafe" "--with-system-ffi" - "--with-system-nspr" + "--enable-posix-nspr-emulation" "--with-system-zlib" "--with-system-icu" "--enable-readline" @@ -34,8 +36,17 @@ stdenv.mkDerivation rec { # not be good defaults for other uses. "--enable-gcgenerational" "--enable-shared-js" + ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + # Spidermonkey seems to use different host/build terminology for cross + # compilation here. + "--host=${stdenv.buildPlatform.config}" + "--target=${stdenv.hostPlatform.config}" ]; + configurePlatforms = []; + + depsBuildBuild = [ buildPackages.stdenv.cc ]; + # This addresses some build system bug. It's quite likely to be safe # to re-enable parallel builds if the source revision changes. enableParallelBuilding = true; diff --git a/pkgs/development/interpreters/spidermonkey/60.nix b/pkgs/development/interpreters/spidermonkey/60.nix index 1dfaf9a2286..518fc5f77b7 100644 --- a/pkgs/development/interpreters/spidermonkey/60.nix +++ b/pkgs/development/interpreters/spidermonkey/60.nix @@ -1,6 +1,8 @@ -{ stdenv, fetchurl, fetchpatch, autoconf213, pkgconfig, perl, python2, zip +{ stdenv, fetchurl, fetchpatch, autoconf213, pkgconfig, perl, python2, zip, buildPackages , which, readline, zlib, icu }: +with stdenv.lib; + let version = "60.4.0"; in stdenv.mkDerivation rec { @@ -24,7 +26,7 @@ in stdenv.mkDerivation rec { preConfigure = '' export CXXFLAGS="-fpermissive" export LIBXUL_DIST=$out - export PYTHON="${python2.interpreter}" + export PYTHON="${buildPackages.python2.interpreter}" # We can't build in js/src/, so create a build dir mkdir obj @@ -45,8 +47,17 @@ in stdenv.mkDerivation rec { # https://src.fedoraproject.org/rpms/mozjs38/c/761399aba092bcb1299bb4fccfd60f370ab4216e "--enable-optimize" "--enable-release" + ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + # Spidermonkey seems to use different host/build terminology for cross + # compilation here. + "--host=${stdenv.buildPlatform.config}" + "--target=${stdenv.hostPlatform.config}" ]; + configurePlatforms = []; + + depsBuildBuild = [ buildPackages.stdenv.cc ]; + # Remove unnecessary static lib preFixup = '' rm $out/lib/libjs_static.ajs diff --git a/pkgs/development/interpreters/wasmtime/cargo-lock.patch b/pkgs/development/interpreters/wasmtime/cargo-lock.patch index be5bd0ab3d3..85479886570 100644 --- a/pkgs/development/interpreters/wasmtime/cargo-lock.patch +++ b/pkgs/development/interpreters/wasmtime/cargo-lock.patch @@ -1,9 +1,11 @@ diff --git a/Cargo.lock b/Cargo.lock new file mode 100644 -index 0000000..f702de1 +index 0000000..b961a31 --- /dev/null +++ b/Cargo.lock -@@ -0,0 +1,1475 @@ +@@ -0,0 +1,1608 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. +[[package]] +name = "aho-corasick" +version = "0.7.3" @@ -33,27 +35,26 @@ index 0000000..f702de1 +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", -+ "termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", ++ "termion 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "autocfg" -+version = "0.1.2" ++version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "backtrace" -+version = "0.3.15" ++version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rustc-demangle 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustc-demangle 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -61,35 +62,35 @@ index 0000000..f702de1 +version = "0.1.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "bindgen" -+version = "0.49.0" ++version = "0.49.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cexpr 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "clang-sys 0.28.0 (registry+https://github.com/rust-lang/crates.io-index)", + "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", + "env_logger 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", + "peeking_take_while 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", -+ "regex 1.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "shlex 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "which 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "bitflags" -+version = "1.0.4" ++version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -110,7 +111,7 @@ index 0000000..f702de1 +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -120,7 +121,7 @@ index 0000000..f702de1 + +[[package]] +name = "cc" -+version = "1.0.35" ++version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -133,7 +134,7 @@ index 0000000..f702de1 + +[[package]] +name = "cfg-if" -+version = "0.1.7" ++version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -141,8 +142,8 @@ index 0000000..f702de1 +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -152,8 +153,8 @@ index 0000000..f702de1 +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libloading 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libloading 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -163,7 +164,7 @@ index 0000000..f702de1 +dependencies = [ + "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -175,15 +176,15 @@ index 0000000..f702de1 +version = "0.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "cmake" -+version = "0.1.38" ++version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -274,7 +275,7 @@ index 0000000..f702de1 +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-utils 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -287,7 +288,7 @@ index 0000000..f702de1 +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -296,9 +297,9 @@ index 0000000..f702de1 +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "regex 1.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)", -+ "strsim 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", ++ "strsim 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -306,13 +307,13 @@ index 0000000..f702de1 +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 0.15.31 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -338,8 +339,8 @@ index 0000000..f702de1 + "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", + "humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "regex 1.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -350,8 +351,8 @@ index 0000000..f702de1 + "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", + "humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "regex 1.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -360,7 +361,7 @@ index 0000000..f702de1 +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "errno-dragonfly 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -370,7 +371,7 @@ index 0000000..f702de1 +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -385,8 +386,8 @@ index 0000000..f702de1 + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", + "scroll 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", + "string-interner 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "structopt 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", -+ "structopt-derive 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "structopt 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", ++ "structopt-derive 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", + "target-lexicon 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -395,7 +396,7 @@ index 0000000..f702de1 +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "backtrace 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "backtrace 0.3.30 (registry+https://github.com/rust-lang/crates.io-index)", + "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -404,10 +405,10 @@ index 0000000..f702de1 +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 0.15.31 (registry+https://github.com/rust-lang/crates.io-index)", -+ "synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)", ++ "synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -430,6 +431,14 @@ index 0000000..f702de1 +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] ++name = "fxhash" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] +name = "gcc" +version = "0.3.55" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -480,7 +489,7 @@ index 0000000..f702de1 +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "unicode-segmentation 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -498,14 +507,6 @@ index 0000000..f702de1 + +[[package]] +name = "itertools" -+version = "0.7.11" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "itertools" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ @@ -514,7 +515,7 @@ index 0000000..f702de1 + +[[package]] +name = "itoa" -+version = "0.4.3" ++version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -524,15 +525,15 @@ index 0000000..f702de1 + +[[package]] +name = "libc" -+version = "0.2.51" ++version = "0.2.58" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "libloading" -+version = "0.5.0" ++version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -563,7 +564,7 @@ index 0000000..f702de1 +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -571,15 +572,7 @@ index 0000000..f702de1 +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "matrixmultiply" -+version = "0.1.15" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "rawpointer 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -592,7 +585,7 @@ index 0000000..f702de1 +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -615,14 +608,15 @@ index 0000000..f702de1 +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] -+name = "ndarray" -+version = "0.12.1" ++name = "nix" ++version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "itertools 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)", -+ "matrixmultiply 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num-complex 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", ++ "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -640,35 +634,36 @@ index 0000000..f702de1 +] + +[[package]] -+name = "num-complex" -+version = "0.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] +name = "num-integer" -+version = "0.1.39" ++version = "0.1.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "num-traits" -+version = "0.2.6" ++version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ++] + +[[package]] +name = "num_cpus" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] ++name = "numtoa" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] +name = "owning_ref" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -698,7 +693,7 @@ index 0000000..f702de1 + +[[package]] +name = "proc-macro2" -+version = "0.4.27" ++version = "0.4.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -725,7 +720,7 @@ index 0000000..f702de1 +version = "0.6.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -735,12 +730,39 @@ index 0000000..f702de1 +dependencies = [ + "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", + "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] ++name = "rand" ++version = "0.6.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_chacha" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] +name = "rand_core" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -762,19 +784,70 @@ index 0000000..f702de1 +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] -+name = "raw-cpuid" -+version = "6.1.0" ++name = "rand_hc" ++version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] -+name = "rawpointer" -+version = "0.1.0" ++name = "rand_isaac" ++version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_jitter" ++version = "0.1.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_os" ++version = "0.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_pcg" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_xorshift" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "raw-cpuid" ++version = "6.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] + +[[package]] +name = "rayon" @@ -793,11 +866,19 @@ index 0000000..f702de1 +dependencies = [ + "crossbeam-deque 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", + "num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] ++name = "rdrand" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] +name = "redox_syscall" +version = "0.1.54" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -812,7 +893,7 @@ index 0000000..f702de1 + +[[package]] +name = "regex" -+version = "1.1.5" ++version = "1.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "aho-corasick 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -835,15 +916,15 @@ index 0000000..f702de1 +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", + "mach 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "rustc-demangle" -+version = "0.1.14" ++version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -856,7 +937,7 @@ index 0000000..f702de1 + +[[package]] +name = "ryu" -+version = "0.2.7" ++version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -878,9 +959,9 @@ index 0000000..f702de1 +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 0.15.31 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -898,20 +979,20 @@ index 0000000..f702de1 + +[[package]] +name = "serde" -+version = "1.0.90" ++version = "1.0.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "serde_derive 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_derive 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "serde_derive" -+version = "1.0.90" ++version = "1.0.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 0.15.31 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -919,9 +1000,9 @@ index 0000000..f702de1 +version = "1.0.39" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)", ++ "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ryu 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -944,7 +1025,7 @@ index 0000000..f702de1 +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -954,51 +1035,47 @@ index 0000000..f702de1 + +[[package]] +name = "strsim" -+version = "0.9.1" ++version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "ndarray 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", -+] + +[[package]] +name = "structopt" -+version = "0.2.15" ++version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "structopt-derive 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "structopt-derive 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "structopt-derive" -+version = "0.2.15" ++version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 0.15.31 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "syn" -+version = "0.15.31" ++version = "0.15.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "synstructure" -+version = "0.10.1" ++version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 0.15.31 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -1019,7 +1096,7 @@ index 0000000..f702de1 + +[[package]] +name = "termcolor" -+version = "1.0.4" ++version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "wincolor 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1027,10 +1104,11 @@ index 0000000..f702de1 + +[[package]] +name = "termion" -+version = "1.5.1" ++version = "1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", ++ "numtoa 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)", + "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", +] @@ -1056,7 +1134,7 @@ index 0000000..f702de1 +version = "0.1.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", + "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", +] @@ -1081,7 +1159,7 @@ index 0000000..f702de1 + +[[package]] +name = "unicode-segmentation" -+version = "1.2.1" ++version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -1118,12 +1196,17 @@ index 0000000..f702de1 +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] ++name = "void" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] +name = "wabt" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_derive 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_derive 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)", + "wabt-sys 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)", +] @@ -1133,12 +1216,35 @@ index 0000000..f702de1 +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cmake 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cmake 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", + "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] ++name = "wasi-common" ++version = "0.1.0" ++source = "git+https://github.com/CraneStation/wasi-common#9a66400cd8cb31badaf4e43d0e27afd76639b3ac" ++dependencies = [ ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", ++ "nix 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasi-common-cbindgen 0.1.0 (git+https://github.com/CraneStation/wasi-common)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "wasi-common-cbindgen" ++version = "0.1.0" ++source = "git+https://github.com/CraneStation/wasi-common#9a66400cd8cb31badaf4e43d0e27afd76639b3ac" ++dependencies = [ ++ "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] +name = "wasmparser" +version = "0.29.2" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1147,6 +1253,33 @@ index 0000000..f702de1 +] + +[[package]] ++name = "wasmtime" ++version = "0.1.0" ++dependencies = [ ++ "cranelift-codegen 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-native 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "docopt 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "errno 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "faerie 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "file-per-thread-logger 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pretty_env_logger 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_derive 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", ++ "target-lexicon 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wabt 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasmtime-debug 0.1.0", ++ "wasmtime-environ 0.1.0", ++ "wasmtime-jit 0.1.0", ++ "wasmtime-obj 0.1.0", ++ "wasmtime-runtime 0.1.0", ++ "wasmtime-wasi 0.0.0", ++ "wasmtime-wasi-c 0.0.0", ++ "wasmtime-wast 0.1.0", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] +name = "wasmtime-debug" +version = "0.1.0" +dependencies = [ @@ -1211,9 +1344,9 @@ index 0000000..f702de1 +name = "wasmtime-runtime" +version = "0.1.0" +dependencies = [ -+ "bindgen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bindgen 0.49.2 (registry+https://github.com/rust-lang/crates.io-index)", + "cast 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cmake 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cmake 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", + "cranelift-codegen 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cranelift-entity 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cranelift-wasm 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1222,50 +1355,40 @@ index 0000000..f702de1 + "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", + "memoffset 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "regex 1.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "region 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "wasmtime-environ 0.1.0", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] -+name = "wasmtime-tools" -+version = "0.1.0" ++name = "wasmtime-wasi" ++version = "0.0.0" +dependencies = [ + "cranelift-codegen 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-native 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "docopt 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "errno 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "faerie 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "file-per-thread-logger 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", -+ "pretty_env_logger 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_derive 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-entity 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-wasm 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", + "target-lexicon 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wabt 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasmtime-debug 0.1.0", ++ "wasi-common 0.1.0 (git+https://github.com/CraneStation/wasi-common)", + "wasmtime-environ 0.1.0", + "wasmtime-jit 0.1.0", -+ "wasmtime-obj 0.1.0", + "wasmtime-runtime 0.1.0", -+ "wasmtime-wasi 0.0.0", -+ "wasmtime-wast 0.1.0", +] + +[[package]] -+name = "wasmtime-wasi" ++name = "wasmtime-wasi-c" +version = "0.0.0" +dependencies = [ -+ "bindgen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bindgen 0.49.2 (registry+https://github.com/rust-lang/crates.io-index)", + "cast 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cmake 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cmake 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", + "cranelift-codegen 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cranelift-entity 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cranelift-wasm 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", + "target-lexicon 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "wasmtime-environ 0.1.0", @@ -1296,7 +1419,7 @@ index 0000000..f702de1 +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -1340,23 +1463,23 @@ index 0000000..f702de1 +"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" +"checksum arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "92c7fb76bc8826a8b33b4ee5bb07a247a81e76764ab4d55e8f73e3a4d8808c71" +"checksum atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9a7d5b8723950951411ee34d271d99dddcc2035a16ab25310ea2c8cfd4369652" -+"checksum autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a6d640bee2da49f60a4068a7fae53acde8982514ab7bae8b8cea9e88cbcfd799" -+"checksum backtrace 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "f106c02a3604afcdc0df5d36cc47b44b55917dbaf3d808f71c163a0ddba64637" ++"checksum autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "0e49efa51329a5fd37e7c79db4621af617cd4e3e5bc224939808d076077077bf" ++"checksum backtrace 0.3.30 (registry+https://github.com/rust-lang/crates.io-index)" = "ada4c783bb7e7443c14e0480f429ae2cc99da95065aeab7ee1b81ada0419404f" +"checksum backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)" = "797c830ac25ccc92a7f8a7b9862bde440715531514594a6154e3d4a54dd769b6" -+"checksum bindgen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)" = "33e1b67a27bca31fd12a683b2a3618e275311117f48cfcc892e18403ff889026" -+"checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12" ++"checksum bindgen 0.49.2 (registry+https://github.com/rust-lang/crates.io-index)" = "846a1fba6535362a01487ef6b10f0275faa12e5c5d835c5c1c627aabc46ccbd6" ++"checksum bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3d155346769a6855b86399e9bc3814ab343cd3d62c7e985113d46a0ec3c281fd" +"checksum byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a019b10a2a7cdeb292db131fc8113e57ea2a908f6e7894b0c3c671893b65dbeb" +"checksum capstone 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "00be9d203fa0e078b93b24603633fb081851dfe0c1086364431f52587a47157e" +"checksum capstone-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2dc8d32bc5c1e6d0fcde10af411c98b07d93498d51654f678757f08fa2acd6a6" +"checksum cast 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "926013f2860c46252efceabb19f4a6b308197505082c609025aa6706c011d427" -+"checksum cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)" = "5e5f3fee5eeb60324c2781f1e41286bdee933850fff9b3c672587fed5ec58c83" ++"checksum cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)" = "39f75544d7bbaf57560d2168f28fd649ff9c76153874db88bdbdfd839b1a7e7d" +"checksum cexpr 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "a7fa24eb00d5ffab90eaeaf1092ac85c04c64aaf358ea6f84505b8116d24c6af" -+"checksum cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "11d43355396e872eefb45ce6342e4374ed7bc2b3a502d1b28e36d6e23c05d1f4" ++"checksum cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33" +"checksum chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "45912881121cb26fad7c38c17ba7daa18764771836b34fab7d3fbd93ed633878" +"checksum clang-sys 0.28.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4227269cec09f5f83ff160be12a1e9b0262dd1aa305302d5ba296c2ebd291055" +"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" +"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" -+"checksum cmake 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)" = "96210eec534fc3fbfc0452a63769424eaa80205fda6cea98e5b61cb3d97bcec8" ++"checksum cmake 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)" = "2ca4386c8954b76a8415b63959337d940d724b336cabd3afe189c2b51a7e1ff0" +"checksum cranelift-bforest 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e5a357d20666bf4a8c2d626a19f1b59dbca66cd844fb1e66c5612254fd0f7505" +"checksum cranelift-codegen 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ab00cb149a5bb0f7e6dd391357356a5d71c335a431e8eece94f32da2d5a043f7" +"checksum cranelift-codegen-meta 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e3797a2f450ac71297e083dd440d0cdd0d3bceabe4a3ca6bcb9e4077e9c0327d" @@ -1381,6 +1504,7 @@ index 0000000..f702de1 +"checksum fallible-iterator 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eb7217124812dc5672b7476d0c2d20cfe9f7c0f1ba0904b674a9762a0212f72e" +"checksum file-per-thread-logger 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8505b75b31ef7285168dd237c4a7db3c1f3e0927e7d314e670bc98e854272fe9" +"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" ++"checksum fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" +"checksum gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)" = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" +"checksum gimli 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)" = "eb3243218ca3773e9aa00d27602f35bd1daca3be1b7112ea5fc23b2899f1a4f3" +"checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb" @@ -1390,88 +1514,97 @@ index 0000000..f702de1 +"checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" +"checksum humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3ca7e5f2e110db35f93b837c81797f3714500b81d517bf20c431b16d3ca4f114" +"checksum indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7e81a7c05f79578dbc15793d8b619db9ba32b4577003ef3af1a91c416798c58d" -+"checksum itertools 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)" = "0d47946d458e94a1b7bcabbf6521ea7c037062c81f534615abcad76e84d4970d" +"checksum itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5b8467d9c1cebe26feb08c640139247fac215782d35371ade9a2136ed6085358" -+"checksum itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1306f3464951f30e30d12373d31c79fbd52d236e5e896fd92f96ec7babbbe60b" ++"checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f" +"checksum lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14" -+"checksum libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)" = "bedcc7a809076656486ffe045abeeac163da1b558e963a31e29fbfbeba916917" -+"checksum libloading 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9c3ad660d7cb8c5822cd83d10897b0f1f1526792737a179e73896152f85b88c2" ++"checksum libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)" = "6281b86796ba5e4366000be6e9e18bf35580adf9e63fbe2294aadb587613a319" ++"checksum libloading 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a5692f82b51823e27c4118b3e5c0d98aee9be90633ebc71ad12afef380b50219" +"checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6" +"checksum mach 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "86dd2487cdfea56def77b88438a2c915fb45113c5319bfe7e14306ca4cd0b0e1" -+"checksum matrixmultiply 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "dcad67dcec2d58ff56f6292582377e6921afdf3bfbd533e26fb8900ae575e002" +"checksum memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2efc7bc57c883d4a4d6e3246905283d8dae951bb3bd32f49d6ef297f546e1c39" +"checksum memmap 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e2ffa2c986de11a9df78620c01eeaaf27d94d3ff02bf81bfcca953102dd0c6ff" +"checksum memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0f9dc261e2b62d7a622bf416ea3c5245cdd5d9a7fcc428c0d06804dfce1775b3" +"checksum memoffset 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7efacc914ca612fc1022f27b7dc51585e1a9f94c08fd5d322cfd741399260ce0" +"checksum multi_mut 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "816df386e5557ac1843a96f1ba8a7cbf4ab175d05ccc15c87a3cda27b4fbdece" -+"checksum ndarray 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7cf380a8af901ad627594013a3bbac903ae0a6f94e176e47e46b5bbc1877b928" ++"checksum nix 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "46f0f3210768d796e8fa79ec70ee6af172dacbe7147f5e69be5240a47778302b" +"checksum nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945" +"checksum nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6" -+"checksum num-complex 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "107b9be86cd2481930688277b675b0114578227f034674726605b8a482d8baf8" -+"checksum num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "e83d528d2677f0518c570baf2b7abdcf0cd2d248860b68507bdcb3e91d4c0cea" -+"checksum num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0b3a5d7cc97d6d30d8b9bc8fa19bf45349ffe46241e8816f50f62f6d6aaabee1" ++"checksum num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)" = "b85e541ef8255f6cf42bbfe4ef361305c6c135d10919ecc26126c4e5ae94bc09" ++"checksum num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "6ba9a427cfca2be13aa6f6403b0b7e7368fe982bfa16fccc450ce74c46cd9b32" +"checksum num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1a23f0ed30a54abaa0c7e83b1d2d87ada7c3c23078d1d87815af3e3b6385fbba" ++"checksum numtoa 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef" +"checksum owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "cdf84f41639e037b484f93433aa3897863b561ed65c6e59c7073d7c561710f37" +"checksum peeking_take_while 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" +"checksum plain 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" +"checksum pretty_env_logger 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df8b3f4e0475def7d9c2e5de8e5a1306949849761e107b360d03e98eafaffd61" -+"checksum proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)" = "4d317f9caece796be1980837fd5cb3dfec5613ebdb04ad0956deea83ce168915" ++"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" +"checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" +"checksum quickcheck 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d4537d3e4edf73a15dd059b75bed1c292d17d3ea7517f583cebe716794fcf816" +"checksum quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "faf4799c5d274f3868a4aae320a0a182cbd2baee377b378f080e16a23e9d80db" +"checksum rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9" ++"checksum rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" ++"checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" +"checksum rand_core 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1961a422c4d189dfb50ffa9320bf1f2a9bd54ecb92792fb9477f99a1045f3372" +"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" +"checksum rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d0e7a549d590831370895ab7ba4ea0c1b6b011d106b5ff2da6eee112615e6dc0" ++"checksum rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" ++"checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" ++"checksum rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" ++"checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" ++"checksum rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" ++"checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" +"checksum raw-cpuid 6.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "30a9d219c32c9132f7be513c18be77c9881c7107d2ab5569d205a6a0f0e6dc7d" -+"checksum rawpointer 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ebac11a9d2e11f2af219b8b8d833b76b1ea0e054aa0e8d8e9e4cbde353bdf019" +"checksum rayon 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "373814f27745b2686b350dd261bfd24576a6fb0e2c5919b3a2b6005f820b0473" +"checksum rayon-core 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b055d1e92aba6877574d8fe604a63c8b5df60f60e5982bf7ccbb1338ea527356" ++"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" +"checksum redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)" = "12229c14a0f65c4f1cb046a3b52047cdd9da1f4b30f8a39c5063c8bae515e252" +"checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76" -+"checksum regex 1.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "559008764a17de49a3146b234641644ed37d118d1ef641a0bb573d146edc6ce0" ++"checksum regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "8f0a0bcab2fd7d1d7c54fa9eae6f43eddeb9ce2e7352f8518a814a4f65d60c58" +"checksum regex-syntax 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "dcfd8681eebe297b81d98498869d4aae052137651ad7b96822f09ceb690d0a96" +"checksum region 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ace21a7fc79cffefeb66f2cc3ef22c7687015023bf7f85bec8840f0d46cb51cc" -+"checksum rustc-demangle 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "ccc78bfd5acd7bf3e89cffcf899e5cb1a52d6fafa8dec2739ad70c9577a57288" ++"checksum rustc-demangle 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "a7f4dccf6f4891ebcc0c39f9b6eb1a83b9bf5d747cb439ec6fba4f3b977038af" +"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -+"checksum ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "eb9e9b8cde282a9fe6a42dd4681319bfb63f121b8a8ee9439c6f4107e58a46f7" ++"checksum ryu 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "b96a9549dc8d48f2c283938303c4b5a77aa29bfbc5b54b084fb1630408899a8f" +"checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27" +"checksum scroll 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2f84d114ef17fd144153d608fba7c446b0145d038985e7a8cc5d08bb0ce20383" +"checksum scroll_derive 0.9.5 (registry+https://github.com/rust-lang/crates.io-index)" = "8f1aa96c45e7f5a91cb7fabe7b279f02fea7126239fc40b732316e8b6a2d0fcb" +"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" +"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" -+"checksum serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)" = "aa5f7c20820475babd2c077c3ab5f8c77a31c15e16ea38687b4c02d3e48680f4" -+"checksum serde_derive 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)" = "58fc82bec244f168b23d1963b45c8bf5726e9a15a9d146a067f9081aeed2de79" ++"checksum serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)" = "32746bf0f26eab52f06af0d0aa1984f641341d06d8d673c693871da2d188c9be" ++"checksum serde_derive 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)" = "46a3223d0c9ba936b61c0d2e3e559e3217dbfb8d65d06d26e8b3c25de38bae3e" +"checksum serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)" = "5a23aa71d4a4d43fdbfaac00eff68ba8a06a51759a89ac3304323e800c4dd40d" +"checksum shlex 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" +"checksum smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)" = "c4488ae950c49d403731982257768f48fada354a5203fe81f9bb6f43ca9002be" +"checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8" +"checksum string-interner 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "abb38a0d8fe673c40b10b6b75abcb076a958cc10fb894f14993d9737c4c87000" +"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" -+"checksum strsim 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "34ac666ab1423aa93bbd4cd47b6e62db5a846df4e28b959d823776eed5b57643" -+"checksum structopt 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)" = "3d0760c312538987d363c36c42339b55f5ee176ea8808bbe4543d484a291c8d1" -+"checksum structopt-derive 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)" = "528aeb7351d042e6ffbc2a6fb76a86f9b622fdf7c25932798e7a82cb03bc94c6" -+"checksum syn 0.15.31 (registry+https://github.com/rust-lang/crates.io-index)" = "d2b4cfac95805274c6afdb12d8f770fa2d27c045953e7b630a81801953699a9a" -+"checksum synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "73687139bf99285483c96ac0add482c3776528beac1d97d444f6e91f203a2015" ++"checksum strsim 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "032c03039aae92b350aad2e3779c352e104d919cb192ba2fabbd7b831ce4f0f6" ++"checksum structopt 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)" = "c767a8971f53d7324583085deee2e230903be09e52fb27df9af94c5cb2b43c31" ++"checksum structopt-derive 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)" = "c57a30c87454ced2186f62f940e981746e8cbbe026d52090c8c4352b636f8235" ++"checksum syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)" = "a1393e4a97a19c01e900df2aec855a29f71cf02c402e2f443b8d2747c25c5dbe" ++"checksum synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "02353edf96d6e4dc81aea2d8490a7e9db177bf8acb0e951c24940bf866cb313f" +"checksum take_mut 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60" +"checksum target-lexicon 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d6923974ce4eb5bd28814756256d8ab71c28dd6e7483313fe7ab6614306bf633" -+"checksum termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4096add70612622289f2fdcdbd5086dc81c1e2675e6ae58d6c4f62a16c6d7f2f" -+"checksum termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096" ++"checksum termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "96d6098003bde162e4277c70665bd87c326f5a0c3f3fbfb285787fa482d54e6e" ++"checksum termion 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dde0593aeb8d47accea5392b39350015b5eccb12c0d98044d856983d89548dea" +"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" +"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" +"checksum traitobject 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079" +"checksum typemap 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "653be63c80a3296da5551e1bfd2cca35227e13cdd08c6668903ae2f4f77aa1f6" +"checksum ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "535c204ee4d8434478593480b8f86ab45ec9aae0e83c568ca81abf0fd0e88f86" -+"checksum unicode-segmentation 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "aa6024fc12ddfd1c6dbc14a80fa2324d4568849869b779f6bd37e5e4c03344d1" ++"checksum unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1967f4cdfc355b37fd76d2a954fb2ed3871034eb4f26d60537d88795cfc332a9" +"checksum unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526" +"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" +"checksum unsafe-any 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f30360d7979f5e9c6e6cea48af192ea8fab4afb3cf72597154b8f08935bc9c7f" +"checksum utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "796f7e48bef87609f7ade7e06495a87d5cd06c7866e6a5cbfceffc558a243737" +"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" +"checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" ++"checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" +"checksum wabt 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "74e463a508e390cc7447e70f640fbf44ad52e1bd095314ace1fdf99516d32add" +"checksum wabt-sys 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a6265b25719e82598d104b3717375e37661d41753e2c84cde3f51050c7ed7e3c" ++"checksum wasi-common 0.1.0 (git+https://github.com/CraneStation/wasi-common)" = "<none>" ++"checksum wasi-common-cbindgen 0.1.0 (git+https://github.com/CraneStation/wasi-common)" = "<none>" +"checksum wasmparser 0.29.2 (registry+https://github.com/rust-lang/crates.io-index)" = "981a8797cf89762e0233ec45fae731cb79a4dfaee12d9f0fe6cee01e4ac58d00" +"checksum which 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b57acb10231b9493c8472b20cb57317d0679a49e0bdbee44b3b803a6473af164" +"checksum winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770" diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index 33d00afd9e7..90fc38afa06 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -1,18 +1,18 @@ { rustPlatform, fetchFromGitHub, lib, python, cmake, llvmPackages, clang }: rustPlatform.buildRustPackage rec { - name = "wasmtime-${version}"; - version = "0.1.0"; + pname = "wasmtime"; + version = "20190521"; src = fetchFromGitHub { owner = "CraneStation"; repo = "wasmtime"; - rev = "07a6ca8f4e1136ecd9f4af8d1f03a01aade60407"; - sha256 = "1cq6nz90kaf023mcyblca90bpvbzhq8xjq01laa28v7r50lagcn5"; + rev = "e530a582afe6a2b5735fd7cdf5e2e88391e58669"; + sha256 = "13lqf9dp1cnw7ms7hcgirmlfkr0v7nrn3p5g7yacfasrqgnwsyl8"; fetchSubmodules = true; }; - cargoSha256 = "0xy8vazb4nc4q1098ws92j1yfwp9w7q30z0yk2gindkn898603bc"; + cargoSha256 = "1jbpq09czm295316gdv3y0pfapqs0ynj3qbarwlnrv7valq5ak13"; cargoPatches = [ ./cargo-lock.patch ]; diff --git a/pkgs/development/libraries/ace/default.nix b/pkgs/development/libraries/ace/default.nix index e0c46acb630..75c942d4d48 100644 --- a/pkgs/development/libraries/ace/default.nix +++ b/pkgs/development/libraries/ace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ace-${version}"; - version = "6.5.5"; + version = "6.5.6"; src = fetchurl { url = "http://download.dre.vanderbilt.edu/previous_versions/ACE-${version}.tar.bz2"; - sha256 = "1r1bvy65n50l6lbxm1k1bscqcv29mpkgp0pgr5cvvv7ldisrjl39"; + sha256 = "15lfjc8r854hvjfvimhnqc3987b3cdngilhkii9rwpzginbyipi4"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index f2b038aa379..3b93a351f7f 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, cmake, openblasCompat, superlu, hdf5 }: stdenv.mkDerivation rec { - version = "9.600.5"; + version = "9.600.6"; name = "armadillo-${version}"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "1gy2rb3klvzx833851qgsbh5k1ds5zffwk0rmy1k8b1g51jdd76x"; + sha256 = "0wlk1yv9531vpvgja4cpy0sxykrn0p5w376kx86vl45b50yamx7g"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index c4cbd970d41..7660ea81eaf 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -4,29 +4,30 @@ let parquet-testing = fetchFromGitHub { owner = "apache"; repo = "parquet-testing"; - rev = "8991d0b58d5a59925c87dd2a0bdb59a5a4a16bd4"; - sha256 = "00js5d1s98y3ianrvh1ggrd157yfmia4g55jx9xmfcz4a8mcbawx"; - }; - - # Enable non-bundled uriparser - # Introduced in https://github.com/apache/arrow/pull/4092 - Finduriparser_cmake = fetchurl { - url = https://raw.githubusercontent.com/apache/arrow/af4f52961209a5f1b43a19483536285c957e3bed/cpp/cmake_modules/Finduriparser.cmake; - sha256 = "1cylrw00n2nkc2c49xk9j3rrza351rpravxgpw047vimcw0sk93s"; + rev = "a277dc4e55ded3e3ea27dab1e4faf98c112442df"; + sha256 = "1yh5a8l4ship36hwmgmp2kl72s5ac9r8ly1qcs650xv2g9q7yhnq"; }; in stdenv.mkDerivation rec { name = "arrow-cpp-${version}"; - version = "0.13.0"; + version = "0.14.1"; src = fetchurl { url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz"; - sha256 = "06irh5zx6lc7jjf6hpz1vzk0pvbdx08lcirc8cp8ksb8j7fpfamc"; + sha256 = "0a0xrsbr7dd1yp34yw82jw7psfkfvm935jhd5mam32vrsjvdsj4r"; }; sourceRoot = "apache-arrow-${version}/cpp"; + ARROW_JEMALLOC_URL = fetchurl { + # From + # ./cpp/cmake_modules/ThirdpartyToolchain.cmake + # ./cpp/thirdparty/versions.txt + url = "https://github.com/jemalloc/jemalloc/releases/download/5.2.0/jemalloc-5.2.0.tar.bz2"; + sha256 = "1d73a5c5qdrwck0fa5pxz0myizaf3s9alsvhiqwrjahdlr29zgkl"; + }; + patches = [ # patch to fix python-test ./darwin.patch @@ -42,8 +43,6 @@ stdenv.mkDerivation rec { preConfigure = '' substituteInPlace cmake_modules/FindLz4.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY - cp ${Finduriparser_cmake} cmake_modules/Finduriparser.cmake - patchShebangs build-support/ # Fix build for ARROW_USE_SIMD=OFF @@ -64,7 +63,7 @@ stdenv.mkDerivation rec { PARQUET_TEST_DATA = if doInstallCheck then "${parquet-testing}/data" else null; installCheckInputs = [ perl which ]; installCheckPhase = (stdenv.lib.optionalString stdenv.isDarwin '' - for f in release/*-test; do + for f in release/*test; do install_name_tool -add_rpath "$out"/lib "$f" done '') + '' diff --git a/pkgs/development/libraries/audio/libbass/default.nix b/pkgs/development/libraries/audio/libbass/default.nix index 0e1445ca9ee..3552e335fed 100644 --- a/pkgs/development/libraries/audio/libbass/default.nix +++ b/pkgs/development/libraries/audio/libbass/default.nix @@ -1,32 +1,38 @@ { stdenv, unzip, fetchurl }: -let - version = "24"; +# Upstream changes files in-place, to update: +# 1. Check latest version at http://www.un4seen.com/ +# 2. Update `version`s and `sha256` sums. +# See also http://www.un4seen.com/forum/?topic=18614.0 +let allBass = { bass = { h = "bass.h"; + version = "2.4.14"; so = { i686_linux = "libbass.so"; x86_64-linux = "x64/libbass.so"; }; - urlpath = "bass${version}-linux.zip"; - sha256 = "1hjxp1akj8367qlglv5rqpwq2dimfz3bkllwq39abavz4sp8smjz"; + urlpath = "bass24-linux.zip"; + sha256 = "1nyzs08z0djyvz6jx1y9y99y0ksp4sxz9l2x43k1c9irls24xpfy"; }; bass_fx = { h = "C/bass_fx.h"; + version = "2.4.12.1"; so = { i686_linux = "libbass_fx.so"; x86_64-linux = "x64/libbass_fx.so"; }; - urlpath = "z/0/bass_fx${version}-linux.zip"; + urlpath = "z/0/bass_fx24-linux.zip"; sha256 = "1q0g74z7iyhxqps5b3gnnbic8v2jji1r0mkvais57lsx8y21sbin"; }; }; dropBass = name: bass: stdenv.mkDerivation { - name = "lib${name}-${version}"; + pname = "lib${name}"; + inherit (bass) version; src = fetchurl { url = "https://www.un4seen.com/files/${bass.urlpath}"; diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix index 15744744067..4a1ea394207 100644 --- a/pkgs/development/libraries/caf/default.nix +++ b/pkgs/development/libraries/caf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "actor-framework-${version}"; - version = "0.16.3"; + version = "0.17.0"; src = fetchFromGitHub { owner = "actor-framework"; repo = "actor-framework"; rev = "${version}"; - sha256 = "0nqw1cv7wxbcn2qwm08qffb6k4n3kgvdiaphks5gjgm305jk4vnx"; + sha256 = "10dcpmdsfq6r7hpvg413pqi1q3rjvgn7f87c17ghyz30x6rjhaic"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/cdo/default.nix b/pkgs/development/libraries/cdo/default.nix index af69e23ca1f..2a3dbc7a2d1 100644 --- a/pkgs/development/libraries/cdo/default.nix +++ b/pkgs/development/libraries/cdo/default.nix @@ -5,15 +5,15 @@ }: stdenv.mkDerivation rec { - version = "1.9.0"; - name = "cdo-${version}"; + pname = "cdo"; + version = "1.9.7.1"; # Dependencies buildInputs = [ curl netcdf hdf5 ]; src = fetchurl { - url = "https://code.mpimet.mpg.de/attachments/download/15187/${name}.tar.gz"; - sha256 = "024hsr6qfg2dicwvm0vvkg3fr998bchf0qgwpj2v0jmz7a67ydnz"; + url = "https://code.mpimet.mpg.de/attachments/download/20124/${pname}-${version}.tar.gz"; + sha256 = "0b4n8dwxfsdbz4jflsx0b75hwapdf1rp14p48dfr7ksv0qp9aw9p"; }; # Configure phase @@ -23,15 +23,15 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional (enable_all_static) "--enable-all-static" ++ stdenv.lib.optional (enable_cxx) "--enable-cxx"; - meta = { + meta = with stdenv.lib; { description = "Collection of command line Operators to manipulate and analyse Climate and NWP model Data"; longDescription = '' Supported data formats are GRIB 1/2, netCDF 3/4, SERVICE, EXTRA and IEG. There are more than 600 operators available. ''; homepage = https://code.mpimet.mpg.de/projects/cdo/; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.ltavard ]; - platforms = with stdenv.lib.platforms; linux ++ darwin; + license = licenses.gpl2; + maintainers = [ maintainers.ltavard ]; + platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix index bab0a84ca79..3e6e62e5a96 100644 --- a/pkgs/development/libraries/cimg/default.nix +++ b/pkgs/development/libraries/cimg/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "cimg-${version}"; - version = "2.6.7"; + version = "2.7.0"; src = fetchurl { url = "http://cimg.eu/files/CImg_${version}.zip"; - sha256 = "1jjsyq6ljpprak8l76aym1p28j9y7djxl73pdh1kpkw85ac23h6m"; + sha256 = "1la6332cppyciyn3pflbchxa3av72a70p0n1c9sm1hgfbjlydqnv"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/libraries/cppzmq/default.nix b/pkgs/development/libraries/cppzmq/default.nix index 4c63e93e5c4..5bffda607ee 100644 --- a/pkgs/development/libraries/cppzmq/default.nix +++ b/pkgs/development/libraries/cppzmq/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "cppzmq-${version}"; - version = "4.3.0"; + version = "4.4.1"; src = fetchFromGitHub { owner = "zeromq"; repo = "cppzmq"; rev = "v${version}"; - sha256 = "1g45cdny1m08zw4l261bqcqfdb825mnwjwqcf35bkyc03fr4213l"; + sha256 = "15dgkv51csfkafplf0n0vqbjdr4pxqxq44dln0dcizhsn1p0a57q"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/crc32c/default.nix b/pkgs/development/libraries/crc32c/default.nix new file mode 100644 index 00000000000..916ec5b703b --- /dev/null +++ b/pkgs/development/libraries/crc32c/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, cmake, gflags }: +stdenv.mkDerivation rec { + pname = "crc32c"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "google"; + repo = "crc32c"; + rev = version; + sha256 = "1sazkis9rzbrklfrvk7jn1mqywnq4yghmzg94mxd153h8b1sb149"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ gflags ]; + NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.isAarch64 "-march=armv8-a+crc"; + + meta = with stdenv.lib; { + homepage = https://github.com/google/crc32c; + description = "CRC32C implementation with support for CPU-specific acceleration instructions"; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ andir ]; + }; +} diff --git a/pkgs/development/libraries/cre2/default.nix b/pkgs/development/libraries/cre2/default.nix index 74619cbaaae..d8130d0b8f9 100644 --- a/pkgs/development/libraries/cre2/default.nix +++ b/pkgs/development/libraries/cre2/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "cre2-${version}"; - version = "0.3.0"; - + version = "0.3.6"; + src = fetchFromGitHub { owner = "marcomaggi"; repo = "cre2"; - rev = version; - sha256 = "12yrdad87jjqrhbqm02hzsayan2402vf61a9x1b2iabv6d1c1bnj"; + rev = "v${version}"; + sha256 = "1h9jwn6z8kjf4agla85b5xf7gfkdwncp0mfd8zwk98jkm8y2qx9q"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/cutelyst/default.nix b/pkgs/development/libraries/cutelyst/default.nix index c4778e5b030..216b644b38e 100644 --- a/pkgs/development/libraries/cutelyst/default.nix +++ b/pkgs/development/libraries/cutelyst/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "cutelyst-${version}"; - version = "2.7.0"; + version = "2.8.0"; src = fetchFromGitHub { owner = "cutelyst"; repo = "cutelyst"; rev = "v${version}"; - sha256 = "09cgfpr2k1jp98h1ahxqm5lmv3qbk0bcxpqpill6n5wmq2c8kl8b"; + sha256 = "02jys32qkyksa2dmanyg4x0y5lh4ra0xbn2mfr2k84slrxbgjs1g"; }; nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ]; diff --git a/pkgs/development/libraries/dav1d/default.nix b/pkgs/development/libraries/dav1d/default.nix index 157a6a21f3d..5f7ca179d4a 100644 --- a/pkgs/development/libraries/dav1d/default.nix +++ b/pkgs/development/libraries/dav1d/default.nix @@ -1,19 +1,27 @@ -{ stdenv, fetchFromGitLab, meson, ninja, nasm }: +{ stdenv, fetchFromGitLab +, meson, ninja, nasm, pkgconfig +, withTools ? false, SDL2 +}: stdenv.mkDerivation rec { pname = "dav1d"; - version = "0.3.1"; + version = "0.4.0"; src = fetchFromGitLab { domain = "code.videolan.org"; owner = "videolan"; repo = pname; rev = version; - sha256 = "1m5vdg64iqxpi37l84mcfiq313g9z55zf66s85j2rqik6asmxbqg"; + sha256 = "1fbalfzw8j00vwbrh9h8kjdx6h99dr10vmvbpg3rhsspmxq9h66h"; }; - nativeBuildInputs = [ meson ninja nasm ]; + nativeBuildInputs = [ meson ninja nasm pkgconfig ]; # TODO: doxygen (currently only HTML and not build by default). + buildInputs = stdenv.lib.optional withTools SDL2; + + mesonFlags= [ + "-Denable_tools=${stdenv.lib.boolToString withTools}" + ]; meta = with stdenv.lib; { description = "A cross-platform AV1 decoder focused on speed and correctness"; diff --git a/pkgs/development/libraries/fcppt/default.nix b/pkgs/development/libraries/fcppt/default.nix index a37ebe7c5e0..77e26f6b5dc 100644 --- a/pkgs/development/libraries/fcppt/default.nix +++ b/pkgs/development/libraries/fcppt/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, boost, brigand, catch2 }: stdenv.mkDerivation rec { - name = "fcppt-${version}"; - version = "3.0.0"; + pname = "fcppt"; + version = "3.2.2"; src = fetchFromGitHub { owner = "freundlich"; repo = "fcppt"; rev = version; - sha256 = "0l78fjhy9nl3afrf0da9da4wzp1sx3kcyc2j6b71i60kvk44v4in"; + sha256 = "09mah52m3lih2n0swpsh8qb72yzl4nixaq99xp7wxyxxprhf4bpa"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/ffmpeg/4.nix b/pkgs/development/libraries/ffmpeg/4.nix index 3431943155e..8fd2ce70498 100644 --- a/pkgs/development/libraries/ffmpeg/4.nix +++ b/pkgs/development/libraries/ffmpeg/4.nix @@ -6,12 +6,7 @@ callPackage ./generic.nix (args // rec { version = "${branch}"; - branch = "4.1.4"; - sha256 = "01w44ygm5bvc243hlhfnvb2lxfb0blz2cxnphxqgw30vj3c1prx7"; - patches = [(fetchpatch { # remove on update - name = "fix-hardcoded-tables.diff"; - url = "http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/c8232e50074f"; - sha256 = "0jlksks4fjajby8fjk7rfp414gxfdgd6q9khq26i52xvf4kg2dw6"; - })]; + branch = "4.2"; + sha256 = "1f3glany3p2j832a9wia5vj8ds9xpm0xxlyia91y17hy85gxwsrh"; darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ]; }) diff --git a/pkgs/development/libraries/flatpak/bubblewrap-paths.patch b/pkgs/development/libraries/flatpak/bubblewrap-paths.patch index 79257fd6be5..407811736f8 100644 --- a/pkgs/development/libraries/flatpak/bubblewrap-paths.patch +++ b/pkgs/development/libraries/flatpak/bubblewrap-paths.patch @@ -1,8 +1,8 @@ diff --git a/icon-validator/validate-icon.c b/icon-validator/validate-icon.c -index 6e23d9f2..8c621ec4 100644 +index 9e885070..d02eeb8c 100644 --- a/icon-validator/validate-icon.c +++ b/icon-validator/validate-icon.c -@@ -149,8 +149,8 @@ rerun_in_sandbox (const char *arg_width, +@@ -156,8 +156,8 @@ rerun_in_sandbox (const char *arg_width, "--unshare-ipc", "--unshare-net", "--unshare-pid", diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index 4c4949b37be..d29be4cb930 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchurl, autoreconfHook, docbook_xml_dtd_412, docbook_xml_dtd_42, docbook_xml_dtd_43, docbook_xsl, which, libxml2 , gobject-introspection, gtk-doc, intltool, libxslt, pkgconfig, xmlto, appstream-glib, substituteAll, glibcLocales, yacc, xdg-dbus-proxy, p11-kit -, bubblewrap, bzip2, dbus, glib, gpgme, json-glib, libarchive, libcap, libseccomp, coreutils, gettext, hicolor-icon-theme +, bubblewrap, bzip2, dbus, glib, gpgme, json-glib, libarchive, libcap, libseccomp, coreutils, gettext, hicolor-icon-theme, fuse , libsoup, lzma, ostree, polkit, python3, systemd, xorg, valgrind, glib-networking, wrapGAppsHook, gnome3, gsettings-desktop-schemas, librsvg }: stdenv.mkDerivation rec { pname = "flatpak"; - version = "1.2.4"; + version = "1.4.2"; # TODO: split out lib once we figure out what to do with triggerdir outputs = [ "out" "man" "doc" "installedTests" ]; src = fetchurl { url = "https://github.com/flatpak/flatpak/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "1qf3ys84fzv11z6f6li59rxjdjbyrv7cyi9539k73r9i9pckjr8v"; + sha256 = "08nmpp26mgv0vp3mlwk97rnp0j7i108h4hr9nllja19sjxnrlygj"; }; patches = [ @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { buildInputs = [ bubblewrap bzip2 dbus gnome3.dconf glib gpgme json-glib libarchive libcap libseccomp - libsoup lzma ostree polkit python3 systemd xorg.libXau + libsoup lzma ostree polkit python3 systemd xorg.libXau fuse gsettings-desktop-schemas glib-networking librsvg # for flatpak-validate-icon ]; diff --git a/pkgs/development/libraries/flatpak/fix-paths.patch b/pkgs/development/libraries/flatpak/fix-paths.patch index 49fcaa2b3f9..746b4382864 100644 --- a/pkgs/development/libraries/flatpak/fix-paths.patch +++ b/pkgs/development/libraries/flatpak/fix-paths.patch @@ -1,6 +1,8 @@ +diff --git a/session-helper/flatpak-session-helper.c b/session-helper/flatpak-session-helper.c +index 5dd7629e..ddc71a4c 100644 --- a/session-helper/flatpak-session-helper.c +++ b/session-helper/flatpak-session-helper.c -@@ -624,7 +624,7 @@ +@@ -693,7 +693,7 @@ start_p11_kit_server (const char *flatpak_dir) g_auto(GStrv) stdout_lines = NULL; int i; char *p11_argv[] = { @@ -9,7 +11,7 @@ /* We explicitly request --sh here, because we then fail on earlier versions that doesn't support * this flag. This is good, because those earlier versions did not properly daemonize and caused * the spawn_sync to hang forever, waiting for the pipe to close. -@@ -770,7 +770,7 @@ +@@ -836,7 +836,7 @@ main (int argc, exit (1); } diff --git a/pkgs/development/libraries/flatpak/fix-test-paths.patch b/pkgs/development/libraries/flatpak/fix-test-paths.patch index f987899e3bc..85b222152d0 100644 --- a/pkgs/development/libraries/flatpak/fix-test-paths.patch +++ b/pkgs/development/libraries/flatpak/fix-test-paths.patch @@ -1,6 +1,8 @@ +diff --git a/tests/libtest.sh b/tests/libtest.sh +index 46bcefb3..0134425e 100644 --- a/tests/libtest.sh +++ b/tests/libtest.sh -@@ -328,7 +328,7 @@ +@@ -352,7 +352,7 @@ if [ -z "${FLATPAK_BWRAP:-}" ]; then # running installed-tests: assume we know what we're doing _flatpak_bwrap_works=true elif ! "$FLATPAK_BWRAP" --unshare-ipc --unshare-net --unshare-pid \ @@ -9,7 +11,7 @@ _flatpak_bwrap_works=false else _flatpak_bwrap_works=true -@@ -309,12 +309,12 @@ +@@ -426,12 +426,12 @@ dbus-daemon --fork --config-file=session.conf --print-address=3 --print-pid=4 \ export DBUS_SESSION_BUS_ADDRESS="$(cat dbus-session-bus-address)" DBUS_SESSION_BUS_PID="$(cat dbus-session-bus-pid)" @@ -24,9 +26,11 @@ gpg-connect-agent --homedir "${FL_GPG_HOMEDIR}" killagent /bye || true fusermount -u $XDG_RUNTIME_DIR/doc || : if test -n "${TEST_SKIP_CLEANUP:-}"; then +diff --git a/tests/make-test-app.sh b/tests/make-test-app.sh +index 0a0a28f1..16fd51fe 100755 --- a/tests/make-test-app.sh +++ b/tests/make-test-app.sh -@@ -114,13 +114,13 @@ msgid "Hello world" +@@ -129,13 +129,13 @@ msgid "Hello world" msgstr "Hallo Welt" EOF mkdir -p ${DIR}/files/de/share/de/LC_MESSAGES @@ -42,9 +46,11 @@ flatpak build-finish ${DIR} mkdir -p repos +diff --git a/tests/make-test-runtime.sh b/tests/make-test-runtime.sh +index 57899b75..9236996f 100755 --- a/tests/make-test-runtime.sh +++ b/tests/make-test-runtime.sh -@@ -26,6 +26,7 @@ +@@ -28,6 +28,7 @@ EOF PATH="$PATH:/usr/sbin:/sbin" # Add bash and dependencies @@ -52,7 +58,7 @@ mkdir -p ${DIR}/usr/bin mkdir -p ${DIR}/usr/lib ln -s ../lib ${DIR}/usr/lib64 -@@ -35,48 +36,27 @@ +@@ -37,48 +38,23 @@ if test -f /sbin/ldconfig.real; then else cp `which ldconfig` ${DIR}/usr/bin fi @@ -105,21 +111,20 @@ -# We copy the C.UTF8 locale and call it en_US. Its a bit of a lie, but -# the real en_US locale is often not available, because its in the -# local archive. +-mkdir -p ${DIR}/usr/lib/locale/ +-cp -r /usr/lib/locale/C.* ${DIR}/usr/lib/locale/en_US +mv ${DIR}/nix/store ${DIR}/usr/store # files outside /usr are not permitted, we will have to replace /nix/store with /usr/store +chmod -R u+w ${DIR} # nix store has read-only directories which would cause problems during clean-up, files need to be writable for sed +find ${DIR} -type f -print0 | xargs -0 sed -i 's~/nix/store/~/usr/store/~g' # replace hardcoded paths +find ${DIR} -type l | xargs -I '{}' sh -c 'tg="$(readlink "$1")"; newtg="${tg#/nix/store/}"; if [ "$tg" != "$newtg" ]; then ln -fs "/usr/store/$newtg" "$1"; fi' -- '{}' # replace symlink targets -+ -+# We copy the whole locale archive because we do not have C.UTF8 locale - mkdir -p ${DIR}/usr/lib/locale/ --cp -r /usr/lib/locale/C.* ${DIR}/usr/lib/locale/en_US -+cp @glibcLocales@/lib/locale/locale-archive ${DIR}/usr/lib/locale/locale-archive if [ x$COLLECTION_ID != x ]; then collection_args=--collection-id=${COLLECTION_ID} +diff --git a/tests/testlibrary.c b/tests/testlibrary.c +index f2773dc8..3af9026f 100644 --- a/tests/testlibrary.c +++ b/tests/testlibrary.c -@@ -584,7 +584,7 @@ +@@ -1053,7 +1053,7 @@ check_bwrap_support (void) { gint exit_code = 0; char *argv[] = { (char *) bwrap, "--unshare-ipc", "--unshare-net", @@ -128,6 +133,8 @@ g_autofree char *argv_str = g_strjoinv (" ", argv); g_test_message ("Spawning %s", argv_str); g_spawn_sync (NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, NULL, &exit_code, &error); +diff --git a/triggers/gtk-icon-cache.trigger b/triggers/gtk-icon-cache.trigger +index 711cfab2..10c220ec 100755 --- a/triggers/gtk-icon-cache.trigger +++ b/triggers/gtk-icon-cache.trigger @@ -1,7 +1,7 @@ diff --git a/pkgs/development/libraries/flatpak/respect-xml-catalog-files-var.patch b/pkgs/development/libraries/flatpak/respect-xml-catalog-files-var.patch index 0e259aebd8a..4cee60be2d0 100644 --- a/pkgs/development/libraries/flatpak/respect-xml-catalog-files-var.patch +++ b/pkgs/development/libraries/flatpak/respect-xml-catalog-files-var.patch @@ -1,6 +1,8 @@ +diff --git a/acinclude.m4 b/acinclude.m4 +index 92ec3985..b3fccf1d 100644 --- a/acinclude.m4 +++ b/acinclude.m4 -@@ -40,8 +40,8 @@ +@@ -40,8 +40,8 @@ AC_DEFUN([JH_CHECK_XML_CATALOG], [ AC_REQUIRE([JH_PATH_XML_CATALOG],[JH_PATH_XML_CATALOG(,[:])])dnl AC_MSG_CHECKING([for ifelse([$2],,[$1],[$2]) in XML catalog]) diff --git a/pkgs/development/libraries/flatpak/unset-env-vars.patch b/pkgs/development/libraries/flatpak/unset-env-vars.patch index 798e388b23c..63ce0d12fe0 100644 --- a/pkgs/development/libraries/flatpak/unset-env-vars.patch +++ b/pkgs/development/libraries/flatpak/unset-env-vars.patch @@ -1,6 +1,8 @@ +diff --git a/common/flatpak-run.c b/common/flatpak-run.c +index 8d52d3a5..81700183 100644 --- a/common/flatpak-run.c +++ b/common/flatpak-run.c -@@ -1192,6 +1192,7 @@ static const ExportData default_exports[] = { +@@ -1232,6 +1232,7 @@ static const ExportData default_exports[] = { {"PERLLIB", NULL}, {"PERL5LIB", NULL}, {"XCURSOR_PATH", NULL}, diff --git a/pkgs/development/libraries/flatpak/use-flatpak-from-path.patch b/pkgs/development/libraries/flatpak/use-flatpak-from-path.patch index 408198bda5c..01363ffb7b3 100644 --- a/pkgs/development/libraries/flatpak/use-flatpak-from-path.patch +++ b/pkgs/development/libraries/flatpak/use-flatpak-from-path.patch @@ -1,6 +1,8 @@ +diff --git a/common/flatpak-dir.c b/common/flatpak-dir.c +index 8f9dc66c..d3ab6e5f 100644 --- a/common/flatpak-dir.c +++ b/common/flatpak-dir.c -@@ -5758,7 +5758,7 @@ export_desktop_file (const char *app, +@@ -6701,7 +6701,7 @@ export_desktop_file (const char *app, new_exec = g_string_new (""); g_string_append_printf (new_exec, @@ -9,7 +11,7 @@ escaped_branch, escaped_arch); -@@ -6935,8 +6935,8 @@ flatpak_dir_deploy (FlatpakDir *self, +@@ -7891,8 +7891,8 @@ flatpak_dir_deploy (FlatpakDir *self, error)) return FALSE; @@ -21,28 +23,28 @@ G_FILE_CREATE_REPLACE_DESTINATION, NULL, cancellable, error)) return FALSE; diff --git a/tests/test-bundle.sh b/tests/test-bundle.sh -index 6937b041..01f8add7 100755 +index dff17f33..a9857adc 100755 --- a/tests/test-bundle.sh +++ b/tests/test-bundle.sh @@ -59,7 +59,7 @@ assert_has_dir $FL_DIR/app/org.test.Hello/$ARCH/master/active/files assert_has_dir $FL_DIR/app/org.test.Hello/$ARCH/master/active/export assert_has_file $FL_DIR/exports/share/applications/org.test.Hello.desktop # Ensure Exec key is rewritten --assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=.*/flatpak run --branch=master --arch=$ARCH --command=hello.sh org.test.Hello$" -+assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=flatpak run --branch=master --arch=$ARCH --command=hello.sh org.test.Hello$" +-assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=.*/flatpak run --branch=master --arch=$ARCH --command=hello\.sh org\.test\.Hello$" ++assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=flatpak run --branch=master --arch=$ARCH --command=hello\.sh org\.test\.Hello$" assert_has_file $FL_DIR/exports/share/icons/hicolor/64x64/apps/org.test.Hello.png assert_has_file $FL_DIR/exports/share/icons/HighContrast/64x64/apps/org.test.Hello.png diff --git a/tests/test-run.sh b/tests/test-run.sh -index 9d83d82e..234e4ec6 100755 +index 233df9ad..76e0b23b 100644 --- a/tests/test-run.sh +++ b/tests/test-run.sh -@@ -42,7 +42,7 @@ assert_has_dir $FL_DIR/app/org.test.Hello/$ARCH/master/active/files - assert_has_dir $FL_DIR/app/org.test.Hello/$ARCH/master/active/export +@@ -45,7 +45,7 @@ assert_has_dir $FL_DIR/app/org.test.Hello/$ARCH/stable/active/files + assert_has_dir $FL_DIR/app/org.test.Hello/$ARCH/stable/active/export assert_has_file $FL_DIR/exports/share/applications/org.test.Hello.desktop # Ensure Exec key is rewritten --assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=.*/flatpak run --branch=master --arch=$ARCH --command=hello.sh org.test.Hello$" -+assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=flatpak run --branch=master --arch=$ARCH --command=hello.sh org.test.Hello$" +-assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=.*/flatpak run --branch=stable --arch=$ARCH --command=hello\.sh org\.test\.Hello$" ++assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=flatpak run --branch=stable --arch=$ARCH --command=hello\.sh org\.test\.Hello$" assert_has_file $FL_DIR/exports/share/icons/hicolor/64x64/apps/org.test.Hello.png assert_not_has_file $FL_DIR/exports/share/icons/hicolor/64x64/apps/dont-export.png assert_has_file $FL_DIR/exports/share/icons/HighContrast/64x64/apps/org.test.Hello.png diff --git a/pkgs/development/libraries/flatpak/validate-icon-pixbuf.patch b/pkgs/development/libraries/flatpak/validate-icon-pixbuf.patch index 5b8cc2d0383..086114e11c3 100644 --- a/pkgs/development/libraries/flatpak/validate-icon-pixbuf.patch +++ b/pkgs/development/libraries/flatpak/validate-icon-pixbuf.patch @@ -1,8 +1,8 @@ diff --git a/icon-validator/validate-icon.c b/icon-validator/validate-icon.c -index 6e23d9f2..f0659a78 100644 +index 9e885070..44fea035 100644 --- a/icon-validator/validate-icon.c +++ b/icon-validator/validate-icon.c -@@ -193,6 +193,8 @@ rerun_in_sandbox (const char *arg_width, +@@ -200,6 +200,8 @@ rerun_in_sandbox (const char *arg_width, add_args (args, "--setenv", "G_MESSAGES_DEBUG", g_getenv ("G_MESSAGES_DEBUG"), NULL); if (g_getenv ("G_MESSAGES_PREFIXED")) add_args (args, "--setenv", "G_MESSAGES_PREFIXED", g_getenv ("G_MESSAGES_PREFIXED"), NULL); diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 78e32192fb4..3fba3db7a33 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "folly-${version}"; - version = "2019.06.17.00"; + version = "2019.07.22.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "0v639yqk029c585x3140rdfbz3xrdjwc858bqfy4yv31pyrn608l"; + sha256 = "1vh5jrqz0lp6rc5fr6vk3yqss5vaycdsyap12mcr0cniv419fdxa"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/g2o/default.nix b/pkgs/development/libraries/g2o/default.nix index 1486b5bfc55..909c504870f 100644 --- a/pkgs/development/libraries/g2o/default.nix +++ b/pkgs/development/libraries/g2o/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, fetchFromGitHub, cmake, eigen, suitesparse }: +{ lib, stdenv, fetchFromGitHub, cmake, eigen, suitesparse, libGLU, qt5 +, libsForQt5, makeWrapper }: stdenv.mkDerivation rec { pname = "g2o"; @@ -11,8 +12,33 @@ stdenv.mkDerivation rec { sha256 = "1rgrz6zxiinrik3lgwgvsmlww1m2fnpjmvcx1mf62xi1s2ma5w2i"; }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ eigen suitesparse ]; + # Removes a reference to gcc that is only used in a debug message + patches = [ ./remove-compiler-reference.patch ]; + + separateDebugInfo = true; + + nativeBuildInputs = [ cmake makeWrapper ]; + buildInputs = [ eigen suitesparse libGLU qt5.qtbase libsForQt5.libqglviewer ]; + + cmakeFlags = [ + # Detection script is broken + "-DQGLVIEWER_INCLUDE_DIR=${libsForQt5.libqglviewer}/include/QGLViewer" + "-DG2O_BUILD_EXAMPLES=OFF" + ] ++ lib.optionals stdenv.isx86_64 ([ "-DDO_SSE_AUTODETECT=OFF" ] ++ { + "default" = [ "-DDISABLE_SSE3=ON" "-DDISABLE_SSE4_1=ON" "-DDISABLE_SSE4_2=ON" "-DDISABLE_SSE4_A=ON" ]; + "westmere" = [ "-DDISABLE_SSE4_A=ON" ]; + "sandybridge" = [ "-DDISABLE_SSE4_A=ON" ]; + "ivybridge" = [ "-DDISABLE_SSE4_A=ON" ]; + "haswell" = [ "-DDISABLE_SSE4_A=ON" ]; + "broadwell" = [ "-DDISABLE_SSE4_A=ON" ]; + "skylake" = [ "-DDISABLE_SSE4_A=ON" ]; + "skylake-avx512" = [ "-DDISABLE_SSE4_A=ON" ]; + }.${stdenv.hostPlatform.platform.gcc.arch or "default"}); + + postInstall = '' + wrapProgram $out/bin/g2o_viewer \ + --prefix QT_PLUGIN_PATH : "${qt5.qtbase}/${qt5.qtbase.qtPluginPrefix}" + ''; meta = { description = "A General Framework for Graph Optimization"; diff --git a/pkgs/development/libraries/g2o/remove-compiler-reference.patch b/pkgs/development/libraries/g2o/remove-compiler-reference.patch new file mode 100644 index 00000000000..347c5780240 --- /dev/null +++ b/pkgs/development/libraries/g2o/remove-compiler-reference.patch @@ -0,0 +1,25 @@ +From b9bfed09e4e3c481b7eb36bee1ff4202ccf69dee Mon Sep 17 00:00:00 2001 +From: Ben Wolsieffer <benwolsieffer@gmail.com> +Date: Fri, 17 May 2019 19:05:36 -0400 +Subject: [PATCH] Remove reference to compiler. + +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a3f66dd..bb05bd0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -371,7 +371,7 @@ set(G2O_HAVE_CHOLMOD ${CHOLMOD_FOUND}) + set(G2O_HAVE_CSPARSE ${CSPARSE_FOUND}) + set(G2O_SHARED_LIBS ${BUILD_SHARED_LIBS}) + set(G2O_LGPL_SHARED_LIBS ${BUILD_LGPL_SHARED_LIBS}) +-set(G2O_CXX_COMPILER "${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER}") ++set(G2O_CXX_COMPILER "${CMAKE_CXX_COMPILER_ID} unknown") + + configure_file(config.h.in "${PROJECT_BINARY_DIR}/g2o/config.h") + install(FILES ${PROJECT_BINARY_DIR}/g2o/config.h DESTINATION ${INCLUDES_DESTINATION}/g2o) +-- +2.21.0 + diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index fca567d683d..fa99dbe1d9f 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/development/libraries/gdcm/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, cmake, vtk }: +{ stdenv, fetchurl, cmake, vtk, darwin }: stdenv.mkDerivation rec { - version = "3.0.0"; + version = "3.0.1"; name = "gdcm-${version}"; src = fetchurl { url = "mirror://sourceforge/gdcm/${name}.tar.bz2"; - sha256 = "1rhblnl0q4bl3hmanz4ckv5kzdrzdiqp9xlcqh8df3rfrgk4d81x"; + sha256 = "1n206rr28f9ysd5yns6hc6vxwhwj1ck59p2j1wqyclm60zr84isq"; }; dontUseCmakeBuildDir = true; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; enableParallelBuilding = true; - buildInputs = [ cmake vtk ]; + buildInputs = [ cmake vtk ] ++ stdenv.lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.ApplicationServices darwin.apple_sdk.frameworks.Cocoa ]; propagatedBuildInputs = [ ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/glbinding/default.nix b/pkgs/development/libraries/glbinding/default.nix index 60778df663a..d12b8a7c11d 100644 --- a/pkgs/development/libraries/glbinding/default.nix +++ b/pkgs/development/libraries/glbinding/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "glbinding"; - version = "3.0.2"; + version = "3.1.0"; src = fetchFromGitHub { owner = "cginternals"; repo = pname; rev = "v${version}"; - sha256 = "1lvcps0n0p8gg0p2bkm5aq4b4kv8bvxlaaf4fcham2pgbgzil9d4"; + sha256 = "1avd7ssms11xx7h0cm8h4pfpk55f07f1j1ybykxfgsym2chb2z08"; }; buildInputs = [ cmake libGLU xlibsWrapper ]; diff --git a/pkgs/development/libraries/gnome-sharp/default.nix b/pkgs/development/libraries/gnome-sharp/default.nix index f2393a23dfe..5e525ad46af 100644 --- a/pkgs/development/libraries/gnome-sharp/default.nix +++ b/pkgs/development/libraries/gnome-sharp/default.nix @@ -27,6 +27,8 @@ stdenv.mkDerivation rec { buildInputs = [ gtk2 mono gtk-sharp-2_0 ] ++ (with gnome2; [ libart_lgpl gnome_vfs libgnome libgnomecanvas libgnomeui ]); + patches = [ ./fix-mono-path.patch ]; + preConfigure = '' ./bootstrap-${lib.versions.majorMinor version} ''; diff --git a/pkgs/development/libraries/gnome-sharp/fix-mono-path.patch b/pkgs/development/libraries/gnome-sharp/fix-mono-path.patch new file mode 100644 index 00000000000..706f119c8ba --- /dev/null +++ b/pkgs/development/libraries/gnome-sharp/fix-mono-path.patch @@ -0,0 +1,13 @@ +diff --git a/sample/gconf/Makefile.am b/sample/gconf/Makefile.am +index a0ee802..8260694 100644 +--- a/sample/gconf/Makefile.am ++++ b/sample/gconf/Makefile.am +@@ -22,7 +22,7 @@ sample.exe: $(SCHEMA) $(srcdir)/sample.glade $(FILES) $(ASSEMBLIES) + $(CSC) /out:sample.exe $(FILES) $(REFERENCES) $(RESOURCES) + + Settings.cs: $(SCHEMA) +- MONO_PATH=$(top_builddir)/gconf/GConf/gconf-sharp.dll:${MONO_PATH} $(RUNTIME) $(GCONFDIR)/tools/gconfsharp-schemagen.exe Sample $(SCHEMA) > Settings.cs ++ MONO_PATH=$(top_builddir)/gconf/GConf/:${MONO_PATH} $(RUNTIME) $(GCONFDIR)/tools/gconfsharp-schemagen.exe Sample $(SCHEMA) > Settings.cs + + CLEANFILES = sample.exe Settings.cs + diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index e0a54052c23..1b17f4c800f 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -8,7 +8,7 @@ assert guileBindings -> guile != null; let - version = "3.6.8"; + version = "3.6.9"; # XXX: Gnulib's `test-select' fails on FreeBSD: # http://hydra.nixos.org/build/2962084/nixlog/1/raw . @@ -24,7 +24,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://gnupg/gnutls/v3.6/gnutls-${version}.tar.xz"; - sha256 = "10ry71sy8zbksa905bjryphafcg25gkmfa3pf48ripimar7990da"; + sha256 = "1jqz5s3lv8sa53348cfi9nr5pw5l55n8m40b8msdvv0pb2jzqca3"; }; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; diff --git a/pkgs/development/libraries/google-cloud-cpp/default.nix b/pkgs/development/libraries/google-cloud-cpp/default.nix new file mode 100644 index 00000000000..7dd075e440e --- /dev/null +++ b/pkgs/development/libraries/google-cloud-cpp/default.nix @@ -0,0 +1,65 @@ +{ stdenv, grpc, curl, cmake, pkgconfig, fetchFromGitHub, doxygen, protobuf, crc32c, c-ares, nlohmann_json, fetchurl }: +let + googleapis_rev = "a8ee1416f4c588f2ab92da72e7c1f588c784d3e6"; + googleapis = fetchurl { + name = "${googleapis_rev}.tar.gz"; + url = "https://github.com/googleapis/googleapis/archive/${googleapis_rev}.tar.gz"; + sha256 = "1kxi27r034p7jfldhvgpbn6rqqqddycnja47m6jyjxj4rcmrp2kb"; + }; +in stdenv.mkDerivation rec { + pname = "google-cloud-cpp"; + version = "0.11.0"; + + src = fetchFromGitHub { + owner = "googleapis"; + repo = "google-cloud-cpp"; + rev = "v${version}"; + sha256 = "1w942gzyv01ym1cv2a417x92zxra9s2v3xz5crcv84j919f616f8"; + }; + + buildInputs = [ curl grpc protobuf nlohmann_json crc32c c-ares c-ares.cmake-config ]; + nativeBuildInputs = [ cmake pkgconfig doxygen ]; + + outputs = [ "out" "dev" ]; + + postPatch = '' + NLOHMANN_SHA256=$(sha256sum ${nlohmann_json}/include/nlohmann/json.hpp | cut -f1 -d' ') + sed -e 's,https://github.com/nlohmann/json/releases/download/.*,file://${nlohmann_json}/include/nlohmann/json.hpp"),' \ + -e "s,JSON_SHA256 .*,JSON_SHA256 ''${NLOHMANN_SHA256}," \ + -i cmake/DownloadNlohmannJson.cmake + + sed -e 's,https://github.com/googleapis/googleapis/archive/${googleapis_rev}.tar.gz,file://${googleapis},' \ + -i cmake/external/googleapis.cmake + + # Fixup the library path. It would build a path like /build/external//nix/store/…-foo/lib/foo.so for each library instead of /build/external/lib64/foo.so + sed -e 's,''${CMAKE_INSTALL_LIBDIR},lib64,g' \ + -e 's,;lib64,lib,g' \ + -i cmake/ExternalProjectHelper.cmake + ''; + + preFixup = '' + mv --no-clobber $out/lib64/cmake/* $out/lib/cmake + mv --no-clobber $out/lib64/pkgconfig/* $out/lib/pkgconfig + rmdir $out/lib64/cmake $out/lib64/pkgconfig + find $out/lib64 + + for file in $out/lib/pkgconfig/*; do + sed -e 's,\''${prefix}//,/,g' -i $file + done + ''; + + cmakeFlags = [ + "-DGOOGLE_CLOUD_CPP_BIGTABLE_ENABLE_INSTALL=no" + "-DGOOGLE_CLOUD_CPP_DEPENDENCY_PROVIDER=package" + "-DGOOGLE_CLOUD_CPP_GOOGLEAPIS_PROVIDER=external" + "-DBUILD_SHARED_LIBS:BOOL=ON" + "-DGOOGLE_CLOUD_CPP_INSTALL_RPATH=$(out)/lib" + ]; + + meta = with stdenv.lib; { + license = with licenses; [ asl20 ]; + homepage = https://github.com/googleapis/google-cloud-cpp; + description = "C++ Idiomatic Clients for Google Cloud Platform services"; + maintainers = with maintainers; [ andir ]; + }; +} diff --git a/pkgs/development/libraries/gperftools/default.nix b/pkgs/development/libraries/gperftools/default.nix index 44339c3dfed..bc10c9f9bdd 100644 --- a/pkgs/development/libraries/gperftools/default.nix +++ b/pkgs/development/libraries/gperftools/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libunwind }: stdenv.mkDerivation rec { - name = "gperftools-2.6.3"; + name = "gperftools-2.7"; src = fetchurl { url = "https://github.com/gperftools/gperftools/releases/download/${name}/${name}.tar.gz"; - sha256 = "17zfivp6n00rlqbrx6q6h71y2f815nvlzysff1ihgk4mxpv2yjri"; + sha256 = "1jb30zxmw7h9qxa8yi76rfxj4ssk60rv8n9y41m6pzqfk9lwis0y"; }; buildInputs = stdenv.lib.optional stdenv.isLinux libunwind; diff --git a/pkgs/development/libraries/hunspell/0001-Make-hunspell-look-in-XDG_DATA_DIRS-for-dictionaries.patch b/pkgs/development/libraries/hunspell/0001-Make-hunspell-look-in-XDG_DATA_DIRS-for-dictionaries.patch new file mode 100644 index 00000000000..4607f8b8ee0 --- /dev/null +++ b/pkgs/development/libraries/hunspell/0001-Make-hunspell-look-in-XDG_DATA_DIRS-for-dictionaries.patch @@ -0,0 +1,37 @@ +From 8c67f314de2684d77315eecd99ef091d441f17dd Mon Sep 17 00:00:00 2001 +From: Matthew Bauer <mjbauer95@gmail.com> +Date: Wed, 24 Jul 2019 15:35:18 -0400 +Subject: [PATCH] Make hunspell look in XDG_DATA_DIRS for dictionaries + +Some dictionaries may exist but only show up under XDG_DATA_DIRS. For +instance, $HOME/.local/share/hunspell could contain some dictionaries. + +This patch adds each directory in the hunspell subdir of each +XDG_DATA_DIRS to the lookup path. + +Upstream pr is available at: https://github.com/hunspell/hunspell/pull/637 +--- + src/tools/hunspell.cxx | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/src/tools/hunspell.cxx b/src/tools/hunspell.cxx +index 690e34a..6cd127e 100644 +--- a/src/tools/hunspell.cxx ++++ b/src/tools/hunspell.cxx +@@ -2044,6 +2044,13 @@ int main(int argc, char** argv) { + if (getenv("DICPATH")) { + path_std_str.append(getenv("DICPATH")).append(PATHSEP); + } ++ if (getenv("XDG_DATA_DIRS")) { ++ char* dir = strtok(getenv("XDG_DATA_DIRS"), ":"); ++ while (dir != NULL) { ++ path_std_str.append(dir).append("/hunspell:"); ++ dir = strtok(NULL, ":"); ++ } ++ } + path_std_str.append(LIBDIR).append(PATHSEP); + if (HOME) { + const char * userooodir[] = USEROOODIR; +-- +2.22.0 + diff --git a/pkgs/development/libraries/hunspell/default.nix b/pkgs/development/libraries/hunspell/default.nix index 3728c05e516..18e32585ce2 100644 --- a/pkgs/development/libraries/hunspell/default.nix +++ b/pkgs/development/libraries/hunspell/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses readline ]; nativeBuildInputs = [ autoreconfHook ]; + patches = [ ./0001-Make-hunspell-look-in-XDG_DATA_DIRS-for-dictionaries.patch ]; + postPatch = '' patchShebangs tests ''; diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix index b8de133f502..1c86830f258 100644 --- a/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/pkgs/development/libraries/hunspell/dictionaries.nix @@ -286,10 +286,11 @@ let }; }; -in { +in rec { /* ENGLISH */ + en_US = en-us; en-us = mkDictFromWordlist { shortName = "en-us"; shortDescription = "English (United States)"; @@ -300,6 +301,7 @@ in { }; }; + en_CA = en-ca; en-ca = mkDictFromWordlist { shortName = "en-ca"; shortDescription = "English (Canada)"; @@ -310,6 +312,7 @@ in { }; }; + en_GB-ise = en-gb-ise; en-gb-ise = mkDictFromWordlist { shortName = "en-gb-ise"; shortDescription = "English (United Kingdom, 'ise' ending)"; @@ -320,6 +323,7 @@ in { }; }; + en_GB-ize = en-gb-ize; en-gb-ize = mkDictFromWordlist { shortName = "en-gb-ize"; shortDescription = "English (United Kingdom, 'ize' ending)"; @@ -332,126 +336,147 @@ in { /* SPANISH */ + es_ANY = es-any; es-any = mkDictFromRla { shortName = "es-any"; shortDescription = "Spanish (any variant)"; dictFileName = "es_ANY"; }; + es_AR = es-ar; es-ar = mkDictFromRla { shortName = "es-ar"; shortDescription = "Spanish (Argentina)"; dictFileName = "es_AR"; }; + es_BO = es-bo; es-bo = mkDictFromRla { shortName = "es-bo"; shortDescription = "Spanish (Bolivia)"; dictFileName = "es_BO"; }; + es_CL = es-cl; es-cl = mkDictFromRla { shortName = "es-cl"; shortDescription = "Spanish (Chile)"; dictFileName = "es_CL"; }; + es_CO = es-co; es-co = mkDictFromRla { shortName = "es-co"; shortDescription = "Spanish (Colombia)"; dictFileName = "es_CO"; }; + es_CR = es-cr; es-cr = mkDictFromRla { shortName = "es-cr"; shortDescription = "Spanish (Costra Rica)"; dictFileName = "es_CR"; }; + es_CU = es-cu; es-cu = mkDictFromRla { shortName = "es-cu"; shortDescription = "Spanish (Cuba)"; dictFileName = "es_CU"; }; + es_DO = es-do; es-do = mkDictFromRla { shortName = "es-do"; shortDescription = "Spanish (Dominican Republic)"; dictFileName = "es_DO"; }; + es_EC = es-ec; es-ec = mkDictFromRla { shortName = "es-ec"; shortDescription = "Spanish (Ecuador)"; dictFileName = "es_EC"; }; + es_ES = es-es; es-es = mkDictFromRla { shortName = "es-es"; shortDescription = "Spanish (Spain)"; dictFileName = "es_ES"; }; + es_GT = es-gt; es-gt = mkDictFromRla { shortName = "es-gt"; shortDescription = "Spanish (Guatemala)"; dictFileName = "es_GT"; }; + es_HN = es-hn; es-hn = mkDictFromRla { shortName = "es-hn"; shortDescription = "Spanish (Honduras)"; dictFileName = "es_HN"; }; + es_MX = es-mx; es-mx = mkDictFromRla { shortName = "es-mx"; shortDescription = "Spanish (Mexico)"; dictFileName = "es_MX"; }; + es_NI = es-ni; es-ni = mkDictFromRla { shortName = "es-ni"; shortDescription = "Spanish (Nicaragua)"; dictFileName = "es_NI"; }; + es_PA = es-pa; es-pa = mkDictFromRla { shortName = "es-pa"; shortDescription = "Spanish (Panama)"; dictFileName = "es_PA"; }; + es_PE = es-pe; es-pe = mkDictFromRla { shortName = "es-pe"; shortDescription = "Spanish (Peru)"; dictFileName = "es_PE"; }; + es_PR = es-pr; es-pr = mkDictFromRla { shortName = "es-pr"; shortDescription = "Spanish (Puerto Rico)"; dictFileName = "es_PR"; }; + es_PY = es-py; es-py = mkDictFromRla { shortName = "es-py"; shortDescription = "Spanish (Paraguay)"; dictFileName = "es_PY"; }; + es_SV = es-sv; es-sv = mkDictFromRla { shortName = "es-sv"; shortDescription = "Spanish (El Salvador)"; dictFileName = "es_SV"; }; + es_UY = es-uy; es-uy = mkDictFromRla { shortName = "es-uy"; shortDescription = "Spanish (Uruguay)"; dictFileName = "es_UY"; }; + es_VE = es-ve; es-ve = mkDictFromRla { shortName = "es-ve"; shortDescription = "Spanish (Venezuela)"; @@ -505,6 +530,7 @@ in { /* ITALIAN */ + it_IT = it-it; it-it = mkDictFromLinguistico rec { shortName = "it-it"; dictFileName = "it_IT"; @@ -517,6 +543,7 @@ in { /* BASQUE */ + eu_ES = eu-es; eu-es = mkDictFromXuxen { shortName = "eu-es"; dictFileName = "eu_ES"; @@ -549,6 +576,7 @@ in { /* HUNGARIAN */ + hu_HU = hu-hu; hu-hu = mkDictFromLibreOffice { shortName = "hu-hu"; dictFileName = "hu_HU"; @@ -557,7 +585,8 @@ in { }; /* SWEDISH */ - + + sv_SE = sv-se; sv-se = mkDictFromDSSO rec { shortName = "sv-se"; dictFileName = "sv_SE"; @@ -565,26 +594,30 @@ in { }; # Finlandian Swedish (hello Linus Torvalds) + sv_FI = sv-fi; sv-fi = mkDictFromDSSO rec { shortName = "sv-fi"; dictFileName = "sv_FI"; shortDescription = "Swedish (Finland)"; }; - + /* GERMAN */ + de_DE = de-de; de-de = mkDictFromJ3e { shortName = "de-de"; shortDescription = "German (Germany)"; dictFileName = "de_DE"; }; + de_AT = de-at; de-at = mkDictFromJ3e { shortName = "de-at"; shortDescription = "German (Austria)"; dictFileName = "de_AT"; }; + de_CH = de-ch; de-ch = mkDictFromJ3e { shortName = "de-ch"; shortDescription = "German (Switzerland)"; @@ -593,6 +626,7 @@ in { /* UKRAINIAN */ + uk_UA = uk-ua; uk-ua = mkDict rec { name = "hunspell-dict-uk-ua-${version}"; version = "4.2.5"; diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix index 37d648bdf76..1212d3817d4 100644 --- a/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/pkgs/development/libraries/intel-gmmlib/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "intel-gmmlib-${version}"; - version = "19.2.1"; + version = "19.2.3"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; rev = name; - sha256 = "174bpkmr20ng9h9xf9fy85lj3pw6ysmbhcvhjfmj30xg3hs2ar3k"; + sha256 = "0hki53czv1na7h5b06fcwkd8bhn690ywg6dwjfs3x9fa4g48kqjb"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/itk/default.nix b/pkgs/development/libraries/itk/default.nix index 6e393ba02ce..a459bd82755 100644 --- a/pkgs/development/libraries/itk/default.nix +++ b/pkgs/development/libraries/itk/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, cmake, libX11, libuuid, xz, vtk }: +{ stdenv, fetchurl, cmake, libX11, libuuid, xz, vtk, darwin }: stdenv.mkDerivation rec { - name = "itk-4.13.2"; + name = "itk-5.0.0"; src = fetchurl { - url = mirror://sourceforge/itk/InsightToolkit-4.13.2.tar.xz; - sha256 = "19cgfpd63gqrvc3m27m394gy2d7w79g5y6lvznb5qqr49lihbgns"; + url = mirror://sourceforge/itk/InsightToolkit-5.0.0.tar.xz; + sha256 = "0bs63mk4q8jmx38f031jy5w5n9yy5ng9x8ijwinvjyvas8cichqi"; }; cmakeFlags = [ @@ -21,13 +21,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ cmake xz ]; - buildInputs = [ libX11 libuuid vtk ]; + buildInputs = [ libX11 libuuid vtk ] ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; meta = { description = "Insight Segmentation and Registration Toolkit"; homepage = http://www.itk.org/; license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/development/libraries/kde-frameworks/ktexteditor.nix b/pkgs/development/libraries/kde-frameworks/ktexteditor.nix index c633aee30a1..98f9b3f82ca 100644 --- a/pkgs/development/libraries/kde-frameworks/ktexteditor.nix +++ b/pkgs/development/libraries/kde-frameworks/ktexteditor.nix @@ -2,7 +2,8 @@ mkDerivation, lib, extra-cmake-modules, perl, karchive, kconfig, kguiaddons, ki18n, kiconthemes, kio, kparts, libgit2, - qtscript, qtxmlpatterns, sonnet, syntax-highlighting, qtquickcontrols + qtscript, qtxmlpatterns, sonnet, syntax-highlighting, qtquickcontrols, + editorconfig-core-c }: mkDerivation { @@ -12,6 +13,7 @@ mkDerivation { buildInputs = [ karchive kconfig kguiaddons ki18n kiconthemes kio libgit2 qtscript qtxmlpatterns sonnet syntax-highlighting qtquickcontrols + editorconfig-core-c ]; propagatedBuildInputs = [ kparts ]; } diff --git a/pkgs/development/libraries/libetpan/default.nix b/pkgs/development/libraries/libetpan/default.nix index b09c2dd0f47..6756a8dbc56 100644 --- a/pkgs/development/libraries/libetpan/default.nix +++ b/pkgs/development/libraries/libetpan/default.nix @@ -1,17 +1,24 @@ -{ autoconf, automake, fetchgit, libtool, stdenv, openssl }: +{ stdenv, fetchFromGitHub +, autoconf +, automake +, libtool +, openssl +}: -let version = "1.8"; in +stdenv.mkDerivation rec { + pname = "libetpan"; + version = "1.9.3"; -stdenv.mkDerivation { - name = "libetpan-${version}"; - - src = fetchgit { - url = "git://github.com/dinhviethoa/libetpan"; - rev = "refs/tags/" + version; - sha256 = "09xqy1n18qn63x7idfrpwm59lfkvb1p5vxkyksywvy4f6mn4pyxk"; + src = fetchFromGitHub { + owner = "dinhviethoa"; + repo = "libetpan"; + rev = version; + sha256 = "19g4qskg71jv7sxfxsdkjmrxk9mk5kf9b6fhw06g6wvm3205n95f"; }; - buildInputs = [ autoconf automake libtool openssl ]; + nativeBuildInputs = [ libtool autoconf automake ]; + + buildInputs = [ openssl ]; configureScript = "./autogen.sh"; diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix index 2a87994db5e..a8384de5552 100644 --- a/pkgs/development/libraries/libfilezilla/default.nix +++ b/pkgs/development/libraries/libfilezilla/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "libfilezilla"; - version = "0.17.1"; + version = "0.18.0"; src = fetchurl { url = "https://download.filezilla-project.org/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "1cnkcl9vif5lz1yx813qrphlpc6gvmzxdmkbd17kh5jqiqdi9vyk"; + sha256 = "0g4zbyvnxs4db3l5pqazyk42ahvwdqfz2222dbkl8zygblxncyjp"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix index 8616a014675..cbedd97b2ee 100644 --- a/pkgs/development/libraries/libgphoto2/default.nix +++ b/pkgs/development/libraries/libgphoto2/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { owner = "gphoto"; repo = "libgphoto2"; rev = "${meta.tag}"; - sha256 = "0pbfg89817qkb35mmajsw2iz6j9nhkkj67m419f8x8yxpqkaa0wb"; + sha256 = "1sc2ycx11khf0qzp1cqxxx1qymv6bjfbkx3vvbwz6wnbyvsigxz2"; }; patches = []; @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { MTP, and other vendor specific protocols for controlling and transferring data from digital cameras. ''; - version = "2.5.17"; - tag = "libgphoto2-2_5_17-release"; + version = "2.5.23"; + tag = "libgphoto2-2_5_23-release"; # 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/libimagequant/default.nix b/pkgs/development/libraries/libimagequant/default.nix index 83afd26bf1d..9c2dd920c9f 100644 --- a/pkgs/development/libraries/libimagequant/default.nix +++ b/pkgs/development/libraries/libimagequant/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libimagequant"; - version = "2.12.3"; + version = "2.12.5"; src = fetchFromGitHub { owner = "ImageOptim"; repo = pname; rev = version; - sha256 = "0qsfq1kv1m5jzn9v9iz0bac66k4clcis1c9877qabnwzwmwma5v0"; + sha256 = "0cp68w04ja5pv77ssfafsn958w9hh9zb8crrlb5j3gsrcmdc032k"; }; preConfigure = '' diff --git a/pkgs/development/libraries/libimobiledevice/default.nix b/pkgs/development/libraries/libimobiledevice/default.nix index 83a500c1380..6464e4e5820 100644 --- a/pkgs/development/libraries/libimobiledevice/default.nix +++ b/pkgs/development/libraries/libimobiledevice/default.nix @@ -34,7 +34,6 @@ stdenv.mkDerivation rec { preConfigure = "NOCONFIGURE=1 ./autogen.sh"; configureFlags = [ - "--disable-static" "--disable-openssl" "--without-cython" ]; diff --git a/pkgs/development/libraries/libirecovery/default.nix b/pkgs/development/libraries/libirecovery/default.nix new file mode 100644 index 00000000000..32a2971b3e3 --- /dev/null +++ b/pkgs/development/libraries/libirecovery/default.nix @@ -0,0 +1,54 @@ +{ stdenv, fetchFromGitHub, automake, autoconf, libtool, pkgconfig +, libusb +, readline +}: + +stdenv.mkDerivation rec { + pname = "libirecovery"; + version = "2019-01-28"; + + src = fetchFromGitHub { + owner = "libimobiledevice"; + repo = pname; + rev = "5da2a0d7d60f79d93c283964888c6fbbc17be1a3"; + sha256 = "0fqmr1h4b3qn608dn606y7aqv3bsm949gx72b5d6433xlw9b23n8"; + }; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ + autoconf + automake + libtool + pkgconfig + ]; + + buildInputs = [ + libusb + readline + ]; + + preConfigure = "NOCONFIGURE=1 ./autogen.sh"; + + # Packager note: Not clear whether this needs a NixOS configuration, + # as only the `idevicerestore` binary was tested so far (which worked + # without further configuration). + configureFlags = [ + "--with-udevrulesdir=${placeholder ''out''}/lib/udev/rules.d" + ''--with-udevrule="OWNER=\"root\", GROUP=\"myusergroup\", MODE=\"0660\""'' + ]; + + meta = with stdenv.lib; { + homepage = https://github.com/libimobiledevice/libirecovery; + description = "Library and utility to talk to iBoot/iBSS via USB on Mac OS X, Windows, and Linux"; + longDescription = '' + libirecovery is a cross-platform library which implements communication to + iBoot/iBSS found on Apple's iOS devices via USB. A command-line utility is also + provided. + ''; + license = licenses.lgpl21; + # Upstream description says it works on more platforms, but packager hasn't tried that yet + platforms = platforms.linux; + maintainers = with maintainers; [ nh2 ]; + }; +} diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index 371d7b838d4..191c375f3be 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -18,7 +18,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake nasm ]; - cmakeFlags = [ "-DCMAKE_INSTALL_BINDIR=${placeholder "bin"}/bin" "-DENABLE_STATIC=0" ]; + cmakeFlags = [ + "-DENABLE_STATIC=0" + ]; doInstallCheck = true; installCheckTarget = "test"; diff --git a/pkgs/development/libraries/liblastfm/default.nix b/pkgs/development/libraries/liblastfm/default.nix index b7d90100837..767485a7515 100644 --- a/pkgs/development/libraries/liblastfm/default.nix +++ b/pkgs/development/libraries/liblastfm/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, qt4, pkgconfig, libsamplerate, fftwSinglePrec, which, cmake , darwin }: -let version = "1.0.9"; in +let version = "1.1.0"; in stdenv.mkDerivation rec { name = "liblastfm-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/lastfm/liblastfm/tarball/${version}"; name = "${name}.tar.gz"; - sha256 = "09qiaxsxw6g2m7mvkffpfsi5wis8nl1x4lgnk0sa30859z54iw53"; + sha256 = "1j34xc30vg7sfszm2jx9mlz9hy7p1l929fka9wnfcpbib8gfi43x"; }; prefixKey = "--prefix "; diff --git a/pkgs/development/libraries/liblcf/default.nix b/pkgs/development/libraries/liblcf/default.nix index 313780a9f0f..9870e024687 100644 --- a/pkgs/development/libraries/liblcf/default.nix +++ b/pkgs/development/libraries/liblcf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "liblcf-${version}"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "EasyRPG"; repo = "liblcf"; rev = version; - sha256 = "1nhwwb32c3x0y82s0w93k0xz8h6xsd0sb4r1a0my8fd8p5rsnwbi"; + sha256 = "18kx9h004bncyi0hbj6vrc7f4k8l1rwp96cwncv3xm0lwspj0vyl"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/development/libraries/liblockfile/default.nix b/pkgs/development/libraries/liblockfile/default.nix index 46ea9fe6ee5..aba751bae5c 100644 --- a/pkgs/development/libraries/liblockfile/default.nix +++ b/pkgs/development/libraries/liblockfile/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { _name = "liblockfile"; - version = "1.14"; + version = "1.15"; name = "${_name}-${version}"; src = fetchurl { url = "mirror://debian/pool/main/libl/${_name}/${_name}_${version}.orig.tar.gz"; - sha256 = "0q6hn78fnzr6lhisg85a948rmpsd9rx67skzx3vh9hnbx2ix8h5b"; + sha256 = "04ml9isvdl72fbr1825x7jb680xp8aprdq4pag32ahyjqk909cmh"; }; preConfigure = '' diff --git a/pkgs/development/libraries/libmodule/default.nix b/pkgs/development/libraries/libmodule/default.nix new file mode 100644 index 00000000000..bcd20c3b407 --- /dev/null +++ b/pkgs/development/libraries/libmodule/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub +, cmake, pkgconfig }: + +stdenv.mkDerivation rec { + pname = "libmodule"; + version = "4.2.0"; + + src = fetchFromGitHub { + owner = "FedeDP"; + repo = "libmodule"; + rev = version; + sha256 = "1qn54pysdm0q7v1gnisd43i5i4ylf8s8an77jk6jd8qimysv08mx"; + }; + + nativeBuildInputs = [ + cmake + pkgconfig + ]; + + meta = with stdenv.lib; { + description = "C simple and elegant implementation of an actor library"; + homepage = https://github.com/FedeDP/libmodule; + platforms = platforms.linux; + license = licenses.mit; + maintainers = with maintainers; [ + eadwu + ]; + }; +} diff --git a/pkgs/development/libraries/libmodulemd/1.nix b/pkgs/development/libraries/libmodulemd/1.nix new file mode 100644 index 00000000000..174296375e0 --- /dev/null +++ b/pkgs/development/libraries/libmodulemd/1.nix @@ -0,0 +1,21 @@ +{ libmodulemd, fetchurl }: + +libmodulemd.overrideAttrs(old: rec { + name = "libmodulemd-${version}"; + version = "1.8.15"; + + # Removes py output since there's no overrides here + outputs = [ "out" "devdoc" ]; + + patches = [ + # Checks for glib docs in glib's prefix + # but they're installed to another + ./dont-check-docs.patch + ]; + + src = fetchurl { + url = "https://github.com/fedora-modularity/libmodulemd/releases/download/${name}/modulemd-${version}.tar.xz"; + sha256 = "0gz8p3qzji3cx0r57sy3gn4dhigg4k7pcxj3lmjcjn13vxh5rm7z"; + }; + +}) diff --git a/pkgs/development/libraries/libmodulemd/default.nix b/pkgs/development/libraries/libmodulemd/default.nix new file mode 100644 index 00000000000..ba77c7806b5 --- /dev/null +++ b/pkgs/development/libraries/libmodulemd/default.nix @@ -0,0 +1,59 @@ +{ stdenv +, fetchFromGitHub +, pkgconfig +, meson +, ninja +, gobject-introspection +, python3 +, libyaml +, gtk-doc +, docbook_xsl +, docbook_xml_dtd_412 +, glib +}: + +stdenv.mkDerivation rec { + pname = "libmodulemd"; + version = "2.6.0"; + + outputs = [ "out" "devdoc" "py" ]; + + src = fetchFromGitHub { + owner = "fedora-modularity"; + repo = pname; + rev = "${pname}-${version}"; + sha256 = "0gizfmzs6jrzb29lwcimm5dq3027935xbzwgkbvbp67zcmjd3y5i"; + }; + + patches = [ + ./pygobject-dir.patch + ]; + + nativeBuildInputs = [ + pkgconfig + meson + ninja + gtk-doc + docbook_xsl + docbook_xml_dtd_412 + gobject-introspection + ]; + + buildInputs = [ + libyaml + glib + ]; + + mesonFlags = [ + "-Ddeveloper_build=false" + "-Dpygobject_override_dir=${placeholder "py"}/${python3.sitePackages}/gi/overrides" + ]; + + meta = with stdenv.lib; { + description = "C Library for manipulating module metadata files"; + homepage = "https://github.com/fedora-modularity/libmodulemd"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libmodulemd/dont-check-docs.patch b/pkgs/development/libraries/libmodulemd/dont-check-docs.patch new file mode 100644 index 00000000000..38ad5683692 --- /dev/null +++ b/pkgs/development/libraries/libmodulemd/dont-check-docs.patch @@ -0,0 +1,29 @@ +diff --git a/meson.build b/meson.build +index 155c9e7..9125372 100644 +--- a/meson.build ++++ b/meson.build +@@ -60,15 +60,15 @@ sh = find_program('sh') + sed = find_program('sed') + test = find_program('test') + +-ret = run_command ([test, '-e', join_paths(glib_docpath, 'glib/index.html')]) +-if ret.returncode() != 0 +- error('Missing documentation for GLib.') +-endif +- +-ret = run_command ([test, '-e', join_paths(glib_docpath, 'gobject/index.html')]) +-if ret.returncode() != 0 +- error('Missing documentation for GObject.') +-endif ++# ret = run_command ([test, '-e', join_paths(glib_docpath, 'glib/index.html')]) ++# if ret.returncode() != 0 ++# error('Missing documentation for GLib.') ++# endif ++ ++# ret = run_command ([test, '-e', join_paths(glib_docpath, 'gobject/index.html')]) ++# if ret.returncode() != 0 ++# error('Missing documentation for GObject.') ++# endif + + python_name = get_option('python_name') + diff --git a/pkgs/development/libraries/libmodulemd/pygobject-dir.patch b/pkgs/development/libraries/libmodulemd/pygobject-dir.patch new file mode 100644 index 00000000000..a367872eec6 --- /dev/null +++ b/pkgs/development/libraries/libmodulemd/pygobject-dir.patch @@ -0,0 +1,45 @@ +diff --git a/bindings/python/meson.build b/bindings/python/meson.build +index 4358b79..61fd5a5 100644 +--- a/bindings/python/meson.build ++++ b/bindings/python/meson.build +@@ -1,3 +1,5 @@ ++pygobject_override_dir = get_option('pygobject_override_dir') ++ + get_overridedir = ''' + import os + import sysconfig +@@ -21,7 +23,7 @@ print(overridedir) + ''' + + # Python 3 +-if (get_option('with_py3_overrides')) ++if (get_option('with_py3_overrides')) and pygobject_override_dir == '' + ret = run_command([python3, '-c', get_overridedir]) + + if ret.returncode() != 0 +@@ -34,7 +36,7 @@ if (get_option('with_py3_overrides')) + endif + + # Python 2 +-if (get_option('with_py2_overrides')) ++if (get_option('with_py2_overrides')) and pygobject_override_dir == '' + ret2 = run_command([python2, '-c', get_overridedir]) + + if ret2.returncode() != 0 +@@ -45,3 +47,7 @@ if (get_option('with_py2_overrides')) + + install_data('gi/overrides/Modulemd.py', install_dir: pygobject2_override_dir) + endif ++ ++if pygobject_override_dir != '' ++ install_data('gi/overrides/Modulemd.py', install_dir: pygobject_override_dir) ++endif +diff --git a/meson_options.txt b/meson_options.txt +index 147419f..9071a04 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -18,3 +18,4 @@ option('skip_introspection', type : 'boolean', value : false) + option('python_name', type : 'string') + option('with_py2_overrides', type : 'boolean', value : false) + option('with_py3_overrides', type : 'boolean', value : true) ++option('pygobject_override_dir', type : 'string', value : '', description: 'Path to pygobject overrides directory') diff --git a/pkgs/development/libraries/libpinyin/default.nix b/pkgs/development/libraries/libpinyin/default.nix index 26694eb3777..bf516b33d02 100644 --- a/pkgs/development/libraries/libpinyin/default.nix +++ b/pkgs/development/libraries/libpinyin/default.nix @@ -1,31 +1,36 @@ -{ stdenv, fetchurl, fetchFromGitHub, autoreconfHook, glib, db, pkgconfig }: +{ stdenv, fetchurl, fetchFromGitHub +, autoreconfHook +, glib +, db +, pkgconfig +}: let modelData = fetchurl { - url = "mirror://sourceforge/libpinyin/models/model14.text.tar.gz"; - sha256 = "0qqk30nflj07zjhs231c95ln4yj4ipzwxxiwrxazrg4hb8bhypqq"; + url = "mirror://sourceforge/libpinyin/models/model17.text.tar.gz"; + sha256 = "1kb2nswpsqlk2qm5jr7vqcp97f2dx7nvpk24lxjs1g12n252f5z0"; }; in stdenv.mkDerivation rec { name = "libpinyin-${version}"; - version = "2.1.91"; - - nativeBuildInputs = [ autoreconfHook glib db pkgconfig ]; - - postUnpack = '' - tar -xzf ${modelData} -C $sourceRoot/data - ''; + version = "2.3.0"; src = fetchFromGitHub { owner = "libpinyin"; repo = "libpinyin"; rev = version; - sha256 = "0jbvn65p3zh0573hh27aasd3qly5anyfi8jnps2dxi0my09wbrq3"; + sha256 = "14fkpp16s5k0pbw5wwd24pqr0qbdjgbl90n9aqwx72m03n7an40l"; }; + postUnpack = '' + tar -xzf ${modelData} -C $sourceRoot/data + ''; + + nativeBuildInputs = [ autoreconfHook glib db pkgconfig ]; + meta = with stdenv.lib; { description = "Library for intelligent sentence-based Chinese pinyin input method"; - homepage = https://sourceforge.net/projects/libpinyin; + homepage = "https://sourceforge.net/projects/libpinyin"; license = licenses.gpl2; maintainers = with maintainers; [ ericsagnes ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix index 49490e1f785..1b73af7037b 100644 --- a/pkgs/development/libraries/libqalculate/default.nix +++ b/pkgs/development/libraries/libqalculate/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libqalculate"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "libqalculate"; rev = "v${version}"; - sha256 = "0f82jss3kjxsk8znvrg1vfh756nnc15sbzr34ww1dvvrxipi7sns"; + sha256 = "1qgsngi9z1sr6pzgcq6kgng62arpc5xn2ai1ks69myzzmgwk8adp"; }; outputs = [ "out" "dev" "doc" ]; diff --git a/pkgs/development/libraries/libqglviewer/default.nix b/pkgs/development/libraries/libqglviewer/default.nix index e68c5052beb..34b396a7102 100644 --- a/pkgs/development/libraries/libqglviewer/default.nix +++ b/pkgs/development/libraries/libqglviewer/default.nix @@ -1,25 +1,25 @@ -{ stdenv, fetchurl, qt4, qmake4Hook, AGL }: +{ stdenv, fetchurl, qmake, qtbase, libGLU, AGL }: stdenv.mkDerivation rec { - name = "libqglviewer-2.6.3"; - version = "2.6.3"; + pname = "libqglviewer"; + version = "2.7.1"; src = fetchurl { url = "http://www.libqglviewer.com/src/libQGLViewer-${version}.tar.gz"; - sha256 = "00jdkyk4wg1356c3ar6nk3hyp494ya3yvshq9m57kfmqpn3inqdy"; + sha256 = "08f10yk22kjdsvrqhd063gqa8nxnl749c20mwhaxij4f7rzdkixz"; }; - buildInputs = [ qt4 qmake4Hook ] + nativeBuildInputs = [ qmake ]; + buildInputs = [ qtbase libGLU ] ++ stdenv.lib.optional stdenv.isDarwin AGL; - postPatch = - '' - cd QGLViewer - ''; + postPatch = '' + cd QGLViewer + ''; meta = with stdenv.lib; { description = "C++ library based on Qt that eases the creation of OpenGL 3D viewers"; - homepage = http://libqglviewer.com/; + homepage = "http://libqglviewer.com"; license = licenses.gpl2; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix index db8dfcf2eec..392c5052e07 100644 --- a/pkgs/development/libraries/librealsense/default.nix +++ b/pkgs/development/libraries/librealsense/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "librealsense-${version}"; - version = "2.21.0"; + version = "2.23.0"; src = fetchFromGitHub { owner = "IntelRealSense"; repo = "librealsense"; rev = "v${version}"; - sha256 = "0fg4js390gj9lhyh9hmr7k3lhg5q1r47skyvziv9dmbj9dqm1ll7"; + sha256 = "055fvfmkfi71bk7yxa527awq5qrq4dni5xhlaldhak2vlis8glwk"; }; buildInputs = [ diff --git a/pkgs/development/libraries/librelp/default.nix b/pkgs/development/libraries/librelp/default.nix index 82a71be5210..bcc3e16dae8 100644 --- a/pkgs/development/libraries/librelp/default.nix +++ b/pkgs/development/libraries/librelp/default.nix @@ -1,19 +1,28 @@ -{ stdenv, fetchurl, pkgconfig, gnutls, zlib }: +{ stdenv, fetchFromGitHub +, autoreconfHook +, gnutls +, openssl +, pkgconfig +, zlib +}: stdenv.mkDerivation rec { - name = "librelp-1.3.0"; + pname = "librelp"; + version = "1.4.0"; - src = fetchurl { - url = "http://download.rsyslog.com/librelp/${name}.tar.gz"; - sha256 = "1xg99ndn65984mrh30qvys5npc73ag4348whshghrcj9azya494z"; + src = fetchFromGitHub { + owner = "rsyslog"; + repo = "librelp"; + rev = "v${version}"; + sha256 = "1q0k8zm7p6wpkri419kkpz734lp1hnxfqx1aa3xys4pj7zgx9jck"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gnutls zlib ]; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; + buildInputs = [ gnutls zlib openssl ]; meta = with stdenv.lib; { - homepage = https://www.librelp.com/; description = "A reliable logging library"; + homepage = "https://www.librelp.com/"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/libsystemtap/default.nix b/pkgs/development/libraries/libsystemtap/default.nix new file mode 100644 index 00000000000..ecfa3377c99 --- /dev/null +++ b/pkgs/development/libraries/libsystemtap/default.nix @@ -0,0 +1,30 @@ +{stdenv, fetchgit, gettext, python, elfutils}: + +stdenv.mkDerivation { + pname = "libsystemtap"; + version = "3.2"; + + src = fetchgit { + url = git://sourceware.org/git/systemtap.git; + rev = "4051c70c9318c837981384cbb23f3e9eb1bd0892"; + sha256 = "0sd8n3j3rishks3gyqj2jyqhps7hmlfjyz8i0w8v98cczhhh04rq"; + fetchSubmodules = false; + }; + + dontBuild = true; + + nativeBuildInputs = [ gettext python elfutils ]; + + installPhase = '' + mkdir -p $out/include + cp -r includes/* $out/include/ + ''; + + meta = with stdenv.lib; { + description = "Statically defined probes development files"; + homepage = "https://sourceware.org/systemtap/"; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = [ stdenv.lib.maintainers.farlion ]; + }; +} diff --git a/pkgs/development/libraries/libuchardet/default.nix b/pkgs/development/libraries/libuchardet/default.nix index 5aa26a749e4..6bfb694a41b 100644 --- a/pkgs/development/libraries/libuchardet/default.nix +++ b/pkgs/development/libraries/libuchardet/default.nix @@ -15,9 +15,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests - # TODO: move the following to CMake setup hook - "-DCMAKE_INSTALL_BINDIR=${placeholder "bin"}/bin" - "-DCMAKE_INSTALL_MANDIR=${placeholder "man"}/share/man" ]; doCheck = true; diff --git a/pkgs/development/libraries/libversion/default.nix b/pkgs/development/libraries/libversion/default.nix index 0ace54582eb..3c7ed207703 100644 --- a/pkgs/development/libraries/libversion/default.nix +++ b/pkgs/development/libraries/libversion/default.nix @@ -1,10 +1,8 @@ { stdenv, fetchFromGitHub, cmake }: -let - version = "2.8.1"; -in -stdenv.mkDerivation { - name = "libversion-${version}"; +stdenv.mkDerivation rec { + pname = "libversion"; + version = "2.9.0"; src = fetchFromGitHub { owner = "repology"; diff --git a/pkgs/development/libraries/libwnck/3.x.nix b/pkgs/development/libraries/libwnck/3.x.nix index 9c35d337350..29692c41c93 100644 --- a/pkgs/development/libraries/libwnck/3.x.nix +++ b/pkgs/development/libraries/libwnck/3.x.nix @@ -1,31 +1,78 @@ -{ stdenv, fetchurl, pkgconfig, libX11, gtk3, intltool, gobject-introspection, gnome3 }: +{ stdenv +, fetchurl +, fetchpatch +, meson +, ninja +, pkgconfig +, gtk-doc +, docbook_xsl +, docbook_xml_dtd_412 +, libX11 +, glib +, gtk3 +, pango +, cairo +, libXres +, libstartup_notification +, gettext +, gobject-introspection +, gnome3 +}: -let +stdenv.mkDerivation rec{ pname = "libwnck"; - version = "3.30.0"; -in stdenv.mkDerivation rec{ - name = "${pname}-${version}"; + version = "3.32.0"; + + outputs = [ "out" "dev" "devdoc" ]; + outputBin = "dev"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0f9lvhm3w25046dqq8xyg7nzggxpmdriwrb661nng05a8qk0svdc"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1jp3p1lnwnwi6fxl2rz3166cmwzwy9vqz896anpwc3wdy9f875cm"; }; - outputs = [ "out" "dev" "devdoc" ]; - outputBin = "dev"; + patches = [ + # https://gitlab.gnome.org/GNOME/libwnck/issues/139 + (fetchpatch { + url = https://gitlab.gnome.org/GNOME/libwnck/commit/0d9ff7db63af568feef8e8c566e249058ccfcb4e.patch; + sha256 = "18f78aayq9jma54v2qz3rm2clmz1cfq5bngxw8p4zba7hplyqsl9"; + }) + # https://gitlab.gnome.org/GNOME/libwnck/merge_requests/12 + ./fix-pc-file.patch + ]; + + nativeBuildInputs = [ + meson + ninja + pkgconfig + gettext + gobject-introspection + gtk-doc + docbook_xsl + docbook_xml_dtd_412 + ]; - configureFlags = [ "--enable-introspection" ]; + buildInputs = [ + libX11 + libstartup_notification + pango + cairo + libXres + ]; - nativeBuildInputs = [ pkgconfig intltool gobject-introspection ]; - propagatedBuildInputs = [ libX11 gtk3 ]; + propagatedBuildInputs = [ + glib + gtk3 + ]; - PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "dev"}/share/gir-1.0"; - PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0"; + mesonFlags = [ + "-Dgtk_doc=true" + ]; passthru = { updateScript = gnome3.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "${pname}${stdenv.lib.versions.major version}"; }; }; diff --git a/pkgs/development/libraries/libwnck/fix-pc-file.patch b/pkgs/development/libraries/libwnck/fix-pc-file.patch new file mode 100644 index 00000000000..42017a993b5 --- /dev/null +++ b/pkgs/development/libraries/libwnck/fix-pc-file.patch @@ -0,0 +1,24 @@ +diff --git a/meson.build b/meson.build +index 28799d8..047e523 100644 +--- a/meson.build ++++ b/meson.build +@@ -72,11 +72,15 @@ + pc_conf = configuration_data() + pc_conf.set('prefix', get_option('prefix')) + pc_conf.set('exec_prefix', '${prefix}') +-pc_conf.set('libdir', '${exec_prefix}/' + get_option('libdir')) +-pc_conf.set('includedir', '${prefix}/' + get_option('includedir')) +-pc_conf.set('STARTUP_NOTIFICATION_PACKAGE', STARTUP_NOTIFICATION_PACKAGE) ++pc_conf.set('libdir', '${exec_prefix}' / get_option('libdir')) ++pc_conf.set('includedir', '${prefix}' / get_option('includedir')) ++if conf.has('HAVE_' + STARTUP_NOTIFICATION_PACKAGE.to_upper().underscorify()) ++ pc_conf.set('STARTUP_NOTIFICATION_PACKAGE', STARTUP_NOTIFICATION_PACKAGE) ++endif + pc_conf.set('X11_PACKAGE', X11_PACKAGE) +-pc_conf.set('XRES_PACKAGE', XRES_PACKAGE) ++if conf.has('HAVE_' + XRES_PACKAGE.to_upper().underscorify()) ++ pc_conf.set('XRES_PACKAGE', XRES_PACKAGE) ++endif + pc_conf.set('VERSION', meson.project_version()) + + foreach pc: [PACKAGE_NAME, PACKAGE_NAME + '-uninstalled'] diff --git a/pkgs/development/libraries/live555/default.nix b/pkgs/development/libraries/live555/default.nix index bf5b7bb1d0d..268476e079d 100644 --- a/pkgs/development/libraries/live555/default.nix +++ b/pkgs/development/libraries/live555/default.nix @@ -3,14 +3,14 @@ # Based on https://projects.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD stdenv.mkDerivation rec { name = "live555-${version}"; - version = "2019.05.29"; + version = "2019.06.28"; src = fetchurl { # the upstream doesn't provide a stable URL urls = [ "mirror://sourceforge/slackbuildsdirectlinks/live.${version}.tar.gz" "https://download.videolan.org/contrib/live555/live.${version}.tar.gz" ]; - sha256 = "08i63jr8ihn1xiq5z5n3yls3yz6li5sg0s454l56p5bcvbrw81my"; + sha256 = "0pn5zhid9z8dsmwkhp2lvy84j5ahjskq1a8srdhd06hvh2w8dh2r"; }; postPatch = '' diff --git a/pkgs/development/libraries/lmdb/default.nix b/pkgs/development/libraries/lmdb/default.nix index 9d57d472182..690a42cfb30 100644 --- a/pkgs/development/libraries/lmdb/default.nix +++ b/pkgs/development/libraries/lmdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "lmdb-${version}"; - version = "0.9.23"; + version = "0.9.24"; src = fetchFromGitHub { owner = "LMDB"; repo = "lmdb"; rev = "LMDB_${version}"; - sha256 = "0ag7l5180ajvm73y59m7sn3p52xm8m972d08cshxhpwgwa4v35k6"; + sha256 = "088q6m8fvr12w43s461h7cvpg5hj8csaqj6n9pci150dz7bk5lxm"; }; postUnpack = "sourceRoot=\${sourceRoot}/libraries/liblmdb"; diff --git a/pkgs/development/libraries/matio/default.nix b/pkgs/development/libraries/matio/default.nix index 83673022835..9f8f34e0a80 100644 --- a/pkgs/development/libraries/matio/default.nix +++ b/pkgs/development/libraries/matio/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "matio-1.5.16"; + name = "matio-1.5.17"; src = fetchurl { url = "mirror://sourceforge/matio/${name}.tar.gz"; - sha256 = "0i2g7jqbb4j8xlf1ly7gfpw5zyxmr245qf57v6w0jmwx4rfkvfj7"; + sha256 = "00644612zhn53j25vj50q73kmjcrsns2lnmy99y2kavhsckmaiay"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/nuspell/default.nix b/pkgs/development/libraries/nuspell/default.nix index b667dea8d49..91318c802d8 100644 --- a/pkgs/development/libraries/nuspell/default.nix +++ b/pkgs/development/libraries/nuspell/default.nix @@ -1,19 +1,21 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, icu, catch2 }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, icu, catch2, ronn }: stdenv.mkDerivation rec { name = "nuspell-${version}"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "nuspell"; repo = "nuspell"; rev = "v${version}"; - sha256 = "17khkb1sxn1p6rfql72l7a4lxafbxj0dwi95hsmyi6wajvfrg9sy"; + sha256 = "0n5cajrp1fhk8p54ch3akkd9nl8b9c6wwf25980dhagcdys3vab3"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig ronn ]; buildInputs = [ boost icu ]; + outputs = [ "out" "lib" "dev" "man" ]; + enableParallelBuilding = true; postPatch = '' @@ -21,6 +23,10 @@ stdenv.mkDerivation rec { ln -sf ${catch2.src} external/Catch2 ''; + postInstall = '' + rm -rf $out/share/doc + ''; + meta = with stdenv.lib; { description = "Free and open source C++ spell checking library"; homepage = "https://nuspell.github.io/"; diff --git a/pkgs/development/libraries/openscenegraph/3.4.0.nix b/pkgs/development/libraries/openscenegraph/3.4.0.nix deleted file mode 100644 index 8d083904189..00000000000 --- a/pkgs/development/libraries/openscenegraph/3.4.0.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, lib, fetchurl, cmake, pkgconfig, doxygen, unzip -, freetype, libjpeg, jasper, libxml2, zlib, gdal, curl, libX11 -, cairo, poppler, librsvg, libpng, libtiff, libXrandr -, xineLib, boost -, withApps ? false -, withSDL ? false, SDL -, withQt4 ? false, qt4 -}: - -stdenv.mkDerivation rec { - name = "openscenegraph-${version}"; - version = "3.4.0"; - - src = fetchurl { - url = "http://trac.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-${version}.zip"; - sha256 = "03h4wfqqk7rf3mpz0sa99gy715cwpala7964z2npd8jxfn27swjw"; - }; - - nativeBuildInputs = [ pkgconfig cmake doxygen unzip ]; - - buildInputs = [ - freetype libjpeg jasper libxml2 zlib gdal curl libX11 - cairo poppler librsvg libpng libtiff libXrandr boost - xineLib - ] ++ lib.optional withSDL SDL - ++ lib.optional withQt4 qt4; - - enableParallelBuilding = true; - - cmakeFlags = lib.optional (!withApps) "-DBUILD_OSG_APPLICATIONS=OFF"; - - meta = with stdenv.lib; { - description = "A 3D graphics toolkit"; - homepage = http://www.openscenegraph.org/; - maintainers = [ maintainers.raskin ]; - platforms = platforms.linux; - license = "OpenSceneGraph Public License - free LGPL-based license"; - }; -} diff --git a/pkgs/development/libraries/openxr-loader/default.nix b/pkgs/development/libraries/openxr-loader/default.nix new file mode 100644 index 00000000000..d1a20552ff7 --- /dev/null +++ b/pkgs/development/libraries/openxr-loader/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchFromGitHub, cmake, python3, libX11, libXxf86vm, libXrandr }: + +stdenv.mkDerivation rec { + pname = "openxr-loader"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "OpenXR-SDK-Source"; + rev = "release-${version}"; + sha256 = "1sif2w2vm793j6493364i6pp6s6yqi7fwa6iky5abzmzda51cg5q"; + }; + + nativeBuildInputs = [ cmake python3 ]; + buildInputs = [ libX11 libXxf86vm libXrandr ]; + enableParallelBuilding = true; + + cmakeFlags = [ "-DBUILD_TESTS=OFF" ]; + + outputs = [ "out" "dev" "layers" ]; + + postInstall = '' + mkdir -p "$layers/share" + mv "$out/share/openxr" "$layers/share" + # Use absolute paths in manifests so no LD_LIBRARY_PATH shenanigans are necessary + for file in "$layers/share/openxr/1/api_layers/explicit.d/"*; do + substituteInPlace "$file" --replace '"library_path": "lib' "\"library_path\": \"$layers/lib/lib" + done + mkdir -p "$layers/lib" + mv "$out/lib/libXrApiLayer"* "$layers/lib" + ''; + + meta = with stdenv.lib; { + description = "Khronos OpenXR loader"; + homepage = https://www.khronos.org/openxr; + platforms = platforms.linux; + license = licenses.asl20; + maintainers = [ maintainers.ralith ]; + }; +} diff --git a/pkgs/development/libraries/orcania/default.nix b/pkgs/development/libraries/orcania/default.nix index b1a52f8fca9..6a7fd78d514 100644 --- a/pkgs/development/libraries/orcania/default.nix +++ b/pkgs/development/libraries/orcania/default.nix @@ -1,17 +1,28 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ stdenv, fetchFromGitHub, cmake, check, subunit }: stdenv.mkDerivation rec { pname = "orcania"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "babelouest"; repo = pname; rev = "v${version}"; - sha256 = "11ihbfm7qbqf55wdi7azqx75ggd3l0n8ybyq2ikidffvmg13l4g9"; + sha256 = "1kq1cpayflh4xy442q6prrkalm8lcz2cxydrp1fv8ppq1cnq4zr7"; }; nativeBuildInputs = [ cmake ]; + checkInputs = [ check subunit ]; + + cmakeFlags = [ "-DBUILD_ORCANIA_TESTING=on" ]; + + doCheck = true; + + preCheck = '' + export LD_LIBRARY_PATH="$(pwd):$LD_LIBRARY_PATH" + export DYLD_FALLBACK_LIBRARY_PATH="$(pwd):$DYLD_FALLBACK_LIBRARY_PATH" + ''; + meta = with stdenv.lib; { description = "Potluck with different functions for different purposes that can be shared among C programs"; homepage = "https://github.com/babelouest/orcania"; diff --git a/pkgs/development/libraries/physics/apfel/default.nix b/pkgs/development/libraries/physics/apfel/default.nix index 30b56afb8a9..d542c6cf1d7 100644 --- a/pkgs/development/libraries/physics/apfel/default.nix +++ b/pkgs/development/libraries/physics/apfel/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "apfel-${version}"; - version = "3.0.3"; + version = "3.0.4"; src = fetchFromGitHub { owner = "scarrazza"; repo = "apfel"; rev = version; - sha256 = "13dvcc5ba6djflrcy5zf5ikaw8s78zd8ac6ickc0hxhbmx1gjb4j"; + sha256 = "13n5ygbqvskg3qq5n4sff1nbii0li0zf1vqissai7x0hynxgy7p6"; }; buildInputs = [ gfortran lhapdf python2 ]; diff --git a/pkgs/development/libraries/physics/hepmc/default.nix b/pkgs/development/libraries/physics/hepmc2/default.nix index b935a3d56ea..d61a68ebe34 100644 --- a/pkgs/development/libraries/physics/hepmc/default.nix +++ b/pkgs/development/libraries/physics/hepmc2/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "hepmc-${version}"; - version = "2.06.09"; + version = "2.06.10"; src = fetchurl { - url = "http://lcgapp.cern.ch/project/simu/HepMC/download/HepMC-${version}.tar.gz"; - sha256 = "020sc7hzy7d6d1i6bs352hdzy5zy5zxkc33cw0jhh8s0jz5281y6"; + url = "http://hepmc.web.cern.ch/hepmc/releases/HepMC-${version}.tar.gz"; + sha256 = "190i9jlnwz1xpc495y0xc70s4zdqb9s2zdq1zkjy2ivl7ygdvpjs"; }; patches = [ ./in_source.patch ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "The HepMC package is an object oriented event record written in C++ for High Energy Physics Monte Carlo Generators"; license = stdenv.lib.licenses.gpl2; - homepage = http://lcgapp.cern.ch/project/simu/HepMC/; + homepage = http://hepmc.web.cern.ch/hepmc/; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ veprbl ]; }; diff --git a/pkgs/development/libraries/physics/hepmc/in_source.patch b/pkgs/development/libraries/physics/hepmc2/in_source.patch index 836a5655869..836a5655869 100644 --- a/pkgs/development/libraries/physics/hepmc/in_source.patch +++ b/pkgs/development/libraries/physics/hepmc2/in_source.patch diff --git a/pkgs/development/libraries/physics/pythia/default.nix b/pkgs/development/libraries/physics/pythia/default.nix index e84aaf37325..e6b351c206d 100644 --- a/pkgs/development/libraries/physics/pythia/default.nix +++ b/pkgs/development/libraries/physics/pythia/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, boost, fastjet, hepmc, lhapdf, rsync, zlib }: +{ stdenv, fetchurl, boost, fastjet, hepmc2, lhapdf, rsync, zlib }: stdenv.mkDerivation rec { name = "pythia-${version}"; - version = "8.240"; + version = "8.243"; src = fetchurl { url = "http://home.thep.lu.se/~torbjorn/pythia8/pythia${builtins.replaceStrings ["."] [""] version}.tgz"; - sha256 = "13cd86030j1f00n4xw30g26cgir3a5lsn9n0z13dh1vprbc9ax6j"; + sha256 = "0y8w5gdaczg8vdw63rkgjr1dcvqs2clqkdia34p30xcwgm1jgv7q"; }; - buildInputs = [ boost fastjet hepmc zlib rsync lhapdf ]; + buildInputs = [ boost fastjet hepmc2 zlib rsync lhapdf ]; preConfigure = '' patchShebangs ./configure @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-shared" - "--with-hepmc2=${hepmc}" + "--with-hepmc2=${hepmc2}" "--with-lhapdf6=${lhapdf}" ]; diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix index c8dae0c2b51..c068424e416 100644 --- a/pkgs/development/libraries/physics/rivet/default.nix +++ b/pkgs/development/libraries/physics/rivet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fastjet, ghostscript, gsl, hepmc, imagemagick, less, python2, texlive, yoda, which, makeWrapper }: +{ stdenv, fetchurl, fastjet, ghostscript, gsl, hepmc2, imagemagick, less, python2, texlive, yoda, which, makeWrapper }: stdenv.mkDerivation rec { name = "rivet-${version}"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { xkeyval xstring ;}; - buildInputs = [ hepmc imagemagick python2 latex makeWrapper ]; + buildInputs = [ hepmc2 imagemagick python2 latex makeWrapper ]; propagatedBuildInputs = [ fastjet ghostscript gsl yoda ]; preConfigure = '' @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-fastjet=${fastjet}" - "--with-hepmc=${hepmc}" + "--with-hepmc=${hepmc2}" "--with-yoda=${yoda}" ]; diff --git a/pkgs/development/libraries/physics/thepeg/default.nix b/pkgs/development/libraries/physics/thepeg/default.nix index 046413c64f4..272761977ba 100644 --- a/pkgs/development/libraries/physics/thepeg/default.nix +++ b/pkgs/development/libraries/physics/thepeg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, fastjet, gsl, hepmc, lhapdf, rivet, zlib }: +{ stdenv, fetchurl, boost, fastjet, gsl, hepmc2, lhapdf, rivet, zlib }: stdenv.mkDerivation rec { name = "thepeg-${version}"; @@ -9,10 +9,10 @@ stdenv.mkDerivation rec { sha256 = "1rmmwhk9abn9mc9j3127axjwpvymv21ld4wcivwz01pldkxh06n6"; }; - buildInputs = [ boost fastjet gsl hepmc lhapdf rivet zlib ]; + buildInputs = [ boost fastjet gsl hepmc2 lhapdf rivet zlib ]; configureFlags = [ - "--with-hepmc=${hepmc}" + "--with-hepmc=${hepmc2}" "--with-rivet=${rivet}" "--without-javagui" ]; diff --git a/pkgs/development/libraries/png++/default.nix b/pkgs/development/libraries/png++/default.nix index 54a563c518f..3f6a609121a 100644 --- a/pkgs/development/libraries/png++/default.nix +++ b/pkgs/development/libraries/png++/default.nix @@ -5,11 +5,11 @@ assert docSupport -> doxygen != null; stdenv.mkDerivation rec { name = "pngpp-${version}"; - version = "0.2.9"; + version = "0.2.10"; src = fetchurl { url = "mirror://savannah/pngpp/png++-${version}.tar.gz"; - sha256 = "14c74fsc3q8iawf60m74xkkawkqbhd8k8x315m06qaqjcl2nmg5b"; + sha256 = "1qgf8j25r57wjqlnzdkm8ya5x1bmj6xjvapv8f2visqnmcbg52lr"; }; doCheck = true; diff --git a/pkgs/development/libraries/ptex/default.nix b/pkgs/development/libraries/ptex/default.nix index aa17771ec9f..b4571d07fbf 100644 --- a/pkgs/development/libraries/ptex/default.nix +++ b/pkgs/development/libraries/ptex/default.nix @@ -1,36 +1,27 @@ -{ stdenv, fetchFromGitHub, zlib, python, cmake }: +{ stdenv, fetchFromGitHub, zlib, python, cmake, pkg-config }: stdenv.mkDerivation rec { - name = "ptex-${version}"; - version = "2.3.0"; + pname = "ptex"; + version = "2.3.2"; src = fetchFromGitHub { owner = "wdas"; repo = "ptex"; rev = "v${version}"; - sha256 = "0nfz0y66bmi6xckn1whi4sfd8i3ibln212fgm4img2z98b6vccyg"; + sha256 = "1c3pdqszn4y3d86qzng8b0hqdrchnl39adq5ab30wfnrgl2hnm4z"; }; outputs = [ "bin" "dev" "out" "lib" ]; - buildInputs = [ zlib python cmake ]; + buildInputs = [ zlib python cmake pkg-config ]; enableParallelBuilding = true; - buildPhase = '' - mkdir -p $out - - make prefix=$out - - mkdir -p $bin/bin - mkdir -p $dev/include - mkdir -p $lib/lib - ''; - - installPhase = '' - make install - mv $out/bin $bin/ + # Can be removed in the next release + # https://github.com/wdas/ptex/pull/42 + patchPhase = '' + echo v${version} >version ''; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/pth/default.nix b/pkgs/development/libraries/pth/default.nix index c315cb8f72b..b2173ec21ee 100644 --- a/pkgs/development/libraries/pth/default.nix +++ b/pkgs/development/libraries/pth/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { preConfigure = stdenv.lib.optionalString stdenv.isAarch32 '' configureFlagsArray=("CFLAGS=-DJB_SP=8 -DJB_PC=9") + '' + stdenv.lib.optionalString (stdenv.hostPlatform.libc == "glibc") '' + configureFlagsArray+=("ac_cv_check_sjlj=ssjlj") ''; meta = with stdenv.lib; { @@ -17,6 +19,5 @@ stdenv.mkDerivation rec { homepage = https://www.gnu.org/software/pth; license = licenses.lgpl21Plus; platforms = platforms.all; - broken = stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/development/libraries/qgnomeplatform/default.nix b/pkgs/development/libraries/qgnomeplatform/default.nix index 1fb3a415dc6..94c69a4a14b 100644 --- a/pkgs/development/libraries/qgnomeplatform/default.nix +++ b/pkgs/development/libraries/qgnomeplatform/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, pkgconfig, gtk3, qtbase, qmake }: +{ mkDerivation, lib, fetchFromGitHub, pkgconfig, gtk3, qtbase, qmake }: -stdenv.mkDerivation rec { - name = "qgnomeplatform-${version}"; +mkDerivation rec { + pname = "qgnomeplatform"; version = "0.5"; src = fetchFromGitHub { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { --replace "\$\$[QT_INSTALL_PLUGINS]" "$out/$qtPluginPrefix" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "QPlatformTheme for a better Qt application inclusion in GNOME"; homepage = https://github.com/FedoraQt/QGnomePlatform; license = licenses.lgpl21Plus; 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 de6457db98b..f833d130fbb 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -83,11 +83,13 @@ stdenv.mkDerivation rec { + "21b342d71c19e6d68b649947f913410fe6129ea4/debian/patches/kubuntu_39_fix_medium_font.diff"; sha256 = "0bli44chn03c2y70w1n8l7ss4ya0b40jqqav8yxrykayi01yf95j"; }) - (fetchpatch { - name = "qt4-gcc6.patch"; - url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/qt4-gcc6.patch?h=packages/qt4&id=ca773a144f5abb244ac4f2749eeee9333cac001f"; - sha256 = "07lrva7bjh6i40p7b3ml26a2jlznri8bh7y7iyx5zmvb1gfxmj34"; - }) + # Patch is no longer available from here, so vendoring it for now. + #(fetchpatch { + # name = "qt4-gcc6.patch"; + # url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/qt4-gcc6.patch?h=packages/qt4&id=ca773a144f5abb244ac4f2749eeee9333cac001f"; + # sha256 = "07lrva7bjh6i40p7b3ml26a2jlznri8bh7y7iyx5zmvb1gfxmj34"; + #}) + ./qt4-gcc6.patch ] ++ lib.optional gtkStyle (substituteAll ({ src = ./dlopen-gtkstyle.diff; diff --git a/pkgs/development/libraries/qt-4.x/4.8/qt4-gcc6.patch b/pkgs/development/libraries/qt-4.x/4.8/qt4-gcc6.patch new file mode 100644 index 00000000000..000e345cf13 --- /dev/null +++ b/pkgs/development/libraries/qt-4.x/4.8/qt4-gcc6.patch @@ -0,0 +1,33 @@ +--- qt-everywhere-opensource-src-4.8.7/configure.gcc6 2016-04-15 07:04:19.430268222 -0500 ++++ qt-everywhere-opensource-src-4.8.7/configure 2016-04-15 07:05:22.157568689 -0500 +@@ -7744,7 +7744,7 @@ + *-g++*) + # Check gcc's version + case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in +- 5*|4*|3.4*) ++ 8*|7*|6*|5*|4*|3.4*) + ;; + 3.3*) + canBuildWebKit="no" +@@ -8060,7 +8060,7 @@ + 3.*) + COMPILER_VERSION="3.*" + ;; +- 5*|4.*) ++ 8*|7*|6*|5*|4.*) + COMPILER_VERSION="4" + ;; + *) +--- qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h.gcc6 2015-05-07 09:14:48.000000000 -0500 ++++ qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h 2016-04-15 07:04:19.431268227 -0500 +@@ -70,8 +70,8 @@ + ForegroundShift = 10, + BackgroundShift = 20, + SpecialShift = 20, +- ForegroundMask = ((1 << ForegroundShift) - 1) << ForegroundShift, +- BackgroundMask = ((1 << BackgroundShift) - 1) << BackgroundShift ++ ForegroundMask = 0x1f << ForegroundShift, ++ BackgroundMask = 0x7 << BackgroundShift + }; + + public: diff --git a/pkgs/development/libraries/qt-5/5.11/default.nix b/pkgs/development/libraries/qt-5/5.11/default.nix index 67c5047e507..7f0937db30f 100644 --- a/pkgs/development/libraries/qt-5/5.11/default.nix +++ b/pkgs/development/libraries/qt-5/5.11/default.nix @@ -9,9 +9,8 @@ top-level attribute to `top-level/all-packages.nix`. 1. Update the URL in `pkgs/development/libraries/qt-5/$VERSION/fetch.sh`. 2. From the top of the Nixpkgs tree, run `./maintainers/scripts/fetch-kde-qt.sh > pkgs/development/libraries/qt-5/$VERSION/srcs.nix`. -3. Update `qtCompatVersion` below if the minor version number changes. -4. Check that the new packages build correctly. -5. Commit the changes and open a pull request. +3. Check that the new packages build correctly. +4. Commit the changes and open a pull request. */ @@ -32,7 +31,7 @@ with stdenv.lib; let - qtCompatVersion = "5.11"; + qtCompatVersion = srcs.qtbase.version; stdenvActual = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv; diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix index 1fbf7b57289..1bc63d0e2b9 100644 --- a/pkgs/development/libraries/qt-5/5.12/default.nix +++ b/pkgs/development/libraries/qt-5/5.12/default.nix @@ -9,9 +9,8 @@ top-level attribute to `top-level/all-packages.nix`. 1. Update the URL in `pkgs/development/libraries/qt-5/$VERSION/fetch.sh`. 2. From the top of the Nixpkgs tree, run `./maintainers/scripts/fetch-kde-qt.sh > pkgs/development/libraries/qt-5/$VERSION/srcs.nix`. -3. Update `qtCompatVersion` below if the minor version number changes. -4. Check that the new packages build correctly. -5. Commit the changes and open a pull request. +3. Check that the new packages build correctly. +4. Commit the changes and open a pull request. */ @@ -32,7 +31,7 @@ with stdenv.lib; let - qtCompatVersion = "5.12"; + qtCompatVersion = srcs.qtbase.version; stdenvActual = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv; diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix index 4f739b57ffe..d45b014b765 100644 --- a/pkgs/development/libraries/qt-5/5.6/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/default.nix @@ -18,9 +18,8 @@ existing packages here and modify it as necessary. 1. Update the URL in `./fetch.sh`. 2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-5/$VERSION/` from the top of the Nixpkgs tree. -3. Update `qtCompatVersion` below if the minor version number changes. -4. Check that the new packages build correctly. -5. Commit the changes and open a pull request. +3. Check that the new packages build correctly. +4. Commit the changes and open a pull request. */ @@ -40,7 +39,7 @@ with stdenv.lib; let - qtCompatVersion = "5.6"; + qtCompatVersion = srcs.qtbase.version; mirror = "http://download.qt.io"; srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; }; diff --git a/pkgs/development/libraries/qt-5/5.9/default.nix b/pkgs/development/libraries/qt-5/5.9/default.nix index f36f86e26ff..52c763263b5 100644 --- a/pkgs/development/libraries/qt-5/5.9/default.nix +++ b/pkgs/development/libraries/qt-5/5.9/default.nix @@ -9,9 +9,8 @@ top-level attribute to `top-level/all-packages.nix`. 1. Update the URL in `pkgs/development/libraries/qt-5/$VERSION/fetch.sh`. 2. From the top of the Nixpkgs tree, run `./maintainers/scripts/fetch-kde-qt.sh > pkgs/development/libraries/qt-5/$VERSION/srcs.nix`. -3. Update `qtCompatVersion` below if the minor version number changes. -4. Check that the new packages build correctly. -5. Commit the changes and open a pull request. +3. Check that the new packages build correctly. +4. Commit the changes and open a pull request. */ @@ -31,7 +30,7 @@ with stdenv.lib; let - qtCompatVersion = "5.9"; + qtCompatVersion = srcs.qtbase.version; mirror = "http://download.qt.io"; srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; }; diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 458946b803d..2c300d1c2f1 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -146,6 +146,11 @@ stdenv.mkDerivation { sed -i mkspecs/common/linux.conf \ -e "/^QMAKE_INCDIR_OPENGL/ s|$|${libGL.dev or libGL}/include|" \ -e "/^QMAKE_LIBDIR_OPENGL/ s|$|${libGL.out}/lib|" + '' + + lib.optionalString (stdenv.hostPlatform.isx86_32 && stdenv.cc.isGNU) + '' + sed -i mkspecs/common/gcc-base-unix.conf \ + -e "/^QMAKE_LFLAGS_SHLIB/ s/-shared/-shared -static-libgcc/" '' ); diff --git a/pkgs/development/libraries/readline/readline-8.0-patches.nix b/pkgs/development/libraries/readline/readline-8.0-patches.nix index b8019fb3350..433da83dab9 100644 --- a/pkgs/development/libraries/readline/readline-8.0-patches.nix +++ b/pkgs/development/libraries/readline/readline-8.0-patches.nix @@ -1,4 +1,5 @@ # Automatically generated by `update-patch-set.sh'; do not edit. patch: [ +(patch "001" "0sfh7wn0pr743xspnb1zndxndlv9rc0hcg14cbw5cmyg6f4ykrfq") ] diff --git a/pkgs/development/libraries/science/math/spooles/default.nix b/pkgs/development/libraries/science/math/spooles/default.nix new file mode 100644 index 00000000000..953f5a70b8a --- /dev/null +++ b/pkgs/development/libraries/science/math/spooles/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchurl, gfortran, perl }: + +stdenv.mkDerivation rec { + pname = "spooles"; + version = "2.2"; + + src = fetchurl { + url = "http://www.netlib.org/linalg/spooles/spooles.${version}.tgz"; + sha256 = "1pf5z3vvwd8smbpibyabprdvcmax0grzvx2y0liy98c7x6h5jid8"; + }; + + sourceRoot = "."; + + patches = [ + ./spooles.patch + ]; + + buildPhase = '' + make lib + ''; + + installPhase = '' + mkdir -p $out/lib $out/include/spooles + cp libspooles.a libspooles.so.2.2 $out/lib/ + ln -s libspooles.so.2.2 $out/lib/libspooles.so.2 + ln -s libspooles.so.2 $out/lib/libspooles.so + for h in *.h; do + if [ $h != 'MPI.h' ]; then + cp $h $out/include/spooles + d=`basename $h .h` + if [ -d $d ]; then + mkdir $out/include/spooles/$d + cp $d/*.h $out/include/spooles/$d + fi + fi + done + ''; + + nativeBuildInputs = [ perl ]; + + meta = with stdenv.lib; { + homepage = "http://www.netlib.org/linalg/spooles/"; + description = "Library for solving sparse real and complex linear systems of equations"; + license = licenses.publicDomain; + maintainers = with maintainers; [ gebner ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/science/math/spooles/spooles.patch b/pkgs/development/libraries/science/math/spooles/spooles.patch new file mode 100644 index 00000000000..c0c93c9365c --- /dev/null +++ b/pkgs/development/libraries/science/math/spooles/spooles.patch @@ -0,0 +1,188 @@ +diff --git a/I2Ohash/src/util.c b/I2Ohash/src/util.c +index 72d082e..f32f667 100644 +--- a/I2Ohash/src/util.c ++++ b/I2Ohash/src/util.c +@@ -39,9 +39,10 @@ fflush(stdout) ; + */ + loc1 = (key1 + 1) % hashtable->nlist ; + loc2 = (key2 + 1) % hashtable->nlist ; +-loc = (loc1*loc2) % hashtable->nlist ; ++long int loc3 = (long int)loc1*(long int)loc2 % hashtable->nlist ; ++loc =(int) loc3; + #if MYDEBUG > 0 +-fprintf(stdout, "\n loc1 = %d, loc2 = %d, loc3 = %d", loc1, loc2, loc) ; ++fprintf(stdout, "\n loc1 = %d, loc2 = %d, loc3 = %ld, loc = %d", loc1, loc2, loc3, loc) ; + fflush(stdout) ; + #endif + /* +@@ -158,9 +159,10 @@ fflush(stdout) ; + #endif + loc1 = (key1 + 1) % hashtable->nlist ; + loc2 = (key2 + 1) % hashtable->nlist ; +-loc = (loc1*loc2) % hashtable->nlist ; ++long int loc3 = (long int)loc1*(long int)loc2 % hashtable->nlist ; ++loc =(int) loc3; + #if MYDEBUG > 0 +-fprintf(stdout, "\n loc1 = %d, loc2 = %d, loc3 = %d", loc1, loc2, loc) ; ++fprintf(stdout, "\n loc1 = %d, loc2 = %d, loc3 = %ld, loc = %d", loc1, loc2, loc3, loc) ; + fflush(stdout) ; + #endif + /* +diff --git a/MPI/makefile b/MPI/makefile +index 0c09f86..d25e70a 100644 +--- a/MPI/makefile ++++ b/MPI/makefile +@@ -2,7 +2,7 @@ all_drivers : + cd drivers ; make drivers + + lib : +- cd src ; make spoolesMPI.a ++ cd src ; make makeLib + + clean : + cd src ; make clean +diff --git a/MPI/src/makefile b/MPI/src/makefile +index f7650b7..71e4c49 100644 +--- a/MPI/src/makefile ++++ b/MPI/src/makefile +@@ -42,3 +42,8 @@ $(OBJ).a : \ + + clean : + - rm -f *.a *.o ++ ++makeLib : ++ perl ../../makeLib > makeG ++ make -f makeG ++ rm -f makeG +diff --git a/MT/makefile b/MT/makefile +index 9b86a32..d25e70a 100644 +--- a/MT/makefile ++++ b/MT/makefile +@@ -2,7 +2,7 @@ all_drivers : + cd drivers ; make drivers + + lib : +- cd src ; make spoolesMT.a ++ cd src ; make makeLib + + clean : + cd src ; make clean +diff --git a/Make.inc b/Make.inc +index f99eb8f..2de8a25 100644 +--- a/Make.inc ++++ b/Make.inc +@@ -12,7 +12,7 @@ + # for solaris + # + # CC = gcc +- CC = /usr/lang-4.0/bin/cc ++# CC = /usr/lang-4.0/bin/cc + # + # for sgi + # +@@ -28,7 +28,7 @@ + # + # OPTLEVEL = + # OPTLEVEL = -g -v +- OPTLEVEL = -O ++ OPTLEVEL = -O3 + # OPTLEVEL = -xO5 -v + # OPTLEVEL = -O3 + # OPTLEVEL = -O4 +@@ -43,7 +43,7 @@ + # set any load flags + # + # LDFLAGS = -Wl,+parallel -Wl,+tm,spp2000 # for hp exemplar +- LDFLAGS = ++# LDFLAGS = + # + #--------------------------------------------------------------------- + # +@@ -103,7 +103,7 @@ + # MPI install library + # + # MPI_INSTALL_DIR = +- MPI_INSTALL_DIR = /usr/local/mpich-1.0.13 ++# MPI_INSTALL_DIR = /usr/lib/openmpi + # + #--------------------------------------------------------------------- + # +@@ -142,6 +142,6 @@ + # MPI include path + # + # MPI_INCLUDE_DIR = +- MPI_INCLUDE_DIR = -I$(MPI_INSTALL_DIR)/include ++# MPI_INCLUDE_DIR = -I/usr/include/mpi + # + #--------------------------------------------------------------------- +diff --git a/Utilities/src/iohb.c b/Utilities/src/iohb.c +index ac38f7b..ac34034 100644 +--- a/Utilities/src/iohb.c ++++ b/Utilities/src/iohb.c +@@ -1725,7 +1725,7 @@ static void upcase(char* S) + + static void IOHBTerminate(char* message) + { +- fprintf(stderr,message); ++ fputs(message, stderr); + exit(1); + } + +diff --git a/makeLib b/makeLib +index 1780f39..7697b06 100755 +--- a/makeLib ++++ b/makeLib +@@ -64,14 +64,19 @@ foreach $src ( @srcnames ) { + $srcname = " \\\n " . $src ; + print $srcname ; + } ++print "\n\n.SUFFIXES: .c .o .lo .a .so" ; + print "\n\nOBJ_FILES = \$\{SRC:.c=.o\}" ; ++print "\n\nLOBJ_FILES = \$\{SRC:.c=.lo\}" ; + print "\n\n" ; + print <<'EOF' ; + .c.o : +- $(PURIFY) $(CC) -c $(CFLAGS) $*.c -o $(OBJ)_$*.o ++ $(PURIFY) $(CC) -c $(CFLAGS) $*.c -o $(OBJ)_$*.o $(MPI_INCLUDE_DIR) + +-../../spooles.a : ${OBJ_FILES} +- $(AR) $(ARFLAGS) ../../spooles.a $(OBJ)_*.o ++.c.lo : ++ $(PURIFY) $(CC) -c $(CFLAGS) $*.c -fPIC -DPIC -o $(OBJ)_$*.lo $(MPI_INCLUDE_DIR) ++ ++../../libspooles.a : ${OBJ_FILES} ${LOBJ_FILES} ++ $(AR) $(ARFLAGS) ../../libspooles.a $(OBJ)_*.o + rm -f $(OBJ)_*.o +- $(RANLIB) ../../spooles.a ++ $(RANLIB) ../../libspooles.a + EOF +diff --git a/makefile b/makefile +index f014c7d..7c8042a 100755 +--- a/makefile ++++ b/makefile +@@ -124,7 +124,9 @@ lib : + cd ZV ; make lib + cd misc ; make lib + #cd MPI ; make lib +-#cd MT ; make lib ++ cd MT ; make lib ++ gcc -shared */*/*.lo -Wl,-soname,libspooles.so.2.2 -o libspooles.so.2.2 -lpthread -lm ++ ln -s libspooles.so.2.2 libspooles.so + + global : + cd A2/src ; make -f makeGlobalLib +diff --git a/timings.h b/timings.h +index 23df189..685800b 100644 +--- a/timings.h ++++ b/timings.h +@@ -2,9 +2,8 @@ + #define _TIMINGS_ + #include <sys/time.h> + static struct timeval TV ; +-static struct timezone TZ ; + #define MARKTIME(t) \ +- gettimeofday(&TV, &TZ) ; \ ++ gettimeofday(&TV, NULL) ; \ + t = (TV.tv_sec + 0.000001*TV.tv_usec) + #endif + diff --git a/pkgs/development/libraries/science/math/sympow/default.nix b/pkgs/development/libraries/science/math/sympow/default.nix index 080cab86ca4..fd9285ebf79 100644 --- a/pkgs/development/libraries/science/math/sympow/default.nix +++ b/pkgs/development/libraries/science/math/sympow/default.nix @@ -1,89 +1,74 @@ { stdenv -, fetchurl -, fetchpatch +, fetchFromGitLab , makeWrapper +, which +, autoconf +, help2man +, file +, pari }: stdenv.mkDerivation rec { - version = "1.018.1"; + version = "2.023.4"; name = "sympow-${version}"; - src = fetchurl { - # Original website no longer reachable - url = "mirror://sageupstream/sympow/sympow-${version}.tar.bz2"; - sha256 = "0hphs7ia1wr5mydf288zvwj4svrymfpadcg3pi6w80km2yg5bm3c"; + src = fetchFromGitLab { + group = "rezozer"; + owner = "forks"; + repo = "sympow"; + rev = "v${version}"; + sha256 = "0j2qdw9csbr081h8arhlx1z7ibgi5am4ndmvyc8y4hccfa8n4w1y"; }; + postUnpack = '' + patchShebangs . + ''; + nativeBuildInputs = [ makeWrapper + which + autoconf + help2man + file + pari ]; configurePhase = '' runHook preConfigure + export PREFIX="$out" + export VARPREFIX="$out" # see comment on postInstall ./Configure # doesn't take any options runHook postConfigure ''; - installPhase = '' - runHook preInstall - install -D datafiles/* --target-directory "$out/share/sympow/datafiles/" - install *.gp "$out/share/sympow/" - install -Dm755 sympow "$out/share/sympow/sympow" - install -D new_data "$out/bin/new_data" - - makeWrapper "$out/share/sympow/sympow" "$out/bin/sympow" \ - --run 'export SYMPOW_LOCAL="$HOME/.local/share/sympow"' \ - --run 'if [ ! -d "$SYMPOW_LOCAL" ]; then - mkdir -p "$SYMPOW_LOCAL" - cp -r ${placeholder "out"}/share/sympow/* "$SYMPOW_LOCAL" - chmod -R +xw "$SYMPOW_LOCAL" - fi' \ - --run 'cd "$SYMPOW_LOCAL"' - runHook postInstall + # Usually, sympow has 3 levels of caching: statically distributed in /usr/, + # shared in /var and per-user in ~/.sympow. The shared cache assumes trust in + # other users and a shared /var is not compatible with nix's approach, so we + # set VARPREFIX to the read-only $out. This effectively disables shared + # caching. See https://trac.sagemath.org/ticket/3360#comment:36 and sympow's + # README for more details on caching. + # sympow will complain at runtime about the lack of write-permissions on the + # shared cache. We pass the `-quiet` flag by default to disable this. + postInstall = '' + wrapProgram "$out/bin/sympow" --add-flags '-quiet' ''; - patches = [ - # don't hardcode paths - (fetchpatch { - name = "do_not_hardcode_paths.patch"; - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/sympow/patches/Configure.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; - sha256 = "1611p8ra8zkxvmxn3gm2l64bd4ma4m6r4vd6vwswcic91k1fci04"; - }) - - # bug on some platforms in combination with a newer gcc: - # https://trac.sagemath.org/ticket/11920 - (fetchpatch { - name = "fix_newer_gcc1.patch"; - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/sympow/patches/fpu.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; - sha256 = "14gfa56w3ddfmd4d5ir9a40y2zi43cj1i4d2l2ij9l0qlqdy9jyx"; - }) - (fetchpatch { - name = "fix_newer_gcc2.patch"; - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/sympow/patches/execlp.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; - sha256 = "190gqhgz9wgw4lqwz0nwb1izc9zffx34bazsiw2a2sz94bmgb54v"; - }) - - # fix pointer initialization bug (https://trac.sagemath.org/ticket/22862) - (fetchpatch { - name = "fix_pointer_initialization1.patch"; - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/sympow/patches/initialize-tacks.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; - sha256 = "02341vdbbidfs39s26vi4n5wigz619sw8fdbl0h9qsmwwhscgf85"; - }) - (fetchpatch { - name = "fix_pointer_initialization2.patch"; - url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/sympow-datafiles.patch?h=packages/sympow&id=5088e641a45b23d0385d8e63be65315129b4cf58"; - sha256 = "1m0vz048layb47r1jjf7fplw650ccc9x0w3l322iqmppzmv3022a"; - }) - ]; + # Example from the README as a sanity check. + doInstallCheck = true; + installCheckPhase = '' + export HOME="$TMP/home" + mkdir -p "$HOME" + "$out/bin/sympow" -sp 2p16 -curve "[1,2,3,4,5]" | grep '8.3705' + ''; meta = with stdenv.lib; { - description = "A package to compute special values of symmetric power elliptic curve L-functions"; + description = "Compute special values of symmetric power elliptic curve L-functions"; license = { shortName = "sympow"; fullName = "Custom, BSD-like. See COPYING file."; free = true; }; maintainers = with maintainers; [ timokau ]; - platforms = platforms.all; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/simgear/default.nix b/pkgs/development/libraries/simgear/default.nix index 11612eeb288..471bcb22234 100644 --- a/pkgs/development/libraries/simgear/default.nix +++ b/pkgs/development/libraries/simgear/default.nix @@ -3,26 +3,29 @@ , openscenegraph, openal, expat, cmake, apr , curl }: - +let + version = "2019.1.1"; + shortVersion = builtins.substring 0 6 version; +in stdenv.mkDerivation rec { - name = "simgear-${version}"; - version = "2018.3.1"; - shortVersion = "2018.3"; + pname = "simgear"; + inherit version; src = fetchurl { - url = "mirror://sourceforge/flightgear/release-${shortVersion}/${name}.tar.bz2"; - sha256 = "0sm0v8v1sw5xzkzhf0gzh6fwx93hd62h5lm9s9hgci40x7480i99"; + url = "mirror://sourceforge/flightgear/release-${shortVersion}/${pname}-${version}.tar.bz2"; + sha256 = "12sl18limlj61hlwl3bcv5ysfdpsjmd07cxchhf9xa8shk6d87i0"; }; + nativeBuildInputs = [ cmake ]; buildInputs = [ plib freeglut xorgproto libX11 libXext libXi libICE libSM libXt libXmu libGLU_combined boost zlib libjpeg freealut - openscenegraph openal expat cmake apr curl ]; + openscenegraph openal expat apr curl ]; enableParallelBuilding = true; meta = with stdenv.lib; { description = "Simulation construction toolkit"; - homepage = https://gitorious.org/fg/simgear; + homepage = "https://gitorious.org/fg/simgear"; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; license = licenses.lgpl2; diff --git a/pkgs/development/libraries/symengine/default.nix b/pkgs/development/libraries/symengine/default.nix index 40e1a280aa2..424dc116c7e 100644 --- a/pkgs/development/libraries/symengine/default.nix +++ b/pkgs/development/libraries/symengine/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { name = "symengine-${version}"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "symengine"; repo = "symengine"; rev = "v${version}"; - sha256 = "1kz893p3pmsw3gfwickk2nliw8p63yp89xriad7kpw4kmhvgr8gb"; + sha256 = "0qqxr7l5lr81k6fs2h5isr43x0dw07rwg3ivl6vd8zmmcgsp9ygd"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/thrift/0.10.nix b/pkgs/development/libraries/thrift/0.10.nix new file mode 100644 index 00000000000..d626673a227 --- /dev/null +++ b/pkgs/development/libraries/thrift/0.10.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, boost, zlib, libevent, openssl, python, pkgconfig, bison +, flex, twisted +}: + +stdenv.mkDerivation rec { + pname = "thrift"; + version = "0.10.0"; + + src = fetchurl { + url = "https://archive.apache.org/dist/thrift/${version}/${pname}-${version}.tar.gz"; + sha256 = "02x1xw0l669idkn6xww39j60kqxzcbmim4mvpb5h9nz8wqnx1292"; + }; + + #enableParallelBuilding = true; problems on hydra + + # Workaround to make the python wrapper not drop this package: + # pythonFull.buildEnv.override { extraLibs = [ thrift ]; } + pythonPath = []; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ + boost zlib libevent openssl python bison flex twisted + ]; + + preConfigure = "export PY_PREFIX=$out"; + + # TODO: package boost-test, so we can run the test suite. (Currently it fails + # to find libboost_unit_test_framework.a.) + configureFlags = [ "--enable-tests=no" ]; + doCheck = false; + + meta = with stdenv.lib; { + description = "Library for scalable cross-language services"; + homepage = "http://thrift.apache.org/"; + license = licenses.asl20; + platforms = platforms.linux ++ platforms.darwin; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/development/libraries/uid_wrapper/default.nix b/pkgs/development/libraries/uid_wrapper/default.nix index bd9fb796247..8a79dab45b2 100644 --- a/pkgs/development/libraries/uid_wrapper/default.nix +++ b/pkgs/development/libraries/uid_wrapper/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, pkgconfig }: stdenv.mkDerivation rec { - name = "uid_wrapper-1.2.4"; + name = "uid_wrapper-1.2.7"; src = fetchurl { url = "mirror://samba/cwrap/${name}.tar.gz"; - sha256 = "1yjhrm3rcyiykkrgpifmig117mzjxrms75kp8gpp8022f59zcq1w"; + sha256 = "0mpzr70n24b0khri89hipxiqqay370m93syhnywrdmdxr3dhw2d8"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/development/libraries/unicap/default.nix b/pkgs/development/libraries/unicap/default.nix index 1aa5e671702..a902b6f8451 100644 --- a/pkgs/development/libraries/unicap/default.nix +++ b/pkgs/development/libraries/unicap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libusb, libraw1394, dcraw, intltool, perl, v4l_utils }: +{ stdenv, fetchurl, libusb, libraw1394, dcraw, intltool, perl, v4l-utils }: stdenv.mkDerivation rec { name = "libunicap-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "05zcnnm4dfc6idihfi0fq5xka6x86zi89wip2ca19yz768sd33s9"; }; - buildInputs = [ libusb libraw1394 dcraw intltool perl v4l_utils ]; + buildInputs = [ libusb libraw1394 dcraw intltool perl v4l-utils ]; patches = [ # Debian has a patch that fixes the build. diff --git a/pkgs/development/libraries/wavpack/default.nix b/pkgs/development/libraries/wavpack/default.nix index adfce3ea50b..8af33c10319 100644 --- a/pkgs/development/libraries/wavpack/default.nix +++ b/pkgs/development/libraries/wavpack/default.nix @@ -59,6 +59,16 @@ stdenv.mkDerivation rec { name = "CVE-2018-19841.patch"; sha256 = "08gx5xx51bi86cqqy7cv1d25k669a7wnkksasjspphwkpwkcxymy"; }) + (fetchpatch { + url = "https://github.com/dbry/WavPack/commit/f68a9555b548306c5b1ee45199ccdc4a16a6101b.patch"; + name = "CVE-2019-1010317.patch"; + sha256 = "0v748nd9408v6ah37cn8wr0k0m0ny1g884q8q92j1dhwad69kfid"; + }) + (fetchpatch { + url = "https://github.com/dbry/WavPack/commit/33a0025d1d63ccd05d9dbaa6923d52b1446a62fe.patch"; + name = "CVE-2019-1010319.patch"; + sha256 = "011sqdgpykilaj2c4ns298z7aad03yprpva0dqr39nx88ji6jnrb"; + }) ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix index e7feaabc739..549e492e944 100644 --- a/pkgs/development/libraries/wolfssl/default.nix +++ b/pkgs/development/libraries/wolfssl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "wolfssl-${version}"; - version = "4.0.0"; + version = "4.1.0"; src = fetchFromGitHub { owner = "wolfSSL"; repo = "wolfssl"; rev = "v${version}-stable"; - sha256 = "155lmgz81ky0x04c8m2yzlsm58i9jk6hiw1ajc3wizvbpczbca57"; + sha256 = "16d1dzbdx6x7czbxf6i1rlb5mv59yzzpnha7qgwab3yq62rlsgw3"; }; configureFlags = [ "--enable-all" ]; diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index c10dfdaa961..271c7adf3d9 100644 --- a/pkgs/development/libraries/xapian/default.nix +++ b/pkgs/development/libraries/xapian/default.nix @@ -38,5 +38,5 @@ let in { # xapian-ruby needs 1.2.22 as of 2017-05-06 xapian_1_2_22 = generic "1.2.22" "0zsji22n0s7cdnbgj0kpil05a6bgm5cfv0mvx12d8ydg7z58g6r6"; - xapian_1_4 = generic "1.4.11" "01xwqljnp5afjf9097lyfbqc6x5bcqszfdkn9l1j86imwbrv45lz"; + xapian_1_4 = generic "1.4.12" "0z5c1y9vp519h2x2igjq39v6j615nppry0wasd0xn4hphgd3d2jg"; } diff --git a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix index b8cf86999e0..9b031602371 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix @@ -1,18 +1,39 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libxml2, xdg-desktop-portal, gtk3, glib, wrapGAppsHook, gsettings-desktop-schemas }: +{ stdenv +, fetchFromGitHub +, autoreconfHook +, pkgconfig +, libxml2 +, xdg-desktop-portal +, gtk3 +, glib +, wrapGAppsHook +, gsettings-desktop-schemas +}: stdenv.mkDerivation rec { pname = "xdg-desktop-portal-gtk"; - version = "1.2.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "flatpak"; repo = pname; rev = version; - sha256 = "1vgnsahljzrjcdjzv1dxhp2rf709pnf8595an82llnylwa8rdp1j"; + sha256 = "1zryfg6232vz1pmv0zqcxvl4clnbb15kjf55b24cimkcnidklbap"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig libxml2 xdg-desktop-portal wrapGAppsHook ]; - buildInputs = [ glib gtk3 gsettings-desktop-schemas ]; + nativeBuildInputs = [ + autoreconfHook + libxml2 + pkgconfig + wrapGAppsHook + xdg-desktop-portal + ]; + + buildInputs = [ + glib + gsettings-desktop-schemas + gtk3 + ]; meta = with stdenv.lib; { description = "Desktop integration portals for sandboxed apps"; diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/development/libraries/xdg-desktop-portal/default.nix index 3f02946c770..4be7bd1474c 100644 --- a/pkgs/development/libraries/xdg-desktop-portal/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, substituteAll, autoreconfHook, pkgconfig, libxml2, glib, pipewire, fontconfig, flatpak, gsettings-desktop-schemas, acl, dbus, fuse, geoclue2, wrapGAppsHook }: +{ stdenv, fetchFromGitHub, substituteAll, autoreconfHook, pkgconfig, libxml2, glib, pipewire, fontconfig, flatpak, gsettings-desktop-schemas, acl, dbus, fuse, geoclue2, json-glib, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "xdg-desktop-portal"; - version = "1.2.0"; + version = "1.4.2"; outputs = [ "out" "installedTests" ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "flatpak"; repo = pname; rev = version; - sha256 = "1gjyif4gly0mkdx6ir6wc4vhfh1raah9jq03q28i88hr7phjdy71"; + sha256 = "1rs3kmpczkr6nm08kb9njnl7n3rmhh0ral0xav6f0y70pyh8whx6"; }; patches = [ @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ autoreconfHook pkgconfig libxml2 wrapGAppsHook ]; - buildInputs = [ glib pipewire fontconfig flatpak acl dbus geoclue2 fuse gsettings-desktop-schemas ]; + buildInputs = [ glib pipewire fontconfig flatpak acl dbus geoclue2 fuse gsettings-desktop-schemas json-glib ]; doCheck = true; # XXX: investigate! diff --git a/pkgs/development/libraries/xdg-desktop-portal/respect-path-env-var.patch b/pkgs/development/libraries/xdg-desktop-portal/respect-path-env-var.patch index f884899ecd1..d970f5636ae 100644 --- a/pkgs/development/libraries/xdg-desktop-portal/respect-path-env-var.patch +++ b/pkgs/development/libraries/xdg-desktop-portal/respect-path-env-var.patch @@ -1,10 +1,12 @@ ---- a/src/xdg-desktop-portal.c -+++ b/src/xdg-desktop-portal.c -@@ -177,38 +177,50 @@ - static void - load_installed_portals (void) +diff --git a/src/portal-impl.c b/src/portal-impl.c +index 4fd48ff..346da7c 100644 +--- a/src/portal-impl.c ++++ b/src/portal-impl.c +@@ -116,38 +116,50 @@ sort_impl_by_name (gconstpointer a, + void + load_installed_portals (gboolean opt_verbose) { -- const char *portal_dir = PKGDATADIR "/portals"; +- const char *portal_dir = DATADIR "/xdg-desktop-portal/portals"; - g_autoptr(GFile) dir = g_file_new_for_path (portal_dir); - g_autoptr(GFileEnumerator) enumerator = NULL; @@ -14,7 +16,7 @@ + const char *portal_dir = g_getenv ("XDG_DESKTOP_PORTAL_PATH"); + + if (portal_dir == NULL) -+ portal_dir = PKGDATADIR "/portals"; ++ portal_dir = DATADIR "/portals"; - if (enumerator == NULL) - return; @@ -56,7 +58,7 @@ - path = g_file_get_path (child); + name = g_file_info_get_name (info); -- if (!register_portal (path, &error)) +- if (!register_portal (path, opt_verbose, &error)) - { - g_warning ("Error loading %s: %s", path, error->message); - continue; @@ -66,7 +68,7 @@ + child = g_file_enumerator_get_child (enumerator, info); + path = g_file_get_path (child); + -+ if (!register_portal (path, &error)) ++ if (!register_portal (path, opt_verbose, &error)) + { + g_warning ("Error loading %s: %s", path, error->message); + continue; diff --git a/pkgs/development/libraries/yder/default.nix b/pkgs/development/libraries/yder/default.nix index ffa326ccc53..82d2d20cb3e 100644 --- a/pkgs/development/libraries/yder/default.nix +++ b/pkgs/development/libraries/yder/default.nix @@ -4,28 +4,19 @@ assert withSystemd -> systemd != null; stdenv.mkDerivation rec { pname = "yder"; - version = "1.4.6"; + version = "1.4.7"; src = fetchFromGitHub { owner = "babelouest"; repo = pname; rev = "v${version}"; - sha256 = "0j46v93vn130gjcr704rkdiibbk3ampzsqb6xdcrn4x115gwyf5i"; + sha256 = "19ghiwpi972wjqvlgg576nk2nkf1ii5l1kvzb056496xfmlysrwa"; }; patches = [ # We set CMAKE_INSTALL_LIBDIR to the absolute path in $out, so # prefix and exec_prefix cannot be $out, too ./fix-pkgconfig.patch - - # - ORCANIA_LIBRARIES must be set before target_link_libraries is called - # - librt is not available, nor needed on Darwin - # - The test binary is not linked against all necessary libraries - # - Test for journald logging is not systemd specific and fails on darwin - # - If the working directory is different from the build directory, the - # dynamic linker can't find libyder - # - Return correct error code from y_init_logs when journald is disabled - ./fix-darwin.patch ]; nativeBuildInputs = [ cmake ]; @@ -42,6 +33,7 @@ stdenv.mkDerivation rec { preCheck = '' export LD_LIBRARY_PATH="$(pwd):$LD_LIBRARY_PATH" + export DYLD_FALLBACK_LIBRARY_PATH="$(pwd):$DYLD_FALLBACK_LIBRARY_PATH" ''; meta = with lib; { diff --git a/pkgs/development/libraries/yder/fix-darwin.patch b/pkgs/development/libraries/yder/fix-darwin.patch deleted file mode 100644 index dedde22d927..00000000000 --- a/pkgs/development/libraries/yder/fix-darwin.patch +++ /dev/null @@ -1,159 +0,0 @@ -diff --git i/CMakeLists.txt w/CMakeLists.txt -index 036ab73..0bab8c7 100644 ---- i/CMakeLists.txt -+++ w/CMakeLists.txt -@@ -87,33 +87,6 @@ else() - set(DISABLE_JOURNALD ON) - endif () - --# shared library -- --add_library(yder SHARED ${LIB_SRC}) --if (NOT MSVC) -- set_target_properties(yder PROPERTIES -- COMPILE_OPTIONS -Wextra -- PUBLIC_HEADER "${INC_DIR}/yder.h;${PROJECT_BINARY_DIR}/yder-cfg.h" -- VERSION "${LIBRARY_VERSION}" -- SOVERSION "${LIBRARY_SOVERSION}") --endif() --if (WIN32) -- set_target_properties(yder PROPERTIES SUFFIX "-${LIBRARY_VERSION_MAJOR}.dll") --endif () -- --target_link_libraries(yder ${LIBS} ${ORCANIA_LIBRARIES} ${SYSTEMD_LIBRARIES}) -- --# static library -- --option(BUILD_STATIC "Build static library." OFF) -- --if (BUILD_STATIC) -- add_library(yder_static STATIC ${LIB_SRC}) -- target_compile_definitions(yder_static PUBLIC -DO_STATIC_LIBRARY) -- set_target_properties(yder_static PROPERTIES -- OUTPUT_NAME yder) --endif () -- - option (SEARCH_ORCANIA "Search for Orcania library" ON) - if (SEARCH_ORCANIA) - set(Orcania_FIND_QUIETLY ON) # force to find Orcania quietly -@@ -145,6 +118,33 @@ else () - set(PKGCONF_REQ_PRIVATE "liborcania") - endif () - -+# shared library -+ -+add_library(yder SHARED ${LIB_SRC}) -+if (NOT MSVC) -+ set_target_properties(yder PROPERTIES -+ COMPILE_OPTIONS -Wextra -+ PUBLIC_HEADER "${INC_DIR}/yder.h;${PROJECT_BINARY_DIR}/yder-cfg.h" -+ VERSION "${LIBRARY_VERSION}" -+ SOVERSION "${LIBRARY_SOVERSION}") -+endif() -+if (WIN32) -+ set_target_properties(yder PROPERTIES SUFFIX "-${LIBRARY_VERSION_MAJOR}.dll") -+endif () -+ -+target_link_libraries(yder ${LIBS} ${ORCANIA_LIBRARIES} ${SYSTEMD_LIBRARIES}) -+ -+# static library -+ -+option(BUILD_STATIC "Build static library." OFF) -+ -+if (BUILD_STATIC) -+ add_library(yder_static STATIC ${LIB_SRC}) -+ target_compile_definitions(yder_static PUBLIC -DO_STATIC_LIBRARY) -+ set_target_properties(yder_static PROPERTIES -+ OUTPUT_NAME yder) -+endif () -+ - # build yder-cfg.h file - configure_file(${INC_DIR}/yder-cfg.h.in ${PROJECT_BINARY_DIR}/yder-cfg.h) - set (CMAKE_EXTRA_INCLUDE_FILES ${PROJECT_BINARY_DIR}) -@@ -168,10 +168,9 @@ if (BUILD_YDER_TESTING) - set(CMAKE_CTEST_COMMAND ctest -V) - - set(TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}/test) -- set(LIBS yder ${LIBS} ${CHECK_LIBRARIES}) - if (NOT WIN32) - find_package(Threads REQUIRED) -- set(LIBS ${LIBS} ${SUBUNIT_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} m rt) -+ set(LIBS yder ${LIBS} ${SUBUNIT_LIBRARIES} ${ORCANIA_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${CHECK_LIBRARIES} m) - endif () - - set(TESTS yder_test) -@@ -186,7 +185,6 @@ if (BUILD_YDER_TESTING) - target_include_directories(${t} PUBLIC ${TST_DIR}) - target_link_libraries(${t} PUBLIC ${LIBS}) - add_test(NAME ${t} -- WORKING_DIRECTORY ${TST_DIR} - COMMAND ${t}) - endforeach () - endif () -diff --git i/src/yder.c w/src/yder.c -index 3122e3f..79e4e70 100644 ---- i/src/yder.c -+++ w/src/yder.c -@@ -236,11 +236,12 @@ static int y_write_log(const char * app_name, - if (cur_mode & Y_LOG_MODE_SYSLOG) { - y_write_log_syslog(cur_app_name, level, message); - } -- #ifndef Y_DISABLE_JOURNALD -+#endif -+ -+#if !defined(_WIN32) && !defined(Y_DISABLE_JOURNALD) - if (cur_mode & Y_LOG_MODE_JOURNALD) { - y_write_log_journald(cur_app_name, level, message); - } -- #endif - #endif - if (cur_mode & Y_LOG_MODE_FILE) { - y_write_log_file(cur_app_name, now, cur_log_file, level, message); -@@ -266,18 +267,20 @@ static int y_write_log(const char * app_name, - */ - int y_init_logs(const char * app, const unsigned long init_mode, const unsigned long init_level, const char * init_log_file, const char * message) { - #ifdef _WIN32 -- if (init_mode & Y_LOG_MODE_SYSLOG) { -- perror("syslog mode not supported on your architecture"); -- return 0; -- } else if (init_mode & Y_LOG_MODE_JOURNALD) { -- perror("journald mode not supported on your architecture"); -- return 0; -- } else { -- return y_write_log(app, init_mode, init_level, init_log_file, NULL, NULL, Y_LOG_LEVEL_INFO, message); -- } --#else -- return y_write_log(app, init_mode, init_level, init_log_file, NULL, NULL, Y_LOG_LEVEL_INFO, message); -+ if (init_mode & Y_LOG_MODE_SYSLOG) { -+ perror("syslog mode not supported on your architecture"); -+ return 0; -+ } - #endif -+ -+#if defined(_WIN32) || defined(Y_DISABLE_JOURNALD) -+ if (init_mode & Y_LOG_MODE_JOURNALD) { -+ perror("journald mode not supported on your architecture"); -+ return 0; -+ } -+#endif -+ -+ return y_write_log(app, init_mode, init_level, init_log_file, NULL, NULL, Y_LOG_LEVEL_INFO, message); - } - - /** -diff --git i/test/yder_test.c w/test/yder_test.c -index a10fd9f..b73fb16 100644 ---- i/test/yder_test.c -+++ w/test/yder_test.c -@@ -27,7 +27,11 @@ START_TEST(test_yder_init) - y_close_logs(); - ck_assert_int_eq(y_init_logs("test_yder_syslog", Y_LOG_MODE_SYSLOG, Y_LOG_LEVEL_DEBUG, NULL, "third test"), 1); - y_close_logs(); -+#ifndef Y_DISABLE_JOURNALD - ck_assert_int_eq(y_init_logs("test_yder_journald", Y_LOG_MODE_JOURNALD, Y_LOG_LEVEL_DEBUG, NULL, "fourth test"), 1); -+#else -+ ck_assert_int_eq(y_init_logs("test_yder_journald", Y_LOG_MODE_JOURNALD, Y_LOG_LEVEL_DEBUG, NULL, "fourth test"), 0); -+#endif - y_close_logs(); - ck_assert_int_eq(y_init_logs("test_yder_file_fail", Y_LOG_MODE_FILE, Y_LOG_LEVEL_DEBUG, "/nope/nope", "second test"), 0); - } diff --git a/pkgs/development/libraries/zimg/default.nix b/pkgs/development/libraries/zimg/default.nix index d22292669fa..75f10f94fb3 100644 --- a/pkgs/development/libraries/zimg/default.nix +++ b/pkgs/development/libraries/zimg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zimg"; - version = "2.9.1"; + version = "2.9.2"; src = fetchFromGitHub { owner = "sekrit-twc"; repo = "zimg"; rev = "release-${version}"; - sha256 = "0q9migrxyp5wc6lcl6gnfs1zwn1ncqna6cm7vz3c993vvmgdf1p9"; + sha256 = "0jlgrlfs9maixd8mx7gk2kfawz8ixnihkxi7vhyzfy1gq49vmxm2"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index 7fb5be1c343..592abea4ea0 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -1,9 +1,19 @@ { stdenv , fetchurl -, static ? true +# Note: If `{ static = false; shared = false; }`, upstream's default is used +# (which is building both static and shared as of zlib 1.2.11). , shared ? true +, static ? true +# If true, a separate .static ouput is created and the .a is moved there. +# In this case `pkg-config` will auto detection will currently not work if the +# .static output is given as `buildInputs` to another package (#66461), because +# the `.pc` file lists only the main output's lib dir. +# If false, and if `{ static = true; }`, the .a stays in the main output. +, splitStaticOutput ? static }: +assert splitStaticOutput -> static; + stdenv.mkDerivation (rec { name = "zlib-${version}"; version = "1.2.11"; @@ -26,14 +36,35 @@ stdenv.mkDerivation (rec { ''; outputs = [ "out" "dev" ] - ++ stdenv.lib.optional (shared && static) "static"; + ++ stdenv.lib.optional splitStaticOutput "static"; setOutputFlags = false; outputDoc = "dev"; # single tiny man3 page - configureFlags = stdenv.lib.optional shared "--shared" - ++ stdenv.lib.optional (static && !shared) "--static"; + # For zlib's ./configure (as of verion 1.2.11), the order + # of --static/--shared flags matters! + # `--shared --static` builds only static libs, while + # `--static --shared` builds both. + # So we use the latter order to be able to build both. + # Also, giving just `--shared` builds both, + # giving just `--static` builds only static, + # and giving nothing builds both. + # So we have 3 possible ways to build both: + # `--static --shared`, `--shared` and giving nothing. + # Of these, we choose `--shared`, only because that's + # what we did in the past and we can avoid mass rebuilds this way. + # As a result, we pass `--static` only when we want just static. + configureFlags = stdenv.lib.optional (static && !shared) "--static" + ++ stdenv.lib.optional shared "--shared"; + + # Note we don't need to set `dontDisableStatic`, because static-disabling + # works by grepping for `enable-static` in the `./configure` script + # (see `pkgs/stdenv/generic/setup.sh`), and zlib's handwritten one does + # not have such. + # It wouldn't hurt setting `dontDisableStatic = static && !splitStaticOutput` + # here (in case zlib ever switches to autoconf in the future), + # but we don't do it simply to avoid mass rebuilds. - postInstall = stdenv.lib.optionalString (shared && static) '' + postInstall = stdenv.lib.optionalString splitStaticOutput '' moveToOutput lib/libz.a "$static" '' # jww (2015-01-06): Sometimes this library install as a .so, even on @@ -54,6 +85,8 @@ stdenv.mkDerivation (rec { # to the bootstrap-tools libgcc (as uses to happen on arm/mips) NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (!stdenv.hostPlatform.isDarwin) "-static-libgcc"; + # We don't strip on static cross-compilation because of reports that native + # stripping corrupted the target library; see commit 12e960f5 for the report. dontStrip = stdenv.hostPlatform != stdenv.buildPlatform && static; configurePlatforms = []; @@ -68,6 +101,8 @@ stdenv.mkDerivation (rec { ] ++ stdenv.lib.optionals (stdenv.hostPlatform.libc == "msvcrt") [ "-f" "win32/Makefile.gcc" ] ++ stdenv.lib.optionals shared [ + # Note that as of writing (zlib 1.2.11), this flag only has an effect + # for Windows as it is specific to `win32/Makefile.gcc`. "SHARED_MODE=1" ]; diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 6309d84fe2e..dce179cd640 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -196,11 +196,11 @@ coxpcall = buildLuarocksPackage { }; cqueues = buildLuarocksPackage { pname = "cqueues"; - version = "20171014.52-0"; + version = "20190731.52-0"; src = fetchurl { - url = https://luarocks.org/cqueues-20171014.52-0.src.rock; - sha256 = "0q3iy1ja20nq2sn2n6badzhjq5kni86pfc09n5g2c46q9ja3vfzx"; + url = https://luarocks.org/cqueues-20190731.52-0.src.rock; + sha256 = "07rs34amsxf2bc5ccqdad0c63c70737r54316cbd9qh1a2wbvz8s"; }; disabled = (lua.luaversion != "5.2"); propagatedBuildInputs = [ lua ]; @@ -926,11 +926,11 @@ luafilesystem = buildLuarocksPackage { }; luaossl = buildLuarocksPackage { pname = "luaossl"; - version = "20190612-0"; + version = "20190731-0"; src = fetchurl { - url = https://luarocks.org/luaossl-20190612-0.src.rock; - sha256 = "0q47rsfjnx3rbbr9jl2j5nlj56c6mwmnnma9m4rrbsza2p98wb4s"; + url = https://luarocks.org/luaossl-20190731-0.src.rock; + sha256 = "0gardlh547hah5w4kfsdg05jmxzrxr21macqigcmp5hw1l67jn5m"; }; propagatedBuildInputs = [ lua ]; diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 1ce2dc809e5..e765118464d 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -40,15 +40,10 @@ with super; { name = "CRYPTO"; dep = pkgs.openssl; } { name = "OPENSSL"; dep = pkgs.openssl; } ]; - patches = [ - # https://github.com/wahern/cqueues/issues/216 & - # https://github.com/wahern/cqueues/issues/217 - (pkgs.fetchpatch { - name = "find-version-fix.patch"; - url = "https://github.com/wahern/cqueues/pull/217.patch"; - sha256 = "0068ql0jlxmjkvhzydyy52sjd0k4vad6b8w4y5szpbv4vb2lzcsc"; - }) - ]; + + # https://github.com/wahern/cqueues/issues/227 + NIX_CFLAGS_COMPILE = if pkgs.stdenv.hostPlatform.isDarwin then [ "-DCLOCK_MONOTONIC" "-DCLOCK_REALTIME" ] else null; + disabled = luaOlder "5.1" || luaAtLeast "5.4"; # Upstream rockspec is pointlessly broken into separate rockspecs, per Lua # version, which doesn't work well for us, so modify it diff --git a/pkgs/development/mobile/cocoapods/Gemfile-beta.lock b/pkgs/development/mobile/cocoapods/Gemfile-beta.lock index 2e42e8bd23c..2ddffbf16b7 100644 --- a/pkgs/development/mobile/cocoapods/Gemfile-beta.lock +++ b/pkgs/development/mobile/cocoapods/Gemfile-beta.lock @@ -7,12 +7,15 @@ GEM minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) + algoliasearch (1.26.1) + httpclient (~> 2.8, >= 2.8.3) + json (>= 1.5.1) atomos (0.1.3) - claide (1.0.2) - cocoapods (1.7.5) + claide (1.0.3) + cocoapods (1.8.0.beta.1) activesupport (>= 4.0.2, < 5) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.7.5) + cocoapods-core (= 1.8.0.beta.1) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.2.2, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -27,9 +30,10 @@ GEM molinillo (~> 0.6.6) nap (~> 1.0) ruby-macho (~> 1.4) - xcodeproj (>= 1.10.0, < 2.0) - cocoapods-core (1.7.5) + xcodeproj (>= 1.11.1, < 2.0) + cocoapods-core (1.8.0.beta.1) activesupport (>= 4.0.2, < 6) + algoliasearch (~> 1.0) fuzzy_match (~> 2.0.4) nap (~> 1.0) cocoapods-deintegrate (1.0.4) @@ -48,8 +52,10 @@ GEM fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) + httpclient (2.8.3) i18n (0.9.5) concurrent-ruby (~> 1.0) + json (2.2.0) minitest (5.11.3) molinillo (0.6.6) nanaimo (0.2.6) @@ -59,7 +65,7 @@ GEM thread_safe (0.3.6) tzinfo (1.2.5) thread_safe (~> 0.1) - xcodeproj (1.11.0) + xcodeproj (1.12.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) diff --git a/pkgs/development/mobile/cocoapods/gemset-beta.nix b/pkgs/development/mobile/cocoapods/gemset-beta.nix index 7ae6e50de99..baa4748fb94 100644 --- a/pkgs/development/mobile/cocoapods/gemset-beta.nix +++ b/pkgs/development/mobile/cocoapods/gemset-beta.nix @@ -10,6 +10,17 @@ }; version = "4.2.11.1"; }; + algoliasearch = { + dependencies = ["httpclient" "json"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vlasxdgz49y75p8vjkbdpb4kmc73xv71d7vpn9x9xjgvsar03kp"; + type = "gem"; + }; + version = "1.26.1"; + }; atomos = { groups = ["default"]; platforms = []; @@ -35,10 +46,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0az54rp691hc42yl1xyix2cxv58byhaaf4gxbpghvvq29l476rzc"; + sha256 = "0kasxsms24fgcdsq680nz99d5lazl9rmz1qkil2y5gbbssx89g0z"; type = "gem"; }; - version = "1.0.2"; + version = "1.0.3"; }; cocoapods = { dependencies = ["activesupport" "claide" "cocoapods-core" "cocoapods-deintegrate" "cocoapods-downloader" "cocoapods-plugins" "cocoapods-search" "cocoapods-stats" "cocoapods-trunk" "cocoapods-try" "colored2" "escape" "fourflusher" "gh_inspector" "molinillo" "nap" "ruby-macho" "xcodeproj"]; @@ -46,21 +57,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02gnm6l7f3pxmy7bqns0dhxmanlqp01hkpvng5cxryww17zrq2qz"; + sha256 = "1gs9ybf1zbajhsn591dwh2papj0bs1dzbnw8shbsm4mfqz976y54"; type = "gem"; }; - version = "1.7.5"; + version = "1.8.0.beta.1"; }; cocoapods-core = { - dependencies = ["activesupport" "fuzzy_match" "nap"]; + dependencies = ["activesupport" "algoliasearch" "fuzzy_match" "nap"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i53x5lhlvyirls2ch45x9wsrfqk7s3zp85lbnwps9abimxj4nh4"; + sha256 = "02c0415b7iridf0gypajm4i3vqpq8zs6vx8bw49rm70l554jp14j"; type = "gem"; }; - version = "1.7.5"; + version = "1.8.0.beta.1"; }; cocoapods-deintegrate = { groups = ["default"]; @@ -194,6 +205,16 @@ }; version = "1.1.3"; }; + httpclient = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19mxmvghp7ki3klsxwrlwr431li7hm1lczhhj8z4qihl2acy8l99"; + type = "gem"; + }; + version = "2.8.3"; + }; i18n = { dependencies = ["concurrent-ruby"]; groups = ["default"]; @@ -205,6 +226,16 @@ }; version = "0.9.5"; }; + json = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0sx97bm9by389rbzv8r1f43h06xcz8vwi3h5jv074gvparql7lcx"; + type = "gem"; + }; + version = "2.2.0"; + }; minitest = { groups = ["default"]; platforms = []; @@ -292,9 +323,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1h73ilwyjwyyhj761an3pmicllw50514gxb6b1r4z4klc9rzxw4j"; + sha256 = "162gwhrl7ppj6hlmnpp1scvy1ylcv5xqk51826v075sckdqjp8c8"; type = "gem"; }; - version = "1.11.0"; + version = "1.12.0"; }; } \ No newline at end of file diff --git a/pkgs/development/ocaml-modules/camomile/default.nix b/pkgs/development/ocaml-modules/camomile/default.nix index 48bd3767742..ff0cb4aa3fe 100644 --- a/pkgs/development/ocaml-modules/camomile/default.nix +++ b/pkgs/development/ocaml-modules/camomile/default.nix @@ -1,28 +1,20 @@ -{ stdenv, fetchFromGitHub, ocaml, dune, cppo, findlib }: +{ stdenv, fetchFromGitHub, buildDunePackage, cppo }: -stdenv.mkDerivation rec { +buildDunePackage rec { pname = "camomile"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "yoriyuki"; repo = pname; rev = version; - sha256 = "1pfxr9kzkpd5bsdqrpxasfxkawwkg4cpx3m1h6203sxi7qv1z3fn"; + sha256 = "00i910qjv6bpk0nkafp5fg97isqas0bwjf7m6rz11rsxilpalzad"; }; - buildInputs = [ ocaml dune findlib cppo ]; + buildInputs = [ cppo ]; configurePhase = "ocaml configure.ml --share $out/share/camomile"; - # Use jbuilder executable because it breaks on dune>=1.10 - # https://github.com/yoriyuki/Camomile/commit/505202b58e22628f80bbe15ee76b9470a5bd2f57#r33816944 - buildPhase = '' - jbuilder build -p ${pname} - ''; - - inherit (dune) installPhase; - meta = { inherit (src.meta) homepage; maintainers = [ stdenv.lib.maintainers.vbgl ]; diff --git a/pkgs/development/ocaml-modules/cmdliner/default.nix b/pkgs/development/ocaml-modules/cmdliner/default.nix index 0a1a30a3473..271ec1f2af9 100644 --- a/pkgs/development/ocaml-modules/cmdliner/default.nix +++ b/pkgs/development/ocaml-modules/cmdliner/default.nix @@ -8,8 +8,8 @@ assert stdenv.lib.versionAtLeast ocaml.version "4.01.0"; let param = if stdenv.lib.versionAtLeast ocaml.version "4.03" then { - version = "1.0.3"; - sha256 = "0g3w4hvc1cx9x2yp5aqn6m2rl8lf9x1dn754hfq8m1sc1102lxna"; + version = "1.0.4"; + sha256 = "1h04q0zkasd0mw64ggh4y58lgzkhg6yhzy60lab8k8zq9ba96ajw"; } else { version = "1.0.2"; sha256 = "18jqphjiifljlh9jg8zpl6310p3iwyaqphdkmf89acyaix0s4kj1"; diff --git a/pkgs/development/ocaml-modules/elpi/default.nix b/pkgs/development/ocaml-modules/elpi/default.nix index c00af00b859..2542b5dd913 100644 --- a/pkgs/development/ocaml-modules/elpi/default.nix +++ b/pkgs/development/ocaml-modules/elpi/default.nix @@ -4,13 +4,13 @@ buildDunePackage rec { pname = "elpi"; - version = "1.4.1"; + version = "1.6.0"; src = fetchFromGitHub { owner = "LPCIC"; repo = "elpi"; rev = "v${version}"; - sha256 = "0sj2jbimg3jqwz4bsfcdqbrh45bb1dbgxj5g234pg1xjy9kxzl2w"; + sha256 = "0740a9bg33g7r3injpalmn2jd0h586481vrrkdw46nsaspwcjhza"; }; minimumOCamlVersion = "4.04"; diff --git a/pkgs/development/ocaml-modules/minisat/default.nix b/pkgs/development/ocaml-modules/minisat/default.nix new file mode 100644 index 00000000000..79820b16e6c --- /dev/null +++ b/pkgs/development/ocaml-modules/minisat/default.nix @@ -0,0 +1,22 @@ +{ lib, buildDunePackage, fetchFromGitHub }: + +buildDunePackage rec { + pname = "minisat"; + version = "0.2"; + + minimumOCamlVersion = "4.05"; + + src = fetchFromGitHub { + owner = "c-cube"; + repo = "ocaml-minisat"; + rev = version; + sha256 = "1jibylmb1ww0x42n6wl8bdwicaysgxp0ag244x7w5m3jifq3xs6q"; + }; + + meta = { + homepage = https://c-cube.github.io/ocaml-minisat/; + description = "Simple bindings to Minisat-C"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ mgttlinger ]; + }; +} diff --git a/pkgs/development/ocaml-modules/mmap/default.nix b/pkgs/development/ocaml-modules/mmap/default.nix new file mode 100644 index 00000000000..8ae1f4a9d47 --- /dev/null +++ b/pkgs/development/ocaml-modules/mmap/default.nix @@ -0,0 +1,18 @@ +{ lib, buildDunePackage, fetchurl }: + +buildDunePackage rec { + pname = "mmap"; + version = "1.1.0"; + + src = fetchurl { + url = "https://github.com/mirage/mmap/releases/download/v${version}/mmap-v${version}.tbz"; + sha256 = "0l6waidal2n8mkdn74avbslvc10sf49f5d889n838z03pra5chsc"; + }; + + meta = { + homepage = "https://github.com/mirage/mmap"; + description = "Function for mapping files in memory"; + license = lib.licenses.lgpl21; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix index 38050bc09a1..23940ef1499 100644 --- a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "ocaml-migrate-parsetree"; - version = "1.2.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "ocaml-ppx"; repo = pname; rev = "v${version}"; - sha256 = "16kas19iwm4afijv3yxd250s08absabmdcb4yj57wc8r4fmzv5dm"; + sha256 = "0sv1p4615l8gpbah4ya2c40yr6fbvahvv3ks7zhrsgcwcq2ljyr2"; }; propagatedBuildInputs = [ ppx_derivers result ]; diff --git a/pkgs/development/ocaml-modules/ocaml-sat-solvers/default.nix b/pkgs/development/ocaml-modules/ocaml-sat-solvers/default.nix new file mode 100644 index 00000000000..12f1440118a --- /dev/null +++ b/pkgs/development/ocaml-modules/ocaml-sat-solvers/default.nix @@ -0,0 +1,24 @@ +{ lib, fetchFromGitHub, buildOasisPackage, minisat }: + +buildOasisPackage rec { + pname = "ocaml-sat-solvers"; + version = "0.4"; + + minimumOCamlVersion = "4.03.0"; + + src = fetchFromGitHub { + owner = "tcsprojects"; + repo = "ocaml-sat-solvers"; + rev = "v${version}"; + sha256 = "1hxr16cyl1p1k1cik848mqrysq95wxmlykpm93a99pn55mp28938"; + }; + + propagatedBuildInputs = [ minisat ]; + + meta = { + homepage = https://github.com/tcsprojects/ocaml-sat-solvers; + description = "SAT Solvers For OCaml"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ mgttlinger ]; + }; +} diff --git a/pkgs/development/ocaml-modules/ocsigen-start/default.nix b/pkgs/development/ocaml-modules/ocsigen-start/default.nix index 4bc9b7f8629..1287c9b80b5 100644 --- a/pkgs/development/ocaml-modules/ocsigen-start/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-start/default.nix @@ -1,14 +1,13 @@ -{ stdenv, fetchFromGitHub, buildOcaml, ocsigen-toolkit, eliom, ocaml_pcre, pgocaml, macaque, safepass, yojson, ocsigen_deriving, ocsigen_server +{ stdenv, fetchFromGitHub, ocaml, findlib, ocsigen-toolkit, eliom, ocaml_pcre, pgocaml, macaque, safepass, yojson, ocsigen_deriving, ocsigen_server , js_of_ocaml-camlp4 , resource-pooling }: -buildOcaml rec -{ - name = "ocsigen-start"; - version = "1.5.0"; +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-ocsigen-start-${version}"; + version = "1.8.0"; - buildInputs = [ eliom js_of_ocaml-camlp4 ]; + buildInputs = [ ocaml findlib eliom js_of_ocaml-camlp4 ]; propagatedBuildInputs = [ pgocaml macaque safepass ocaml_pcre ocsigen-toolkit yojson ocsigen_deriving ocsigen_server resource-pooling ]; patches = [ ./templates-dir.patch ]; @@ -16,12 +15,14 @@ buildOcaml rec postPatch = '' substituteInPlace "src/os_db.ml" --replace "citext" "text" ''; + + createFindlibDestdir = true; src = fetchFromGitHub { owner = "ocsigen"; - repo = name; + repo = "ocsigen-start"; rev = version; - sha256 = "07478hz5jhxb242hfr808516k81vdbzj4j6cycvls3b9lzbyszha"; + sha256 = "0h5gp06vxy6jpppz1x840gyf9viiy7lic7spx7fxldpy2jpv058s"; }; meta = { @@ -31,6 +32,7 @@ buildOcaml rec An Eliom application skeleton, ready to use to build your own application with users, (pre)registration, notifications, etc. ''; license = stdenv.lib.licenses.lgpl21; + inherit (ocaml.meta) platforms; maintainers = [ stdenv.lib.maintainers.gal_bolle ]; }; diff --git a/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix b/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix index 4e46c1534d8..6c9e72f95d7 100644 --- a/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { pname = "ocsigen-toolkit"; name = "ocaml${ocaml.version}-${pname}-${version}"; - version = "2.0.0"; + version = "2.2.0"; propagatedBuildInputs = [ calendar eliom js_of_ocaml-ppx_deriving_json ]; buildInputs = [ ocaml findlib opaline ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { owner = "ocsigen"; repo = pname; rev = version; - sha256 = "0gkiqw3xi31l9q9h89fnr5gfmxi9w9lg9rlv16h4ssjgrgq3y5cw"; + sha256 = "0qy6501jf81qcmkbicgrb1x4pxsjkhr40plwdn09w37d8vx9va3s"; }; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/pgocaml/default.nix b/pkgs/development/ocaml-modules/pgocaml/default.nix index f4d1ef829bb..cf3cd3272a8 100644 --- a/pkgs/development/ocaml-modules/pgocaml/default.nix +++ b/pkgs/development/ocaml-modules/pgocaml/default.nix @@ -1,21 +1,26 @@ -{ stdenv, fetchurl, buildOcaml, ocaml, calendar, csv, re }: +{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, camlp4 +, ppx_tools_versioned, result, rresult +, calendar, csv, hex, re +}: -if !stdenv.lib.versionAtLeast ocaml.version "4" +if !stdenv.lib.versionAtLeast ocaml.version "4.05" then throw "pgocaml is not available for OCaml ${ocaml.version}" else -buildOcaml { - name = "pgocaml"; - version = "2.3"; - src = fetchurl { - url = https://github.com/darioteixeira/pgocaml/archive/v2.3.tar.gz; - sha256 = "18lymxlvcf4nwxawkidq3pilsp5rhl0l8ifq6pjk3ssjlx9w53pg"; +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-pgocaml-${version}"; + version = "3.2"; + src = fetchFromGitHub { + owner = "darioteixeira"; + repo = "pgocaml"; + rev = "v${version}"; + sha256 = "0jxzr5niv8kdh90pr57b1qb500zkkasxb8b8l7w9cydcfprnlk24"; }; - buildInputs = [ ]; - propagatedBuildInputs = [ calendar csv re ]; + buildInputs = [ ocaml findlib ocamlbuild camlp4 ppx_tools_versioned result rresult ]; + propagatedBuildInputs = [ calendar csv hex re ]; - configureFlags = [ "--enable-p4" ]; + configureFlags = [ "--enable-p4" "--enable-ppx" ]; createFindlibDestdir = true; @@ -24,5 +29,6 @@ buildOcaml { homepage = http://pgocaml.forge.ocamlcore.org/; license = licenses.lgpl2; maintainers = with maintainers; [ vbgl ]; + inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/pgsolver/default.nix b/pkgs/development/ocaml-modules/pgsolver/default.nix new file mode 100644 index 00000000000..5045cb6a0ee --- /dev/null +++ b/pkgs/development/ocaml-modules/pgsolver/default.nix @@ -0,0 +1,23 @@ +{ lib, fetchFromGitHub, buildOasisPackage, ounit, tcslib, ocaml-sat-solvers }: + +buildOasisPackage rec { + pname = "pgsolver"; + version = "4.1"; + + src = fetchFromGitHub { + owner = "tcsprojects"; + repo = "pgsolver"; + rev = "v${version}"; + sha256 = "16skrn8qql9djpray25xv66rjgfl20js5wqnxyq1763nmyizyj8a"; + }; + + buildInputs = [ ounit ]; + propagatedBuildInputs = [ tcslib ocaml-sat-solvers ]; + + meta = { + homepage = https://github.com/tcsprojects/pgsolver; + description = "A collection of tools for generating, manipulating and - most of all - solving parity games"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ mgttlinger ]; + }; +} diff --git a/pkgs/development/ocaml-modules/tcslib/default.nix b/pkgs/development/ocaml-modules/tcslib/default.nix new file mode 100644 index 00000000000..9d1d5a8096c --- /dev/null +++ b/pkgs/development/ocaml-modules/tcslib/default.nix @@ -0,0 +1,25 @@ +{ lib, fetchFromGitHub, ocamlPackages, buildOasisPackage, ounit, ocaml_extlib, num }: + +buildOasisPackage rec { + pname = "tcslib"; + version = "0.3"; + + minimumOCamlVersion = "4.03.0"; + + src = fetchFromGitHub { + owner = "tcsprojects"; + repo = "tcslib"; + rev = "v${version}"; + sha256 = "05g6m82blsccq8wx8knxv6a5fzww7hi624jx91f9h87nk2fsplhi"; + }; + + buildInputs = [ ounit ]; + propagatedBuildInputs = [ ocaml_extlib num ]; + + meta = { + homepage = https://github.com/tcsprojects/tcslib; + description = "A multi-purpose library for OCaml"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ mgttlinger ]; + }; +} diff --git a/pkgs/development/ocaml-modules/zarith/default.nix b/pkgs/development/ocaml-modules/zarith/default.nix index 1d331090a44..cb90c200547 100644 --- a/pkgs/development/ocaml-modules/zarith/default.nix +++ b/pkgs/development/ocaml-modules/zarith/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildOcaml, fetchurl +{ stdenv, fetchurl , ocaml, findlib, pkgconfig, perl , gmp }: @@ -16,31 +16,27 @@ let source = }; in -buildOcaml rec { - name = "zarith"; +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-zarith-${version}"; inherit (source) version; src = fetchurl { inherit (source) url sha256; }; - minimumSupportedOcamlVersion = "3.12.1"; - nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ocaml findlib perl ]; propagatedBuildInputs = [ gmp ]; - # needed so setup-hook.sh sets CAML_LD_LIBRARY_PATH for dllzarith.so - hasSharedObjects = true; - patchPhase = "patchShebangs ./z_pp.pl"; configurePhase = '' ./configure -installdir $out/lib/ocaml/${ocaml.version}/site-lib ''; - preInstall = "mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib"; + + preInstall = "mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs"; meta = with stdenv.lib; { description = "Fast, arbitrary precision OCaml integers"; homepage = "http://forge.ocamlcore.org/projects/zarith"; license = licenses.lgpl2; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; maintainers = with maintainers; [ thoughtpolice vbgl ]; }; } diff --git a/pkgs/development/python-modules/APScheduler/default.nix b/pkgs/development/python-modules/APScheduler/default.nix index 5c8ec07f4bb..4032b527e88 100644 --- a/pkgs/development/python-modules/APScheduler/default.nix +++ b/pkgs/development/python-modules/APScheduler/default.nix @@ -20,11 +20,11 @@ buildPythonPackage rec { pname = "APScheduler"; - version = "3.6.0"; + version = "3.6.1"; src = fetchPypi { inherit pname version; - sha256 = "0q22lgp001hkk4z4xs2b2hlix84ka15i576p33fmgp69zn4bhmlg"; + sha256 = "1c56066rx09xk1zbd156whsynlakxazqq64i509id17015wzp6jj"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/aiosmtpd/default.nix b/pkgs/development/python-modules/aiosmtpd/default.nix new file mode 100644 index 00000000000..9e053c718c8 --- /dev/null +++ b/pkgs/development/python-modules/aiosmtpd/default.nix @@ -0,0 +1,32 @@ +{ lib, isPy3k, fetchPypi, buildPythonPackage +, atpublic }: + +buildPythonPackage rec { + pname = "aiosmtpd"; + version = "1.2"; + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "1xdfk741pjmz1cm8dsi4n5vq4517i175rm94696m3f7kcgk7xsmp"; + }; + + propagatedBuildInputs = [ + atpublic + ]; + + # Tests need network access + doCheck = false; + + meta = with lib; { + homepage = https://aiosmtpd.readthedocs.io/en/latest/; + description = "Asyncio based SMTP server"; + longDescription = '' + This is a server for SMTP and related protocols, similar in utility to the + standard library's smtpd.py module, but rewritten to be based on asyncio for + Python 3. + ''; + license = licenses.asl20; + maintainers = with maintainers; [ eadwu ]; + }; +} diff --git a/pkgs/development/python-modules/altair/default.nix b/pkgs/development/python-modules/altair/default.nix index 4d78ad80cc3..344a724756e 100644 --- a/pkgs/development/python-modules/altair/default.nix +++ b/pkgs/development/python-modules/altair/default.nix @@ -1,30 +1,52 @@ { stdenv, buildPythonPackage, fetchPypi -, pytest, jinja2, sphinx, vega_datasets, ipython, glibcLocales -, entrypoints, jsonschema, numpy, pandas, six, toolz, typing -, pythonOlder, recommonmark }: +, entrypoints +, glibcLocales +, ipython +, jinja2 +, jsonschema +, numpy +, pandas +, pytest +, pythonOlder +, recommonmark +, six +, sphinx +, toolz +, typing +, vega_datasets +}: buildPythonPackage rec { pname = "altair"; - version = "3.1.0"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "1zdznkybw3g8fd280h5j5cnnwcv30610gp8fl8vwqda1w2p6pgvp"; + sha256 = "098macm0sw54xqijdy1c8cppcgw79wn52qdc71qqb51nibc17gls"; }; - postPatch = '' - # Tests require network - rm altair/examples/boxplot_max_min.py altair/examples/line_percent.py - ''; - - checkInputs = [ pytest jinja2 sphinx vega_datasets ipython glibcLocales recommonmark ]; + propagatedBuildInputs = [ + entrypoints + jsonschema + numpy + pandas + six + toolz + ] ++ stdenv.lib.optionals (pythonOlder "3.5") [ typing ]; - propagatedBuildInputs = [ entrypoints jsonschema numpy pandas six toolz ] - ++ stdenv.lib.optionals (pythonOlder "3.5") [ typing ]; + checkInputs = [ + glibcLocales + ipython + jinja2 + pytest + recommonmark + sphinx + vega_datasets + ]; checkPhase = '' export LANG=en_US.UTF-8 - py.test altair --doctest-modules + pytest --doctest-modules altair ''; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/apprise/default.nix b/pkgs/development/python-modules/apprise/default.nix index e067504987d..7b8885de169 100644 --- a/pkgs/development/python-modules/apprise/default.nix +++ b/pkgs/development/python-modules/apprise/default.nix @@ -1,21 +1,21 @@ { lib, buildPythonPackage, fetchPypi -, Babel, decorator, requests, requests_oauthlib, oauthlib, urllib3, six, click, markdown, pyyaml +, Babel, decorator, requests, requests_oauthlib, six, click, markdown, pyyaml , pytestrunner, coverage, flake8, mock, pytest, pytestcov, tox }: buildPythonPackage rec { pname = "apprise"; - version = "0.7.8"; + version = "0.7.9"; src = fetchPypi { inherit pname version; - sha256 = "15xv7lhivjhgsaw5j30w1fkk8y33r8nkr2hwp8z1jmsxhdv9l03y"; + sha256 = "0zqnk255d311ibird08sv0c21fw1r1xhldhyx5lnl3ji1xkv9173"; }; nativeBuildInputs = [ Babel ]; propagatedBuildInputs = [ - decorator requests requests_oauthlib oauthlib urllib3 six click markdown pyyaml + decorator requests requests_oauthlib six click markdown pyyaml ]; checkInputs = [ diff --git a/pkgs/development/python-modules/ase/3.17.nix b/pkgs/development/python-modules/ase/3.17.nix new file mode 100644 index 00000000000..3a466170c77 --- /dev/null +++ b/pkgs/development/python-modules/ase/3.17.nix @@ -0,0 +1,36 @@ +{ lib +, fetchPypi +, buildPythonPackage +, numpy +, scipy +, matplotlib +, flask +, pillow +, psycopg2 +}: + +buildPythonPackage rec { + pname = "ase"; + version = "3.17.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1d4gxypaahby45zcpl0rffcn2z7n55dg9lcd8sv6jjsmbbf9vr4g"; + }; + + propagatedBuildInputs = [ numpy scipy matplotlib flask pillow psycopg2 ]; + + checkPhase = '' + $out/bin/ase test + ''; + + # tests just hang most likely due to something with subprocesses and cli + doCheck = false; + + meta = with lib; { + description = "Atomic Simulation Environment"; + homepage = https://wiki.fysik.dtu.dk/ase/; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/ase/default.nix b/pkgs/development/python-modules/ase/default.nix index 3a466170c77..643bafe617a 100644 --- a/pkgs/development/python-modules/ase/default.nix +++ b/pkgs/development/python-modules/ase/default.nix @@ -1,6 +1,7 @@ { lib , fetchPypi , buildPythonPackage +, isPy27 , numpy , scipy , matplotlib @@ -11,11 +12,12 @@ buildPythonPackage rec { pname = "ase"; - version = "3.17.0"; + version = "3.18.0"; + disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1d4gxypaahby45zcpl0rffcn2z7n55dg9lcd8sv6jjsmbbf9vr4g"; + sha256 = "1ycp1yksysiiz902gn762030sfmirxm950pwpw2rcrpjvq95zm1r"; }; propagatedBuildInputs = [ numpy scipy matplotlib flask pillow psycopg2 ]; diff --git a/pkgs/development/python-modules/asgiref/default.nix b/pkgs/development/python-modules/asgiref/default.nix index 84c157e1bcd..295bc750f82 100644 --- a/pkgs/development/python-modules/asgiref/default.nix +++ b/pkgs/development/python-modules/asgiref/default.nix @@ -1,6 +1,6 @@ { stdenv, buildPythonPackage, pythonOlder, fetchFromGitHub, async-timeout, pytest, pytest-asyncio }: buildPythonPackage rec { - version = "3.1.4"; + version = "3.2.1"; pname = "asgiref"; disabled = pythonOlder "3.5"; @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "django"; repo = pname; rev = version; - sha256 = "0rmasjrvf083c7855xnggy251gm8vaxyv970b2rd6198h8s3rldh"; + sha256 = "16wb137dvnjmbmshy4r9vgsfjc4g8d6l527aj9d5vszyk5x5fm7d"; }; propagatedBuildInputs = [ async-timeout ]; diff --git a/pkgs/development/python-modules/asyncpg/default.nix b/pkgs/development/python-modules/asyncpg/default.nix new file mode 100644 index 00000000000..a71ffd85367 --- /dev/null +++ b/pkgs/development/python-modules/asyncpg/default.nix @@ -0,0 +1,38 @@ +{ lib, isPy3k, fetchPypi, fetchpatch, buildPythonPackage +, uvloop, postgresql }: + +buildPythonPackage rec { + pname = "asyncpg"; + version = "0.18.3"; + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "0rrch478ww6ipmh3617sb2jzwsq4w7pjcck869p35zb0mk5fr9aq"; + }; + + patches = [ + (fetchpatch { + url = "https://github.com/MagicStack/asyncpg/commit/aaeb7076e5acb045880b46155014c0640624797e.patch"; + sha256 = "0r6g6pvb39vzci8g67mv9rlrvavqvfz6vlv8988wv53bpz1mss3p"; + }) + ]; + + checkInputs = [ + uvloop + postgresql + ]; + + meta = with lib; { + homepage = https://github.com/MagicStack/asyncpg; + description = "An asyncio PosgtreSQL driver"; + longDescription = '' + Asyncpg is a database interface library designed specifically for + PostgreSQL and Python/asyncio. asyncpg is an efficient, clean + implementation of PostgreSQL server binary protocol for use with Python’s + asyncio framework. + ''; + license = licenses.asl20; + maintainers = with maintainers; [ eadwu ]; + }; +} diff --git a/pkgs/development/python-modules/asyncssh/default.nix b/pkgs/development/python-modules/asyncssh/default.nix index 42335a0393f..ba94e395f67 100644 --- a/pkgs/development/python-modules/asyncssh/default.nix +++ b/pkgs/development/python-modules/asyncssh/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "asyncssh"; - version = "1.17.0"; + version = "1.17.1"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "1qrpkdyl77956qg6g7g66bbd6bfvb2nwi2sjy3v3li8m3irx8d7d"; + sha256 = "0gyqms4zs9j9k7dgy24va4w42vf20x75yx9jvsds0sg42mqlkd5v"; }; patches = [ diff --git a/pkgs/development/python-modules/atpublic/default.nix b/pkgs/development/python-modules/atpublic/default.nix new file mode 100644 index 00000000000..6657b41cc78 --- /dev/null +++ b/pkgs/development/python-modules/atpublic/default.nix @@ -0,0 +1,38 @@ +{ lib, isPy3k, fetchPypi, buildPythonPackage +, pytest }: + +buildPythonPackage rec { + pname = "atpublic"; + version = "1.0"; + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "0i3sbxkdlbb4560rrlmwwd5y4ps7k73lp4d8wnmd7ag9k426gjkx"; + }; + + checkInputs = [ + pytest + ]; + + checkPhase = '' + pytest --pyargs public + ''; + + meta = with lib; { + homepage = https://public.readthedocs.io/en/latest/; + description = "A decorator and function which populates a module's __all__ and globals"; + longDescription = '' + This is a very simple decorator and function which populates a module's + __all__ and optionally the module globals. + + This provides both a pure-Python implementation and a C implementation. It is + proposed that the C implementation be added to builtins_ for Python 3.6. + + This proposal seems to have been rejected, for more information see + https://bugs.python.org/issue26632. + ''; + license = licenses.asl20; + maintainers = with maintainers; [ eadwu ]; + }; +} diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index d93703c00c4..a2d19e9ee3c 100644 --- a/pkgs/development/python-modules/awkward/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "awkward"; - version = "0.11.1"; + version = "0.12.6"; src = fetchPypi { inherit pname version; - sha256 = "07m797jc5lpaj6m8469d67l2s43jf8w0mfhy0hfvbfs4mk0cjix0"; + sha256 = "0xvphwpa1n5q7kim4dw6fmsg9h5kkk7nd51bv9b36i3n4hilmq32"; }; nativeBuildInputs = [ pytestrunner ]; diff --git a/pkgs/development/python-modules/azure-batch/default.nix b/pkgs/development/python-modules/azure-batch/default.nix index 35ba2d25d5a..8297c67b90d 100644 --- a/pkgs/development/python-modules/azure-batch/default.nix +++ b/pkgs/development/python-modules/azure-batch/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "azure-batch"; - version = "6.0.1"; + version = "7.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "d5b0de3db0058cd69baf30e059874094abf865e24ccd82e3cd25f3a48b9676d1"; + sha256 = "1q8mdjdbz408z2j0y1zxqg9zg8j1v84p0dnh621vq73a2x1g298j"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-graphrbac/default.nix b/pkgs/development/python-modules/azure-graphrbac/default.nix index c47c10f1418..f5c1131f660 100644 --- a/pkgs/development/python-modules/azure-graphrbac/default.nix +++ b/pkgs/development/python-modules/azure-graphrbac/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "0.61.0"; + version = "0.61.1"; pname = "azure-graphrbac"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "4ab27db29d730e4d35f420466500f8ee60a26a8151dbd121a6c353ccd9d4ee55"; + sha256 = "1qmjhpqw0sgy406ij5xyzkffisjah9m1pfz9x54v66bwrbi8msak"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-authorization/default.nix b/pkgs/development/python-modules/azure-mgmt-authorization/default.nix index c94620e0b15..7953234f6e2 100644 --- a/pkgs/development/python-modules/azure-mgmt-authorization/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-authorization/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-authorization"; - version = "0.51.1"; + version = "0.52.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "d2789e21c6b85591b38d5d4e9b835b6546824c14e14aaa366da0ef50a95d2478"; + sha256 = "0357laxgldb7lvvws81r8xb6mrq9dwwnr1bnwdnyj4bw6p21i9hn"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix b/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix index e32182225f1..fd74008c1bf 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-containerinstance"; - version = "1.4.1"; + version = "1.5.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "87919f3e618ec0a40fd163d763113eef908e78c50d8b76bf4dd795444cb069fd"; + sha256 = "1kd8lxm5kzk0wxbw1f3vin10hlhb4sygrxqd5c8k715s0ipkhmdh"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix index 6741686b0d4..72be0b3dbb9 100644 --- a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-cosmosdb"; - version = "0.6.0"; + version = "0.7.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0g4znanx540p983gzr55z0n0jyzfnzmnzlshl92hm4gldwjdd91d"; + sha256 = "1d9xzf9ydlhwlsk7ij64ji1r2j0l7bwaykwngcy5lh8sdxax305r"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix b/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix index 26b90029977..9d1bdb7a013 100644 --- a/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-datamigration"; - version = "2.1.0"; + version = "2.2.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "49e6e68093e2d647c1c54a4027dee5b1d57f7e7c21480ae386c55cb3d5fa14bc"; + sha256 = "0bixyya9afas0sv2wji7ivfi64z4dvv8p1gjnppibi5zas1mb4zw"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-dns/default.nix b/pkgs/development/python-modules/azure-mgmt-dns/default.nix index 6f802eb6144..55b5633cfe9 100644 --- a/pkgs/development/python-modules/azure-mgmt-dns/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-dns/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-dns"; - version = "2.1.0"; + version = "3.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "3730b1b3f545a5aa43c0fff07418b362a789eb7d81286e2bed90ffef88bfa5d0"; + sha256 = "0zxkcczf01b64qfwj98jqdvnwqahygcyccf37rcxpdcfgpkg9kbf"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix b/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix index 8887a8b2776..93f3006966c 100644 --- a/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-eventgrid"; - version = "2.0.0"; + version = "2.2.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "9a1da1085d39163b13dee14215b02f18eab93ede10ffe83dc6030ecf2163d2f1"; + sha256 = "1hqwcl33r98lriz3fp6h8ir36bv9danx27290idv63fj7s95h866"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix b/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix index 1c0c3c5a866..188789e171c 100644 --- a/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-eventhub"; - version = "2.6.0"; + version = "3.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1nnp2ki4iz4f4897psmwb0v5khrwh84fgxja7nl7g73g3ym20sz8"; + sha256 = "05c6isg13dslds94kv28v6navxj4bp4c5lsd9df0g3ndsxvpdrxp"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix b/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix index 3b786cbf760..b640f7eef0c 100644 --- a/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "azure-mgmt-keyvault"; - version = "1.1.0"; + version = "2.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "05a15327a922441d2ba32add50a35c7f1b9225727cbdd3eeb98bc656e4684099"; + sha256 = "057ii54h8yr7rhfnbl0r29xbsg7mhf031hjffmdv0zf93552kmja"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-monitor/default.nix b/pkgs/development/python-modules/azure-mgmt-monitor/default.nix index 0a6f045dc4b..3233e9bc00e 100644 --- a/pkgs/development/python-modules/azure-mgmt-monitor/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-monitor/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-monitor"; - version = "0.6.0"; + version = "0.7.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "5a804dae2c3e31bfd6f1b0482d49761b9a56f7eefa9b190cd76ef5fe1d504ef2"; + sha256 = "1pprvk5255b6brbw73g0g13zygwa7a2px5x08wy3153rqlzan5l2"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix b/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix index 881727e383b..2c5e2d1f2ea 100644 --- a/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-rdbms"; - version = "1.8.0"; + version = "1.9.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "40abbe4f9c59d7906594ceed067d0e7d09fef44be0d16aded5d5717f1a8aa5ea"; + sha256 = "0v91hl936wp9sl3bc31svf6kdxwa57qh6ih9rrv43dnb2000km6r"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix b/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix index 49247e87801..0b91309cac3 100644 --- a/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "azure-mgmt-recoveryservicesbackup"; - version = "0.3.0"; + version = "0.4.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1e55b6cbb808df83576cef352ba0065f4878fe505299c0a4c5a97f4f1e5793df"; + sha256 = "0zssvzdip23yzaxlac9rlzg9mlyjl97fwr0gj8y27z8j58pwj72i"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-resource/default.nix b/pkgs/development/python-modules/azure-mgmt-resource/default.nix index 3689f85f225..c8574680c17 100644 --- a/pkgs/development/python-modules/azure-mgmt-resource/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-resource/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { - version = "2.1.0"; + version = "2.2.0"; pname = "azure-mgmt-resource"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "aef8573066026db04ed3e7c5e727904e42f6462b6421c2e8a3646e4c4f8128be"; + sha256 = "173pxgly95dwblp4nj4l70zb0gasibgcjmcynxwa5282plynhgdw"; }; postInstall = if isPy3k then "" else '' diff --git a/pkgs/development/python-modules/azure-mgmt-search/default.nix b/pkgs/development/python-modules/azure-mgmt-search/default.nix index 6ae9693e7f5..cc287589809 100644 --- a/pkgs/development/python-modules/azure-mgmt-search/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-search/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "azure-mgmt-search"; - version = "2.0.0"; + version = "2.1.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0ec5de861bd786bcb8691322feed6e6caa8d2f0806a50dc0ca5d640591926893"; + sha256 = "0085c7qi9z1ayxd8683ck79nfnldkrwl481hzav84flyg8d0m94j"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix b/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix index 54c695a5079..3dad2bccdc2 100644 --- a/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "azure-mgmt-servicefabric"; - version = "0.2.0"; + version = "0.3.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "b2bf2279b8ff8450c35e78e226231655021482fdbda27db09975ebfc983398ad"; + sha256 = "0cirsp8wnsswba6gbmw4s2ljsjwi3855my063gvi2mqr55spvx2n"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-signalr/default.nix b/pkgs/development/python-modules/azure-mgmt-signalr/default.nix index d1671e02ec1..5751bfb042c 100644 --- a/pkgs/development/python-modules/azure-mgmt-signalr/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-signalr/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "azure-mgmt-signalr"; - version = "0.1.1"; + version = "0.2.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "8a6266a59a5c69102e274806ccad3ac74b06fd2c226e16426bbe248fc2174903"; + sha256 = "0k39hf6r2rfy2wyxd9czha2mwmcqf6sc1v69jyh6ml3slbliivlz"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-web/default.nix b/pkgs/development/python-modules/azure-mgmt-web/default.nix index f2beeb99ffb..019d5bdc1e0 100644 --- a/pkgs/development/python-modules/azure-mgmt-web/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-web/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-web"; - version = "0.41.0"; + version = "0.42.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "5f170f25c72119ff4b4e2f39d46ce21bdb2f399f786ea24eedc15c12cfba3054"; + sha256 = "0vp40i9aaw5ycz7s7qqir6jq7327f7zg9j9i8g31qkfl1h1c7pdn"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/betamax-serializers/default.nix b/pkgs/development/python-modules/betamax-serializers/default.nix index 2ad23f1f9e6..41341c24481 100644 --- a/pkgs/development/python-modules/betamax-serializers/default.nix +++ b/pkgs/development/python-modules/betamax-serializers/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "betamax-serializers"; - version = "0.2.0"; + version = "0.2.1"; src = fetchPypi { inherit pname version; - sha256 = "1yqzwx204m4lxlpg04cwv6iwzmcpdzr19wvj97vvxchp0g4qg83d"; + sha256 = "0ja9isbjmzzhxdj69s0kdsvw8nkp073w6an6a4liy5vk3fdl2p1l"; }; buildInputs = [ betamax pyyaml ]; diff --git a/pkgs/development/python-modules/biopython/default.nix b/pkgs/development/python-modules/biopython/default.nix index beb03c894be..e60d4c60aea 100644 --- a/pkgs/development/python-modules/biopython/default.nix +++ b/pkgs/development/python-modules/biopython/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "biopython"; - version = "1.73"; + version = "1.74"; src = fetchPypi { inherit pname version; - sha256 = "1q55jhf76z3k6is3psis0ckbki7df26x7dikpcc3vhk1vhkwribh"; + sha256 = "1h4hcpx1vqrcddpcznyxy14zzvy2yanlkz0117w5n869w8djq595"; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/boolean-py/default.nix b/pkgs/development/python-modules/boolean-py/default.nix new file mode 100644 index 00000000000..cf35243f2b0 --- /dev/null +++ b/pkgs/development/python-modules/boolean-py/default.nix @@ -0,0 +1,21 @@ +{ lib, buildPythonPackage, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "boolean.py"; + version = "3.6"; + + src = fetchFromGitHub { + owner = "bastikr"; + repo = "boolean.py"; + rev = "v${version}"; + sha256 = "1wc89y73va58cj7dsx6c199zpxsy9q53dsffsdj6zmc90inqz6qs"; + }; + + meta = with lib; { + homepage = "https://github.com/bastikr/boolean.py"; + description = "Implements boolean algebra in one module"; + license = licenses.bsd2; + }; + +} diff --git a/pkgs/development/python-modules/btrees/default.nix b/pkgs/development/python-modules/btrees/default.nix index 665d5347bba..828e243af9c 100644 --- a/pkgs/development/python-modules/btrees/default.nix +++ b/pkgs/development/python-modules/btrees/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "BTrees"; - version = "4.5.1"; + version = "4.6.0"; buildInputs = [ transaction ]; propagatedBuildInputs = [ persistent zope_interface ]; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "dcc096c3cf92efd6b9365951f89118fd30bc209c9af83bf050a28151a9992786"; + sha256 = "0bmkpg6z5z47p21340nyrfbdv2jkfp80yv085ndgbwaas1zi7ac9"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/capstone/default.nix b/pkgs/development/python-modules/capstone/default.nix index 91e00ed7e43..2bd22ebf0d9 100644 --- a/pkgs/development/python-modules/capstone/default.nix +++ b/pkgs/development/python-modules/capstone/default.nix @@ -6,11 +6,15 @@ buildPythonPackage rec { pname = "capstone"; - version = "3.0.4"; + version = "3.0.5.post1"; + + setupPyBuildFlags = [ + "--plat-name x86_64-linux" + ]; src = fetchPypi { inherit pname version; - sha256 = "945d3b8c3646a1c3914824c416439e2cf2df8969dd722c8979cdcc23b40ad225"; + sha256 = "3c0f73db9f8392f7048c8a244809f154d7c39f354e2167f6c477630aa517ed04"; }; patches = [ diff --git a/pkgs/development/python-modules/cfgv/default.nix b/pkgs/development/python-modules/cfgv/default.nix index f9eda427963..2487caea608 100644 --- a/pkgs/development/python-modules/cfgv/default.nix +++ b/pkgs/development/python-modules/cfgv/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cfgv"; - version = "2.0.0"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "0zn3nc7cyfsvg9gp7558656n2sn1m01j30l79ci22ibgvq4vxv9j"; + sha256 = "0i1iam461bd6bphd402r7payr2m71xivy5zp6k2gjnv67fa8gczd"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/click-default-group/default.nix b/pkgs/development/python-modules/click-default-group/default.nix index daf522fe653..eeee7370b7e 100644 --- a/pkgs/development/python-modules/click-default-group/default.nix +++ b/pkgs/development/python-modules/click-default-group/default.nix @@ -1,20 +1,20 @@ -{ lib, buildPythonPackage, fetchFromGitHub, click, pytest_3 }: +{ lib, buildPythonPackage, fetchFromGitHub, click, pytest }: buildPythonPackage rec { pname = "click-default-group"; - version = "1.2"; + version = "1.2.1"; # No tests in Pypi tarball src = fetchFromGitHub { owner = "click-contrib"; repo = "click-default-group"; rev = "v${version}"; - sha256 = "0lm2k4jvy4ilvv91niawklfnp5mp7wa8c1bicsqdfzrxmw7jliwp"; + sha256 = "1wdmabfpmzxpiww0slinvxm9xjyxql250dn1pvjijq675pxafiz4"; }; propagatedBuildInputs = [ click ]; - checkInputs = [ pytest_3 ]; + checkInputs = [ pytest ]; meta = with lib; { homepage = https://github.com/click-contrib/click-default-group; diff --git a/pkgs/development/python-modules/cnvkit/default.nix b/pkgs/development/python-modules/cnvkit/default.nix new file mode 100644 index 00000000000..905b274a055 --- /dev/null +++ b/pkgs/development/python-modules/cnvkit/default.nix @@ -0,0 +1,48 @@ +{ lib +, fetchPypi +, rPackages +, rWrapper +, buildPythonPackage +, biopython +, numpy +, scipy +, pandas +, matplotlib +, reportlab +, pysam +, future +, pillow +, pomegranate +, pyfaidx +}: + +buildPythonPackage rec { + pname = "CNVkit"; + version = "0.9.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "1hj8c98s538i0hg5mrz4bw4v07qmcl51rhxq611rj2nglnc9r25y"; + }; + + propagatedBuildInputs = [ + biopython + numpy + scipy + pandas + matplotlib + reportlab + pyfaidx + pysam + future + pillow + pomegranate + ]; + + meta = with lib; { + homepage = "https://cnvkit.readthedocs.io"; + description = "A Python library and command-line software toolkit to infer and visualize copy number from high-throughput DNA sequencing data"; + license = licenses.asl20; + maintainers = [ maintainers.jbedo ]; + }; +} diff --git a/pkgs/development/python-modules/codespell/default.nix b/pkgs/development/python-modules/codespell/default.nix new file mode 100644 index 00000000000..dfd0be09fab --- /dev/null +++ b/pkgs/development/python-modules/codespell/default.nix @@ -0,0 +1,26 @@ +{ lib, buildPythonApplication, fetchPypi, pytest, chardet }: +buildPythonApplication rec { + pname = "codespell"; + version = "1.15.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0c211rzfgmwls8ab8fj21xp9bhxk6ys3xw8w7chp4arjlifc26wg"; + }; + + checkInputs = [ pytest chardet ]; + checkPhase = '' + # We don't want to be affected by the presence of these + rm -r codespell_lib setup.cfg + # test_command assumes too much about the execution environment + pytest --pyargs codespell_lib.tests -k "not test_command" + ''; + + meta = { + description = "Fix common misspellings in source code"; + homepage = "https://github.com/codespell-project/codespell"; + license = with lib.licenses; [ gpl2 cc-by-sa-30 ]; + maintainers = with lib.maintainers; [ johnazoidberg ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/development/python-modules/colorcet/default.nix b/pkgs/development/python-modules/colorcet/default.nix index 6a7328aaf73..f92f8004ac0 100644 --- a/pkgs/development/python-modules/colorcet/default.nix +++ b/pkgs/development/python-modules/colorcet/default.nix @@ -1,4 +1,4 @@ -{ lib +{ stdenv , buildPythonPackage , fetchPypi , param @@ -35,10 +35,11 @@ buildPythonPackage rec { mkdir -p $HOME/.config/matplotlib echo "backend: ps" > $HOME/.config/matplotlib/matplotlibrc - pytest colorcet + # disable matplotlib tests on darwin, because it requires a framework build of Python + pytest ${stdenv.lib.optionalString stdenv.isDarwin "--ignore=colorcet/tests/test_matplotlib.py"} colorcet ''; - meta = with lib; { + meta = with stdenv.lib; { description = "Collection of perceptually uniform colormaps"; homepage = https://colorcet.pyviz.org; license = licenses.cc-by-40; diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index cd38c8f137c..ba8c06f73f2 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -1,7 +1,10 @@ { lib +, bokeh , buildPythonPackage , fetchPypi +, fsspec , pytest +, pythonOlder , cloudpickle , numpy , toolz @@ -12,15 +15,18 @@ buildPythonPackage rec { pname = "dask"; - version = "1.2.2"; + version = "2.2.0"; + + disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "5e7876bae2a01b355d1969b73aeafa23310febd8c353163910b73e93dc7e492c"; + sha256 = "0wkiqkckwy7fv6m86cs3m3g6jdikkkw84ki9hiwp60xpk5xngnf0"; }; checkInputs = [ pytest ]; - propagatedBuildInputs = [ cloudpickle numpy toolz dill pandas partd ]; + propagatedBuildInputs = [ + bokeh cloudpickle dill fsspec numpy pandas partd toolz ]; checkPhase = '' py.test dask diff --git a/pkgs/development/python-modules/deprecated/default.nix b/pkgs/development/python-modules/deprecated/default.nix new file mode 100644 index 00000000000..ee7c89d8167 --- /dev/null +++ b/pkgs/development/python-modules/deprecated/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchPypi, buildPythonPackage, + wrapt, pytest, tox }: + +buildPythonPackage rec { + pname = "Deprecated"; + version = "1.2.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "1hcw9y7dvhwg5flk6wy8aa4kkgpvcqq3q4jd53h54586fp7w85d5"; + }; + + postPatch = '' + # odd broken tests, don't appear in GitHub repo + rm tests/demo_classic_usage*.py + ''; + + propagatedBuildInputs = [ wrapt ]; + checkInputs = [ pytest ]; + meta = with stdenv.lib; { + homepage = "https://github.com/tantale/deprecated"; + description = "Python @deprecated decorator to deprecate old python classes, functions or methods"; + platforms = platforms.all; + license = licenses.mit; + maintainers = with maintainers; [ tilpner ]; + }; +} diff --git a/pkgs/development/python-modules/django-csp/default.nix b/pkgs/development/python-modules/django-csp/default.nix new file mode 100644 index 00000000000..1eed9578a8a --- /dev/null +++ b/pkgs/development/python-modules/django-csp/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchPypi, buildPythonPackage, django }: + +buildPythonPackage rec { + pname = "django-csp"; + version = "3.5"; + + src = fetchPypi { + inherit version; + pname = "django_csp"; + sha256 = "0ks4zszbjx5lyqlc34pjica8hfcjzw4i5m6pivvnyv8yf0vh4q04"; + }; + + # too complicated to setup - needs a running django instance + doCheck = false; + + propagatedBuildInputs = [ django ]; + + meta = with stdenv.lib; { + description = "Adds Content-Security-Policy headers to Django"; + homepage = "https://github.com/mozilla/django-csp"; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/django-logentry-admin/default.nix b/pkgs/development/python-modules/django-logentry-admin/default.nix new file mode 100644 index 00000000000..d9734ff4a22 --- /dev/null +++ b/pkgs/development/python-modules/django-logentry-admin/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, buildPythonPackage, django, pytest, pytest-django }: + +buildPythonPackage rec { + pname = "django-logentry-admin"; + version = "1.0.4"; + + src = fetchFromGitHub { + owner = "yprez"; + repo = pname; + rev = "v${version}"; + sha256 = "1ji04qklzhjb7fx6644vzikjb2196rxyi8hrwf2knsz41ndvq1l9"; + }; + + checkInputs = [ pytest pytest-django ]; + checkPhase = '' + rm -r logentry_admin __init__.py + pytest + ''; + + propagatedBuildInputs = [ django ]; + + meta = with stdenv.lib; { + description = "Show all LogEntry objects in the Django admin site"; + homepage = "https://github.com/yprez/django-logentry-admin"; + license = licenses.isc; + maintainers = with maintainers; [ mrmebelman ]; + }; +} + diff --git a/pkgs/development/python-modules/django-polymorphic/default.nix b/pkgs/development/python-modules/django-polymorphic/default.nix index 3a33960faf8..443f793f37b 100644 --- a/pkgs/development/python-modules/django-polymorphic/default.nix +++ b/pkgs/development/python-modules/django-polymorphic/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "django-polymorphic"; - version = "2.0.3"; + version = "2.1.2"; # PyPI tarball is missing some test files src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "08qk3rbk0xlphwalkigbhqpmfaqjk1sxmlfh8zy8s8dw7fw1myk4"; + sha256 = "0zghrq7y7g2ls38cz6y98qj5xwnn992slhb95qyp6l66d420j179"; }; checkInputs = [ dj-database-url ]; diff --git a/pkgs/development/python-modules/django/1_11.nix b/pkgs/development/python-modules/django/1_11.nix index 30db075bcf3..8b60155b50a 100644 --- a/pkgs/development/python-modules/django/1_11.nix +++ b/pkgs/development/python-modules/django/1_11.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "Django"; - version = "1.11.22"; + version = "1.11.23"; src = fetchurl { url = "https://www.djangoproject.com/m/releases/1.11/${pname}-${version}.tar.gz"; - sha256 = "0if8p7sgbvpy3m8d25pw1x232s14ndd60w5s5d88jl3hl505s3c3"; + sha256 = "1qb9npkpvyafd1f4yjqyzhj78wp1ifg3awj41bd04v83idznv9jj"; }; patches = stdenv.lib.optionals withGdal [ diff --git a/pkgs/development/python-modules/django/2_1.nix b/pkgs/development/python-modules/django/2_1.nix index da14dd4bd9c..e5d08381055 100644 --- a/pkgs/development/python-modules/django/2_1.nix +++ b/pkgs/development/python-modules/django/2_1.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "Django"; - version = "2.1.10"; + version = "2.1.11"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0n794x17x8q2jzjm12glb900y53r3bxg8dafvl65djiglm4abqk5"; + sha256 = "1m9bs78sh91slsjxkhxgkg715gbsgph9ky7d74czs0z2mhg86h8s"; }; patches = stdenv.lib.optionals withGdal [ diff --git a/pkgs/development/python-modules/django_compressor/default.nix b/pkgs/development/python-modules/django_compressor/default.nix index 30343f76570..0ee392756d3 100644 --- a/pkgs/development/python-modules/django_compressor/default.nix +++ b/pkgs/development/python-modules/django_compressor/default.nix @@ -2,11 +2,11 @@ rcssmin, rjsmin, django_appconf }: buildPythonPackage rec { pname = "django_compressor"; - version = "2.2"; + version = "2.3"; src = fetchPypi { inherit pname version; - sha256 = "9616570e5b08e92fa9eadc7a1b1b49639cce07ef392fc27c74230ab08075b30f"; + sha256 = "1pbygd00l0k5p1r959131khij1km1a1grfxg0r59ar2wyx3n7j27"; }; postPatch = '' substituteInPlace setup.py --replace 'rcssmin == 1.0.6' 'rcssmin' \ diff --git a/pkgs/development/python-modules/dockerfile-parse/default.nix b/pkgs/development/python-modules/dockerfile-parse/default.nix index 678276b1b31..2f9e32f088e 100644 --- a/pkgs/development/python-modules/dockerfile-parse/default.nix +++ b/pkgs/development/python-modules/dockerfile-parse/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchPypi, six, pytestcov, pytest }: buildPythonPackage rec { - version = "0.0.14"; + version = "0.0.15"; pname = "dockerfile-parse"; src = fetchPypi { inherit pname version; - sha256 = "0b829a9e25ac9af17a0affa41c0fca6541a03b8edb0178f60dc036e2ce59eeb5"; + sha256 = "1s05s1hc834yk6qxj2yv3fh7grj3q52d6jjy0sv1p05938baprfm"; }; postPatch = '' diff --git a/pkgs/development/python-modules/elementpath/default.nix b/pkgs/development/python-modules/elementpath/default.nix new file mode 100644 index 00000000000..1d2d34541fa --- /dev/null +++ b/pkgs/development/python-modules/elementpath/default.nix @@ -0,0 +1,26 @@ +{ buildPythonPackage +, lib +, fetchFromGitHub +}: + +buildPythonPackage rec { + version = "1.1.8"; + pname = "elementpath"; + + src = fetchFromGitHub { + owner = "sissaschool"; + repo = "elementpath"; + rev = "v${version}"; + sha256 = "0krczvf8r6pb3hb8qaxl9h2b4qwg180xk66gyxjf002im7ri75aj"; + }; + + # avoid circular dependency with xmlschema which directly depends on this + doCheck = false; + + meta = with lib; { + description = "XPath 1.0/2.0 parsers and selectors for ElementTree and lxml"; + homepage = "https://github.com/sissaschool/elementpath"; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/development/python-modules/emailthreads/default.nix b/pkgs/development/python-modules/emailthreads/default.nix new file mode 100644 index 00000000000..0e5db1de3e9 --- /dev/null +++ b/pkgs/development/python-modules/emailthreads/default.nix @@ -0,0 +1,29 @@ +{ lib, fetchFromGitHub, buildPythonPackage +, python, isPy3k }: + +buildPythonPackage rec { + pname = "emailthreads"; + version = "0.1.0"; + disabled = !isPy3k; + + # pypi is missing files for tests + src = fetchFromGitHub { + owner = "emersion"; + repo = "python-emailthreads"; + rev = "v${version}"; + sha256 = "17pfal8kbxhs025apkijqbkppw2lljca8x1cwcx49jv60h05c3cn"; + }; + + PKGVER = version; + + checkPhase = '' + ${python.interpreter} -m unittest discover test + ''; + + meta = with lib; { + homepage = https://github.com/emersion/python-emailthreads; + description = "Python library to parse and format email threads"; + license = licenses.mit; + maintainers = with maintainers; [ eadwu ]; + }; +} diff --git a/pkgs/development/python-modules/emoji/default.nix b/pkgs/development/python-modules/emoji/default.nix index c00ca778bc6..01cd9190647 100644 --- a/pkgs/development/python-modules/emoji/default.nix +++ b/pkgs/development/python-modules/emoji/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "emoji"; - version = "0.5.2"; + version = "0.5.3"; src = fetchPypi { inherit pname version; - sha256 = "9ae01495fc3fcc04e9136ca1af8cae58726ec5dfaaa92f61f0732cbae9a12fa9"; + sha256 = "0kn6qq1h0d6cg70wk0hji6bcwg5s18ys6gfmlmfmx8420ka150dn"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/fastpair/default.nix b/pkgs/development/python-modules/fastpair/default.nix index 090f9dd8260..e9e6316bb61 100644 --- a/pkgs/development/python-modules/fastpair/default.nix +++ b/pkgs/development/python-modules/fastpair/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, pytestrunner, pytest_3, scipy }: +{ stdenv, buildPythonPackage, fetchFromGitHub, pytestrunner, pytest, scipy }: buildPythonPackage { pname = "fastpair"; @@ -11,14 +11,17 @@ buildPythonPackage { sha256 = "1pv9sxycxdk567s5gs947rhlqngrb9nn9yh4dhdvg1ix1i8dca71"; }; - nativeBuildInputs = [ (pytestrunner.override { pytest = pytest_3; }) ]; + nativeBuildInputs = [ pytestrunner ]; - checkInputs = [ pytest_3 ]; + checkInputs = [ pytest ]; propagatedBuildInputs = [ scipy ]; + # Does not support pytest 4 https://github.com/carsonfarmer/fastpair/issues/14 + doCheck = false; + checkPhase = '' pytest fastpair ''; diff --git a/pkgs/development/python-modules/fints/default.nix b/pkgs/development/python-modules/fints/default.nix index 4d9d250815a..f780c76fd6d 100644 --- a/pkgs/development/python-modules/fints/default.nix +++ b/pkgs/development/python-modules/fints/default.nix @@ -1,20 +1,36 @@ -{ stdenv, buildPythonPackage, fetchPypi, - requests, mt-940, sepaxml, bleach, isPy3k }: +{ stdenv, buildPythonPackage, fetchFromGitHub, isPy27 +, bleach +, mt-940 +, pytest +, requests +, sepaxml +}: buildPythonPackage rec { - version = "2.1.1"; + version = "2.2.0"; pname = "fints"; - disabled = !isPy3k; + disabled = isPy27; - src = fetchPypi { - inherit pname version; - sha256 = "06p6p0xxw0n10hmf7z4k1l29fya0sja433s6lasjr1bal5asdhaq"; + src = fetchFromGitHub { + owner = "raphaelm"; + repo = "python-fints"; + rev = "v${version}"; + sha256 = "1gx173dzdprf3jsc7dss0xax8s6l2hr02qg9m5c4rksb3dl5fl8w"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace 'sepaxml==2.0.*' 'sepaxml~=2.0' + ''; + propagatedBuildInputs = [ requests mt-940 sepaxml bleach ]; - # no tests included in PyPI package - doCheck = false; + checkInputs = [ pytest ]; + + # ignore network calls and broken fixture + checkPhase = '' + pytest . --ignore=tests/test_client.py -k 'not robust_mode' + ''; meta = with stdenv.lib; { homepage = https://github.com/raphaelm/python-fints/; diff --git a/pkgs/development/python-modules/flake8-polyfill/default.nix b/pkgs/development/python-modules/flake8-polyfill/default.nix new file mode 100644 index 00000000000..070e6997010 --- /dev/null +++ b/pkgs/development/python-modules/flake8-polyfill/default.nix @@ -0,0 +1,40 @@ +{ lib, fetchPypi, buildPythonPackage +, flake8 +, mock, pep8, pytest }: + +buildPythonPackage rec { + pname = "flake8-polyfill"; + version = "1.0.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1nlf1mkqw856vi6782qcglqhaacb23khk9wkcgn55npnjxshhjz4"; + }; + + postPatch = '' + # Failed: [pytest] section in setup.cfg files is no longer supported, change to [tool:pytest] instead. + substituteInPlace setup.cfg \ + --replace pytest 'tool:pytest' + ''; + + propagatedBuildInputs = [ + flake8 + ]; + + checkInputs = [ + mock + pep8 + pytest + ]; + + checkPhase = '' + pytest tests + ''; + + meta = with lib; { + homepage = https://gitlab.com/pycqa/flake8-polyfill; + description = "Polyfill package for Flake8 plugins"; + license = licenses.mit; + maintainers = with maintainers; [ eadwu ]; + }; +} diff --git a/pkgs/development/python-modules/folium/default.nix b/pkgs/development/python-modules/folium/default.nix index c8eca2ac60c..c89bfbfd524 100644 --- a/pkgs/development/python-modules/folium/default.nix +++ b/pkgs/development/python-modules/folium/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "folium"; - version = "0.9.1"; + version = "0.10.0"; src = fetchPypi { inherit pname version; - sha256 = "66901483808839ed895a685ca7bc4731379f4a627d73a83b77f0df1847b14892"; + sha256 = "18fzxijsgrb95r0a8anc9ba5ijyw3nlnv3rpavfbkqa5v878x84f"; }; disabled = pythonOlder "3.5"; diff --git a/pkgs/development/python-modules/fsspec/default.nix b/pkgs/development/python-modules/fsspec/default.nix new file mode 100644 index 00000000000..8f4b9cf8c89 --- /dev/null +++ b/pkgs/development/python-modules/fsspec/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +}: + +buildPythonPackage rec { + pname = "fsspec"; + version = "0.4.1"; + + disabled = pythonOlder "3.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "0fvm1kdnnbf0pppv23mlfdqh220gcldmv72w2rdxp6ks1rcphzg3"; + }; + + # no tests + doCheck = false; + + meta = with lib; { + description = "A specification that python filesystems should adhere to."; + homepage = "https://github.com/intake/filesystem_spec"; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/git-revise/default.nix b/pkgs/development/python-modules/git-revise/default.nix new file mode 100644 index 00000000000..86d4decc6d8 --- /dev/null +++ b/pkgs/development/python-modules/git-revise/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonAtLeast +, tox +, pytest +, pylint +, mypy +, black +}: + +buildPythonPackage rec { + pname = "git-revise"; + version = "0.4.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1mq1fh8m6jxl052d811cgpl378hiq20a8zrhdjn0i3dqmxrcb8vs"; + }; + + disabled = !(pythonAtLeast "3.6"); + + checkInputs = [ tox pytest pylint mypy black ]; + + checkPhase = '' + tox + ''; + + meta = with lib; { + description = "Efficiently update, split, and rearrange git commits"; + homepage = https://github.com/mystor/git-revise; + license = licenses.mit; + maintainers = with maintainers; [ emily ]; + }; +} diff --git a/pkgs/development/python-modules/globus-sdk/default.nix b/pkgs/development/python-modules/globus-sdk/default.nix index e42cf5756f1..45ae5fe00de 100644 --- a/pkgs/development/python-modules/globus-sdk/default.nix +++ b/pkgs/development/python-modules/globus-sdk/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "globus-sdk"; - version = "1.7.1"; + version = "1.8.0"; src = fetchPypi { inherit pname version; - sha256 = "d96f7ed1887c8f55f2bc8d493cd8ec73ff9f3361f0a134203e34e2e57bedd964"; + sha256 = "0ggxa3av4rwva9h5idg1vfdybr7wkajw7g0sn42k04sxxa0cigwz"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix index 60a6caace5e..e81f8274086 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "google-api-python-client"; - version = "1.7.10"; + version = "1.7.11"; src = fetchPypi { inherit pname version; - sha256 = "1mlx5dvkh6rjkvkd91flyhrmji2kw9rlr05n8n4wccv2np3sam9f"; + sha256 = "137vwb9544vjxkwnbr98x0f4p6ri5i678wxxxgbsx4kdyrs83a58"; }; # No tests included in archive diff --git a/pkgs/development/python-modules/gspread/default.nix b/pkgs/development/python-modules/gspread/default.nix index a2597b2e6e7..2a20d610485 100644 --- a/pkgs/development/python-modules/gspread/default.nix +++ b/pkgs/development/python-modules/gspread/default.nix @@ -1,6 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi +, requests }: buildPythonPackage rec { @@ -12,10 +13,15 @@ buildPythonPackage rec { sha256 = "f7ce6c06250f694976c3cd4944e3b607b0810b93383839e5b67c7199ce2f0d3d"; }; + propagatedBuildInputs = [ requests ]; + meta = with stdenv.lib; { description = "Google Spreadsheets client library"; homepage = "https://github.com/burnash/gspread"; license = licenses.mit; }; + # No tests included + doCheck = false; + } diff --git a/pkgs/development/python-modules/gssapi/default.nix b/pkgs/development/python-modules/gssapi/default.nix index 14d27e7442e..c64013624a4 100644 --- a/pkgs/development/python-modules/gssapi/default.nix +++ b/pkgs/development/python-modules/gssapi/default.nix @@ -1,13 +1,30 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, six, enum34, decorator, -nose, gss, krb5Full, darwin }: +{ stdenv +, lib +, buildPythonPackage +, fetchFromGitHub +, six +, enum34 +, decorator +, nose +, krb5Full +, darwin +, isPy27 +, parameterized +, shouldbe +, cython +, python +, k5test +}: buildPythonPackage rec { pname = "gssapi"; - version = "1.5.1"; + version = "1.6.0"; - src = fetchPypi { - inherit pname version; - sha256 = "76c9fda88a7178f41bf6454a06d64054c56b46f0dcbc73307f2e57bb8c25d8cc"; + src = fetchFromGitHub { + owner = "pythongssapi"; + repo = "python-${pname}"; + rev = "v${version}"; + sha256 = "1chmxhjbs39paaxlfsdrr13v4zvv94ijvhxasdphxlxkqlycbm4a"; }; # It's used to locate headers @@ -16,18 +33,36 @@ buildPythonPackage rec { --replace "get_output('krb5-config gssapi --prefix')" "'${lib.getDev krb5Full}'" ''; - LD_LIBRARY_PATH = "${krb5Full}/lib"; + nativeBuildInputs = [ + cython + krb5Full + ]; - nativeBuildInputs = [ krb5Full ] - ++ ( if stdenv.isDarwin then [ darwin.apple_sdk.frameworks.GSS ] else [ gss ] ); + propagatedBuildInputs = [ + decorator + six + ] ++ lib.optional isPy27 enum34; - propagatedBuildInputs = [ decorator enum34 six ]; + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.GSS + ]; - checkInputs = [ nose ]; + checkInputs = [ + k5test + nose + parameterized + shouldbe + six + ]; - doCheck = false; # No such file or directory: '/usr/sbin/kadmin.local' + doCheck = !stdenv.isDarwin; # many failures on darwin - meta = with stdenv.lib; { + checkPhase = '' + export PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH" + ${python.interpreter} setup.py nosetests + ''; + + meta = with lib; { homepage = https://pypi.python.org/pypi/gssapi; description = "Python GSSAPI Wrapper"; license = licenses.mit; diff --git a/pkgs/development/python-modules/h2/default.nix b/pkgs/development/python-modules/h2/default.nix index 910080e679f..c267b6d4726 100644 --- a/pkgs/development/python-modules/h2/default.nix +++ b/pkgs/development/python-modules/h2/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "h2"; - version = "3.1.0"; + version = "3.1.1"; src = fetchPypi { inherit pname version; - sha256 = "fd07e865a3272ac6ef195d8904de92dc7b38dc28297ec39cfa22716b6d62e6eb"; + sha256 = "1d1svhixk3hr78ph3nx8wi7sagx1xrvm712mmk028i2rhb92p8xq"; }; propagatedBuildInputs = [ enum34 hpack hyperframe ]; diff --git a/pkgs/development/python-modules/hocr-tools/default.nix b/pkgs/development/python-modules/hocr-tools/default.nix new file mode 100644 index 00000000000..d5492b3b641 --- /dev/null +++ b/pkgs/development/python-modules/hocr-tools/default.nix @@ -0,0 +1,31 @@ +{ buildPythonPackage +, fetchFromGitHub +, lxml +, pillow +, reportlab +, stdenv +}: +buildPythonPackage rec { + pname = "hocr-tools"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "tmbdev"; + repo = "${pname}"; + rev = "v${version}"; + sha256 = "14f9hkp7pr677085w8iidwd0la9cjzy3pyj3rdg9b03nz9pc0w6p"; + }; + + # hocr-tools uses a test framework that requires internet access + doCheck = false; + + propagatedBuildInputs = [ pillow lxml reportlab ]; + + meta = with stdenv.lib; { + description = " +Tools for manipulating and evaluating the hOCR format for representing multi-lingual OCR results by embedding them into HTML"; + homepage = https://github.com/tmbdev/hocr-tools; + license = licenses.asl20; + maintainers = [ maintainers.kiwi ]; + }; +} diff --git a/pkgs/development/python-modules/html5-parser/default.nix b/pkgs/development/python-modules/html5-parser/default.nix index a09ed7b9420..f3b24b3d371 100644 --- a/pkgs/development/python-modules/html5-parser/default.nix +++ b/pkgs/development/python-modules/html5-parser/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "html5-parser"; - version = "0.4.7"; + version = "0.4.8"; src = fetchPypi { inherit pname version; - sha256 = "1gzs9fa38m80y509fg58ylwhxgy7w28ww968pi6wmfrih9ib6l93"; + sha256 = "00d1zfk72xzyibh7l4ib57y0isn5gic7avgbh7afbkk99iwd5smi"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/python-modules/ipdb/default.nix b/pkgs/development/python-modules/ipdb/default.nix index f31b9013d94..18a2d570497 100644 --- a/pkgs/development/python-modules/ipdb/default.nix +++ b/pkgs/development/python-modules/ipdb/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "ipdb"; - version = "0.12"; + version = "0.12.2"; disabled = isPyPy; # setupterm: could not find terminfo database src = fetchPypi { inherit pname version; - sha256 = "dce2112557edfe759742ca2d0fee35c59c97b0cc7a05398b791079d78f1519ce"; + sha256 = "0mzfv2sa8qabqzh2vqgwhavb15gsmcgqn6i3jgq6b5q9i9wxsgs7"; }; propagatedBuildInputs = [ ipython ]; diff --git a/pkgs/development/python-modules/jenkins-job-builder/default.nix b/pkgs/development/python-modules/jenkins-job-builder/default.nix index a41fefd7b13..714a5ce1014 100644 --- a/pkgs/development/python-modules/jenkins-job-builder/default.nix +++ b/pkgs/development/python-modules/jenkins-job-builder/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "jenkins-job-builder"; - version = "2.10.0"; + version = "2.10.1"; disabled = !isPy27; src = fetchPypi { inherit pname version; - sha256 = "0jp8v0a3yhjv7024y7r4jd4kq008ljra6lxx4143jw3rp72q3afc"; + sha256 = "0iynzxrjmdkrriw4pcf8as8afckvmq4jk457lxg52wh29l39wb30"; }; postPatch = '' diff --git a/pkgs/development/python-modules/jsonmerge/default.nix b/pkgs/development/python-modules/jsonmerge/default.nix new file mode 100644 index 00000000000..44944c03500 --- /dev/null +++ b/pkgs/development/python-modules/jsonmerge/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchPypi +, jsonschema +}: + +buildPythonPackage rec { + pname = "jsonmerge"; + version = "1.6.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "03l2j1lrcwcp7af4x8agxnkib0ndybfrbhn2gi7mnk6gbxfw1aw3"; + }; + + propagatedBuildInputs = [ jsonschema ]; + + meta = with lib; { + description = "Merge a series of JSON documents"; + homepage = https://github.com/avian2/jsonmerge; + changelog = "https://github.com/avian2/jsonmerge/blob/jsonmerge-${version}/ChangeLog"; + license = licenses.mit; + maintainers = with maintainers; [ emily ]; + }; +} diff --git a/pkgs/development/python-modules/jug/default.nix b/pkgs/development/python-modules/jug/default.nix index 6a350d59be6..ad26b62931d 100644 --- a/pkgs/development/python-modules/jug/default.nix +++ b/pkgs/development/python-modules/jug/default.nix @@ -1,11 +1,11 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ stdenv, buildPythonPackage, fetchPypi, fetchpatch , nose, numpy , bottle, pyyaml, redis, six , zlib }: buildPythonPackage rec { pname = "Jug"; - version = "1.6.7"; + version = "1.6.9"; buildInputs = [ nose numpy ]; propagatedBuildInputs = [ bottle @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "a7faba838f3437163ae8459bff96e2c6ca1298312bdb9104c702685178d17269"; + sha256 = "0193hp8ap6caw57jdch3vw0hl5m8942lxhjdsfaxk4bfb239l5kz"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/jupyter_client/default.nix b/pkgs/development/python-modules/jupyter_client/default.nix index c3643e674c3..01830514b46 100644 --- a/pkgs/development/python-modules/jupyter_client/default.nix +++ b/pkgs/development/python-modules/jupyter_client/default.nix @@ -7,10 +7,6 @@ , dateutil , isPyPy , py -, ipykernel -, ipython -, mock -, pytest , tornado }: @@ -20,15 +16,16 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "98e8af5edff5d24e4d31e73bc21043130ae9d955a91aa93fc0bc3b1d0f7b5880"; + sha256 = "102qgc7isfxwq0zsj6m9apcyj2hk8c8c4fz7656lxlpmvxgazs4q"; }; - checkInputs = [ ipykernel ipython mock pytest ]; - propagatedBuildInputs = [traitlets jupyter_core pyzmq dateutil tornado ] ++ lib.optional isPyPy py; - - checkPhase = '' - py.test - ''; + propagatedBuildInputs = [ + traitlets + jupyter_core + pyzmq + dateutil + tornado + ] ++ lib.optional isPyPy py; # Circular dependency with ipykernel doCheck = false; @@ -39,4 +36,4 @@ buildPythonPackage rec { license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/jupyter_core/default.nix b/pkgs/development/python-modules/jupyter_core/default.nix index 88679197be1..f682e11bfed 100644 --- a/pkgs/development/python-modules/jupyter_core/default.nix +++ b/pkgs/development/python-modules/jupyter_core/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "2c6e7c1e9f2ac45b5c2ceea5730bc9008d92fe59d0725eac57b04c0edfba24f7"; + sha256 = "1xr4pbghwk5hayn5wwnhb7z95380r45p79gf5if5pi1akwg7qvic"; }; checkInputs = [ pytest mock glibcLocales ]; @@ -23,8 +23,7 @@ buildPythonPackage rec { patches = [ ./tests_respect_pythonpath.patch ]; checkPhase = '' - mkdir tmp - HOME=tmp TMPDIR=tmp LC_ALL=en_US.utf8 py.test + HOME=$TMPDIR LC_ALL=en_US.utf8 py.test ''; meta = with lib; { diff --git a/pkgs/development/python-modules/jupytext/default.nix b/pkgs/development/python-modules/jupytext/default.nix index 66e79227697..ae6796825f1 100644 --- a/pkgs/development/python-modules/jupytext/default.nix +++ b/pkgs/development/python-modules/jupytext/default.nix @@ -1,41 +1,33 @@ -{ lib -, buildPythonPackage -, fetchPypi -, testfixtures -, pyyaml +{ lib, buildPythonPackage, fetchPypi, isPy27 , mock , nbformat , pytest +, pyyaml }: buildPythonPackage rec { pname = "jupytext"; - version = "1.1.7"; + version = "1.2.1"; src = fetchPypi { inherit pname version; - sha256 = "0g365j22gbmq4x60l06id5930aywzy1dx2s25109nqq2l2cxc7ws"; + sha256 = "05vwxgjh7pzxgdzj0775562bfps8j7w3p7dcf1zfh169whqw9vg8"; }; propagatedBuildInputs = [ pyyaml nbformat - testfixtures - ]; + ] ++ lib.optionals isPy27 [ mock ]; # why they put it in install_requires, who knows + checkInputs = [ pytest ]; - # setup.py checks for those even though they're not needed at runtime (only - # for tests), thus not propagated - buildInputs = [ - mock - pytest - ]; # requires test notebooks which are not shipped with the pypi release + # also, pypi no longer includes tests doCheck = false; checkPhase = '' - py.test + pytest ''; meta = with lib; { diff --git a/pkgs/development/python-modules/k5test/default.nix b/pkgs/development/python-modules/k5test/default.nix new file mode 100644 index 00000000000..d3937300a5e --- /dev/null +++ b/pkgs/development/python-modules/k5test/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchPypi +, substituteAll +, six +, krb5Full +, findutils +, which +}: + +buildPythonPackage rec { + pname = "k5test"; + version = "0.9.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1lqp3jgfngyhaxjgj3n230hn90wsylwilh120yjf62h7b1s02mh8"; + }; + + patches = [ + (substituteAll { + src = ./fix-paths.patch; + inherit findutils krb5Full; + # krb5-config is in dev output + krb5FullDev = krb5Full.dev; + which = "${which}/bin/which"; + }) + ]; + + propagatedBuildInputs = [ + six + ]; + + # No tests + doCheck = false; + + meta = with lib; { + description = "Library for setting up self-contained Kerberos 5 environment"; + homepage = https://github.com/pythongssapi/k5test; + license = licenses.mit; + maintainers = [ ]; + }; +} diff --git a/pkgs/development/python-modules/k5test/fix-paths.patch b/pkgs/development/python-modules/k5test/fix-paths.patch new file mode 100644 index 00000000000..f99835b5f2a --- /dev/null +++ b/pkgs/development/python-modules/k5test/fix-paths.patch @@ -0,0 +1,90 @@ +diff --git a/k5test/_utils.py b/k5test/_utils.py +index e289fac..e2f486a 100644 +--- a/k5test/_utils.py ++++ b/k5test/_utils.py +@@ -65,12 +65,12 @@ def find_plugin_dir(): + + # if there was no LD_LIBRARY_PATH, or the above failed + if _PLUGIN_DIR is None: +- lib_dir = os.path.join(get_output('krb5-config --prefix'), 'lib64') ++ lib_dir = os.path.join(get_output('@krb5FullDev@/bin/krb5-config --prefix'), 'lib64') + _PLUGIN_DIR = _decide_plugin_dir(_find_plugin_dirs_installed(lib_dir)) + + # /usr/lib64 seems only to be distinct on Fedora/RHEL/Centos family + if _PLUGIN_DIR is None: +- lib_dir = os.path.join(get_output('krb5-config --prefix'), 'lib') ++ lib_dir = os.path.join(get_output('@krb5FullDev@/bin/krb5-config --prefix'), 'lib') + _PLUGIN_DIR = _decide_plugin_dir(_find_plugin_dirs_installed(lib_dir)) + + if _PLUGIN_DIR is not None: +@@ -89,7 +89,7 @@ def _decide_plugin_dir(dirs): + + for path in shortest_first: + # check to see if it actually contains .so files +- if get_output('find %s -name "*.so"' % path): ++ if get_output('@findutils@/bin/find %s -name "*.so"' % path): + return path + + return None +@@ -97,7 +97,7 @@ def _decide_plugin_dir(dirs): + + def _find_plugin_dirs_installed(search_path): + try: +- options_raw = get_output('find %s/ -type d \( ! -executable -o ! -readable \) ' ++ options_raw = get_output('@findutils@/bin/find %s/ -type d \( ! -executable -o ! -readable \) ' + '-prune -o ' + '-type d -path "*/krb5/plugins" -print' % search_path, + stderr=subprocess.STDOUT) +@@ -111,7 +111,7 @@ def _find_plugin_dirs_installed(search_path): + + + def _find_plugin_dirs_src(search_path): +- options_raw = get_output('find %s/../ -type d -name plugins' % search_path) ++ options_raw = get_output('@findutils@/bin/find %s/../ -type d -name plugins' % search_path) + + if options_raw: + return options_raw.split('\n') +diff --git a/k5test/realm.py b/k5test/realm.py +index f57946b..ad78579 100644 +--- a/k5test/realm.py ++++ b/k5test/realm.py +@@ -181,19 +181,13 @@ class K5Realm(object): + return path + + def _init_paths(self, **paths): +- self.kdb5_util = self._discover_path('kdb5_util', +- '/usr/sbin/kdb5_util', paths) +- self.krb5kdc = self._discover_path('krb5kdc', +- '/usr/sbin/krb5kdc', paths) +- self.kadmin_local = self._discover_path('kadmin_local', +- '/usr/sbin/kadmin.local', +- paths) +- self.kprop = self._discover_path('kprop', '/usr/sbin/kprop', paths) +- self.kadmind = self._discover_path('kadmind', +- '/usr/sbin/kadmind', paths) +- +- self._kinit = self._discover_path('kinit', '/usr/bin/kinit', paths) +- self._klist = self._discover_path('klist', '/usr/bin/klist', paths) ++ self.kdb5_util = '@krb5Full@/bin/kdb5_util' ++ self.krb5kdc = '@krb5Full@/bin/krb5kdc' ++ self.kadmin_local = '@krb5Full@/bin/kadmin.local' ++ self.kprop = '@krb5Full@/bin/kprop' ++ self.kadmind = '@krb5Full@/bin/kadmind' ++ self._kinit = '@krb5Full@/bin/kinit' ++ self._klist = '@krb5Full@/bin/klist' + + def _create_conf(self, profile, filename): + with open(filename, 'w') as conf_file: +diff --git a/k5test/unit.py b/k5test/unit.py +index 4ee7f98..543d662 100644 +--- a/k5test/unit.py ++++ b/k5test/unit.py +@@ -38,7 +38,7 @@ _KRB_VERSION = None + def krb_minversion_test(target_version, problem): + global _KRB_VERSION + if _KRB_VERSION is None: +- _KRB_VERSION = _utils.get_output("krb5-config --version") ++ _KRB_VERSION = _utils.get_output("@krb5FullDev@/bin/krb5-config --version") + _KRB_VERSION = _KRB_VERSION.split(' ')[-1].split('.') + + def make_ext_test(func): diff --git a/pkgs/development/python-modules/kconfiglib/default.nix b/pkgs/development/python-modules/kconfiglib/default.nix new file mode 100644 index 00000000000..7d83d2c4338 --- /dev/null +++ b/pkgs/development/python-modules/kconfiglib/default.nix @@ -0,0 +1,21 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "kconfiglib"; + version = "10.36.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1qhy4vv1rpgx4r1la14symxv3cpz7klqakn1rqdagwyaqp667g9b"; + }; + + # doesnt work out of the box but might be possible + doCheck = false; + + meta = with lib; { + description = "A flexible Python 2/3 Kconfig implementation and library"; + homepage = https://github.com/ulfalizer/Kconfiglib; + license = licenses.isc; + maintainers = with maintainers; [ teto ]; + }; +} diff --git a/pkgs/development/python-modules/kubernetes/default.nix b/pkgs/development/python-modules/kubernetes/default.nix index e154c5c9c0e..8ba7b109264 100644 --- a/pkgs/development/python-modules/kubernetes/default.nix +++ b/pkgs/development/python-modules/kubernetes/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "kubernetes"; - version = "9.0.0"; + version = "10.0.0"; prePatch = '' sed -e 's/sphinx>=1.2.1,!=1.3b1,<1.4 # BSD/sphinx/' -i test-requirements.txt @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1gz3sk4s0gx68xpxjwzp9n2shlxfa9d5j4h7cvmglim9bgasxc58"; + sha256 = "0v3hiy427ca010k8brys3aafgb5013i32yva1nmiibk3xcf7f90f"; }; checkInputs = [ isort coverage pytest mock sphinx autopep8 pep8 codecov recommonmark nose ]; diff --git a/pkgs/development/python-modules/lark-parser/default.nix b/pkgs/development/python-modules/lark-parser/default.nix index 6de2af1e505..527c99a1589 100644 --- a/pkgs/development/python-modules/lark-parser/default.nix +++ b/pkgs/development/python-modules/lark-parser/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "lark-parser"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "lark-parser"; repo = "lark"; rev = version; - sha256 = "17h7s0yc8jyjmlcwsaw93ijl982ws3p8nxif2dc3rv01dqhf0xx1"; + sha256 = "05na4izlq34bmij8awmfn58liinmsh8qzh6948knk5ms5nsh50cp"; }; # tests of Nearley support require js2py diff --git a/pkgs/development/python-modules/libarcus/default.nix b/pkgs/development/python-modules/libarcus/default.nix index add1957dd6d..54d9193c25b 100644 --- a/pkgs/development/python-modules/libarcus/default.nix +++ b/pkgs/development/python-modules/libarcus/default.nix @@ -3,14 +3,14 @@ buildPythonPackage rec { pname = "libarcus"; - version = "4.1.0"; + version = "4.2.0"; format = "other"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "libArcus"; rev = version; - sha256 = "1x06daijxbrqj0dlxmi2zn7ap74zf6hih3krmkwhvarm2nr052g4"; + sha256 = "0pk0g80ay9aghzmb8gfpqh0chl9rk47jh0ziicpianhklxx2jb44"; }; disabled = pythonOlder "3.4.0"; @@ -20,7 +20,7 @@ buildPythonPackage rec { buildInputs = [ protobuf ]; postPatch = '' - sed -i 's#''${Python3_SITELIB}#${placeholder "out"}/${python.sitePackages}#' cmake/SIPMacros.cmake + sed -i 's#''${Python3_SITEARCH}#${placeholder "out"}/${python.sitePackages}#' cmake/SIPMacros.cmake ''; meta = with stdenv.lib; { @@ -28,6 +28,6 @@ buildPythonPackage rec { homepage = https://github.com/Ultimaker/libArcus; license = licenses.lgpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ abbradar ]; + maintainers = with maintainers; [ abbradar gebner ]; }; } diff --git a/pkgs/development/python-modules/libsavitar/default.nix b/pkgs/development/python-modules/libsavitar/default.nix index f0fbcf5f311..657df2dfb7c 100644 --- a/pkgs/development/python-modules/libsavitar/default.nix +++ b/pkgs/development/python-modules/libsavitar/default.nix @@ -2,18 +2,18 @@ buildPythonPackage rec { pname = "libsavitar"; - version = "4.1.0"; + version = "4.2.0"; format = "other"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "libSavitar"; rev = version; - sha256 = "132bgcvjkr61pzf244hwz8gxzpg1i50na4bkcipwnyxdravdkkgf"; + sha256 = "0cqskd8rcg7pih8nj3s2i137lwxpibmdmym6f8hii14ashny73i1"; }; postPatch = '' - sed -i 's#''${Python3_SITELIB}#${placeholder "out"}/${python.sitePackages}#' cmake/SIPMacros.cmake + sed -i 's#''${Python3_SITEARCH}#${placeholder "out"}/${python.sitePackages}#' cmake/SIPMacros.cmake ''; nativeBuildInputs = [ cmake ]; @@ -27,6 +27,6 @@ buildPythonPackage rec { homepage = https://github.com/Ultimaker/libSavitar; license = licenses.lgpl3Plus; platforms = platforms.unix; - maintainers = with maintainers; [ abbradar orivej ]; + maintainers = with maintainers; [ abbradar orivej gebner ]; }; } diff --git a/pkgs/development/python-modules/license-expression/default.nix b/pkgs/development/python-modules/license-expression/default.nix new file mode 100644 index 00000000000..6d52e5f5c1f --- /dev/null +++ b/pkgs/development/python-modules/license-expression/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchFromGitHub +, boolean-py +}: + +buildPythonPackage rec { + pname = "license-expression"; + version = "0.999"; + + src = fetchFromGitHub { + owner = "nexB"; + repo = "license-expression"; + rev = "v${version}"; + sha256 = "0q8sha38w7ajg7ar0rmbqrwv0n58l8yzyl96cqwcbvp578fn3ir0"; + }; + + propagatedBuildInputs = [ boolean-py ]; + + meta = with lib; { + homepage = "https://github.com/nexB/license-expression"; + description = "Utility library to parse, normalize and compare License expressions for Python using a boolean logic engine"; + license = licenses.asl20; + }; + +} diff --git a/pkgs/development/python-modules/lmdb/default.nix b/pkgs/development/python-modules/lmdb/default.nix index 3b384182ae0..8926a7383a7 100644 --- a/pkgs/development/python-modules/lmdb/default.nix +++ b/pkgs/development/python-modules/lmdb/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "lmdb"; - version = "0.95"; + version = "0.96"; src = fetchPypi { inherit pname version; - sha256 = "0nx9f193gzl33r1lbqhb96h1igya7pz8wmahr8m9x5zgc05hal91"; + sha256 = "0wpahad7wac34r1hxa1jhk0bsll39n7667cljyr5251kj12ksfgr"; }; checkInputs = [ pytest cffi ]; diff --git a/pkgs/development/python-modules/logilab/common.nix b/pkgs/development/python-modules/logilab/common.nix index 9f932b81e7a..2dd997765cf 100644 --- a/pkgs/development/python-modules/logilab/common.nix +++ b/pkgs/development/python-modules/logilab/common.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "logilab-common"; - version = "1.4.2"; + version = "1.4.3"; src = fetchPypi { inherit pname version; - sha256 = "cdda9ed0deca7c68f87f7a404ad742e47aaa1ca5956d12988236a5ec3bda13a0"; + sha256 = "1zw8bijlcmqrigsqvzj7gwh3qbd33dmpi9ij6h56b41x0dpm957d"; }; propagatedBuildInputs = [ unittest2 six ]; diff --git a/pkgs/development/python-modules/luftdaten/default.nix b/pkgs/development/python-modules/luftdaten/default.nix index 037644f60b2..0138d866ff0 100644 --- a/pkgs/development/python-modules/luftdaten/default.nix +++ b/pkgs/development/python-modules/luftdaten/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "luftdaten"; - version = "0.6.1"; + version = "0.6.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0jxp9yfabdgn2d6w69ijrw1bk1d9g897425cyybiyc13zhhs0kwg"; + sha256 = "0919hcycv2rkn99lv4dn78i827mgvm3vagm9xcc6qgawsli8vrlp"; }; propagatedBuildInputs = [ aiohttp async-timeout ]; diff --git a/pkgs/development/python-modules/matchpy/default.nix b/pkgs/development/python-modules/matchpy/default.nix index a9f37b52c1b..2a0544cf6d8 100644 --- a/pkgs/development/python-modules/matchpy/default.nix +++ b/pkgs/development/python-modules/matchpy/default.nix @@ -1,9 +1,10 @@ { lib , buildPythonPackage +, fetchpatch , fetchPypi , hopcroftkarp , multiset -, pytest_3 +, pytest , pytestrunner , hypothesis , setuptools_scm @@ -20,12 +21,23 @@ buildPythonPackage rec { sha256 = "1vvf1cd9kw5z1mzvypc9f030nd18lgvvjc8j56b1s9b7dyslli2r"; }; + patches = [ + # Fix tests for pytest 4. Remove with the next release + (fetchpatch { + url = "https://github.com/HPAC/matchpy/commit/b405a2717a7793d58c47b2e2197d9d00c06fb13c.patch"; + includes = [ "tests/conftest.py" ]; + sha256 = "1b6gqf2vy9qxg384nqr9k8il335afhbdmlyx4vhd8r8rqpv7gax9"; + }) + ]; + postPatch = '' - substituteInPlace setup.cfg --replace "hypothesis>=3.6,<4.0" "hypothesis" + substituteInPlace setup.cfg \ + --replace "hypothesis>=3.6,<4.0" "hypothesis" \ + --replace "pytest>=3.0,<4.0" "pytest" ''; buildInputs = [ setuptools_scm pytestrunner ]; - checkInputs = [ pytest_3 hypothesis ]; + checkInputs = [ pytest hypothesis ]; propagatedBuildInputs = [ hopcroftkarp multiset ]; meta = with lib; { diff --git a/pkgs/development/python-modules/msgpack-numpy/default.nix b/pkgs/development/python-modules/msgpack-numpy/default.nix index 45b64355e45..c23f0b6572e 100644 --- a/pkgs/development/python-modules/msgpack-numpy/default.nix +++ b/pkgs/development/python-modules/msgpack-numpy/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - description = "Practical Machine Learning for NLP in Python"; + description = "Numpy data type serialization using msgpack"; homepage = https://github.com/lebedov/msgpack-numpy; license = licenses.bsd3; maintainers = with maintainers; [ aborsu ]; diff --git a/pkgs/development/python-modules/mwclient/default.nix b/pkgs/development/python-modules/mwclient/default.nix index b100f3fa350..ce987311a74 100644 --- a/pkgs/development/python-modules/mwclient/default.nix +++ b/pkgs/development/python-modules/mwclient/default.nix @@ -4,14 +4,14 @@ }: buildPythonPackage rec { - version = "0.9.3"; + version = "0.10.0"; pname = "mwclient"; src = fetchFromGitHub { owner = "mwclient"; repo = "mwclient"; rev = "v${version}"; - sha256 = "1kbrmq8zli2j93vmc2887bs7mqr4q1n908nbi1jjcci5v4cd4cqw"; + sha256 = "1c3q6lwmb05yqywc4ya98ca7hsl15niili8rccl4n1yqp77c103v"; }; checkInputs = [ pytest pytestpep8 pytestcache pytestcov responses mock ]; diff --git a/pkgs/development/python-modules/nltk/default.nix b/pkgs/development/python-modules/nltk/default.nix index 7e3134a44d2..6e9b5ce61cd 100644 --- a/pkgs/development/python-modules/nltk/default.nix +++ b/pkgs/development/python-modules/nltk/default.nix @@ -1,13 +1,13 @@ { fetchPypi, buildPythonPackage, lib, six, singledispatch, isPy3k }: buildPythonPackage rec { - version = "3.4.3"; + version = "3.4.4"; pname = "nltk"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1cjkv4jmmlr0w4qi399ncgb6lp41mb9i352934288wh9xad15mqj"; + sha256 = "1dbwwhsbsp31bvvksq7kyrfs6s27lp8wgwqs4qf6hajkz2jj0k3n"; }; propagatedBuildInputs = [ six ] ++ lib.optional (!isPy3k) singledispatch; diff --git a/pkgs/development/python-modules/nuitka/default.nix b/pkgs/development/python-modules/nuitka/default.nix index b8d9f7d58a9..6be1f39328f 100644 --- a/pkgs/development/python-modules/nuitka/default.nix +++ b/pkgs/development/python-modules/nuitka/default.nix @@ -12,13 +12,13 @@ let # Therefore we create a separate env for it. scons = pkgs.python27.withPackages(ps: [ pkgs.scons ]); in buildPythonPackage rec { - version = "0.6.4"; + version = "0.6.5"; pname = "Nuitka"; # Latest version is not yet on PyPi src = fetchurl { url = "https://github.com/kayhayen/Nuitka/archive/${version}.tar.gz"; - sha256 = "18np970h6s97m7j6ymqizq1ylnhb6l5msmxqgnayrllirhg7a8pf"; + sha256 = "18vcmbyqdwsfa9gyj1sf518hsqczx7qlzrdc22hdb1zawzknb1pb"; }; checkInputs = [ vmprof pyqt4 ]; diff --git a/pkgs/development/python-modules/oath/default.nix b/pkgs/development/python-modules/oath/default.nix new file mode 100644 index 00000000000..a64eeb8e103 --- /dev/null +++ b/pkgs/development/python-modules/oath/default.nix @@ -0,0 +1,21 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "oath"; + version = "1.4.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "1xqgcqgx6aa0j21hwsdb3aqpqhviwj756bcqjjjcm1h1aij11p6m"; + }; + + meta = with stdenv.lib; { + description = "Python implementation of the three main OATH specifications: HOTP, TOTP and OCRA"; + homepage = "https://github.com/bdauvergne/python-oath"; + license = licenses.bsd3; + maintainers = with maintainers; [ aw ]; + }; +} diff --git a/pkgs/development/python-modules/osc/default.nix b/pkgs/development/python-modules/osc/default.nix index 7e620769759..def8ecb8458 100644 --- a/pkgs/development/python-modules/osc/default.nix +++ b/pkgs/development/python-modules/osc/default.nix @@ -1,28 +1,22 @@ -{ stdenv -, buildPythonPackage -, fetchFromGitHub -, isPy3k -, pkgs -, urlgrabber -, m2crypto -, pyyaml -, lxml +{ stdenv, buildPythonPackage , fetchFromGitHub +, bashInteractive , urlgrabber, m2crypto }: -buildPythonPackage { +buildPythonPackage rec { pname = "osc"; - version = "0.163.0-40-gb4b1ec7"; - disabled = isPy3k; # urlgrabber doesn't support python-3.x + version = "0.165.4"; src = fetchFromGitHub { owner = "openSUSE"; repo = "osc"; - rev = "b4b1ec7b64d4f9bb42f140754519221b810e232c"; - sha256 = "01z1b15x9vzhd7j94f6n3g50h5br7lwz86akgic0wpp41zv37jad"; + rev = version; + sha256 = "1f8q65wlgchzwzarwrv6a0p60gw0ykpf4d5s7cks835hyawgcbyl"; }; - buildInputs = [ pkgs.bashInteractive ]; # needed for bash-completion helper - propagatedBuildInputs = [ urlgrabber m2crypto pyyaml lxml ]; + buildInputs = [ bashInteractive ]; # needed for bash-completion helper + propagatedBuildInputs = [ urlgrabber m2crypto ]; + + doCheck = false; postInstall = '' ln -s $out/bin/osc-wrapper.py $out/bin/osc diff --git a/pkgs/development/python-modules/palettable/default.nix b/pkgs/development/python-modules/palettable/default.nix index 6b2113352b4..a27ad2172e0 100644 --- a/pkgs/development/python-modules/palettable/default.nix +++ b/pkgs/development/python-modules/palettable/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "palettable"; - version = "3.1.1"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "0685b223a236bb7e2a900ef7a855ccf9a4027361c8acf400f3b350ea51870f80"; + sha256 = "1qp83l4mnwa9rb06m1d45i4691nkbqi82895ck4j6pirb825mz4c"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/parse-type/default.nix b/pkgs/development/python-modules/parse-type/default.nix index 34573626bac..04ad3ba9c18 100644 --- a/pkgs/development/python-modules/parse-type/default.nix +++ b/pkgs/development/python-modules/parse-type/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "parse_type"; - version = "0.4.2"; + version = "0.5.2"; src = fetchPypi { inherit pname version; - sha256 = "0g3b6gsdwnm8dpkh2vn34q6dzxm9gl908ggyzcv31n9xbp3vv5pm"; + sha256 = "02wclgiqky06y36b3q07b7ngpks5j0gmgl6n71ac2j2hscc0nsbz"; }; checkInputs = [ pytest pytestrunner ]; diff --git a/pkgs/development/python-modules/pep8-naming/default.nix b/pkgs/development/python-modules/pep8-naming/default.nix new file mode 100644 index 00000000000..20da40560e2 --- /dev/null +++ b/pkgs/development/python-modules/pep8-naming/default.nix @@ -0,0 +1,23 @@ +{ lib, fetchPypi, buildPythonPackage +, flake8-polyfill }: + +buildPythonPackage rec { + pname = "pep8-naming"; + version = "0.8.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1aff4g3i2z08cx7z17nbxbf32ddrnvqlk16h6d8h9s9w5ymivjq1"; + }; + + propagatedBuildInputs = [ + flake8-polyfill + ]; + + meta = with lib; { + homepage = https://github.com/PyCQA/pep8-naming; + description = "Check PEP-8 naming conventions, plugin for flake8"; + license = licenses.mit; + maintainers = with maintainers; [ eadwu ]; + }; +} diff --git a/pkgs/development/python-modules/pgpy/default.nix b/pkgs/development/python-modules/pgpy/default.nix new file mode 100644 index 00000000000..50220bb3993 --- /dev/null +++ b/pkgs/development/python-modules/pgpy/default.nix @@ -0,0 +1,48 @@ +{ lib, isPy3k, fetchFromGitHub, buildPythonPackage +, six, enum34, pyasn1, cryptography, singledispatch +, fetchPypi +, gpgme, flake8, pytest, pytestcov, pep8-naming, pytest-ordering }: + +buildPythonPackage rec { + pname = "pgpy"; + version = "0.5.2"; + + src = fetchFromGitHub { + owner = "SecurityInnovation"; + repo = "PGPy"; + rev = version; + sha256 = "1v2b1dyq1sl48d2gw7vn4hv6sasd9ihpzzcq8yvxj9dgfak2y663"; + }; + + propagatedBuildInputs = [ + six + pyasn1 + cryptography + singledispatch + ] ++ lib.optional (!isPy3k) enum34; + + checkInputs = [ + gpgme + flake8 + pytest + pytestcov + pep8-naming + pytest-ordering + ]; + + checkPhase = '' + pytest + ''; + + meta = with lib; { + homepage = https://github.com/SecurityInnovation/PGPy; + description = "Pretty Good Privacy for Python 2 and 3"; + longDescription = '' + PGPy is a Python (2 and 3) library for implementing Pretty Good Privacy + into Python programs, conforming to the OpenPGP specification per RFC + 4880. + ''; + license = licenses.bsd3; + maintainers = with maintainers; [ eadwu ]; + }; +} diff --git a/pkgs/development/python-modules/pika/default.nix b/pkgs/development/python-modules/pika/default.nix index 073c292c84d..28ca8a3e498 100644 --- a/pkgs/development/python-modules/pika/default.nix +++ b/pkgs/development/python-modules/pika/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "pika"; - version = "1.0.1"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "5ba83d3daffccb92788d24facdab62a3db6aa03b8a6d709b03dc792d35c0dfe8"; + sha256 = "1gqx9avb9nwgiyw5nz08bf99v9b0hvzr1pmqn9wbhd2hnsj6p9wz"; }; # Tests require twisted which is only availalble for python-2.x diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix new file mode 100644 index 00000000000..c2662915b12 --- /dev/null +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -0,0 +1,73 @@ +{ attrs +, buildPythonPackage +, defusedxml +, fetchPypi +, hypothesis +, isPy3k +, lxml +, pillow +, pybind11 +, pytest +, pytest-helpers-namespace +, pytest-timeout +, pytest_xdist +, pytestrunner +, python-xmp-toolkit +, python3 +, qpdf +, setuptools-scm-git-archive +, setuptools_scm +, stdenv +}: + +buildPythonPackage rec { + pname = "pikepdf"; + version = "1.1.0"; + disabled = ! isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "14b36r6h3088z2sxp2pqvm171js53hz53mwm1g52iadignjnp0my"; + }; + + buildInputs = [ + pybind11 + qpdf + ]; + + nativeBuildInputs = [ + setuptools-scm-git-archive + setuptools_scm + ]; + + checkInputs = [ + attrs + hypothesis + pillow + pytest + pytest-helpers-namespace + pytest-timeout + pytest_xdist + pytestrunner + python-xmp-toolkit + ]; + + propagatedBuildInputs = [ defusedxml lxml ]; + + postPatch = '' + substituteInPlace requirements/test.txt \ + --replace "pytest >= 3.6.0, < 4.1.0" "pytest >= 4.2.1, < 5" + ''; + + preBuild = '' + HOME=$TMPDIR + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/pikepdf/pikepdf"; + description = "Read and write PDFs with Python, powered by qpdf"; + license = licenses.mpl20; + maintainers = [ maintainers.kiwi ]; + }; +} + diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index f5be6ec308e..555f64bd42d 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "plotly"; - version = "3.10.0"; + version = "4.0.0"; src = fetchPypi { inherit pname version; - sha256 = "164aav7i3ann1lv3xbb76ylpph4hissl0wsnmil1s3m0r7sk7jsx"; + sha256 = "0iw0j2jwlbzknpbdpaqrjjlbycbwqhavp1crblvihf03knn7nkxz"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pomegranate/default.nix b/pkgs/development/python-modules/pomegranate/default.nix index e611e2ea5b1..7054485f302 100644 --- a/pkgs/development/python-modules/pomegranate/default.nix +++ b/pkgs/development/python-modules/pomegranate/default.nix @@ -1,17 +1,17 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, numpy, scipy, cython, networkx, joblib, nose }: +{ stdenv, buildPythonPackage, fetchFromGitHub, numpy, scipy, cython, networkx, joblib, nose, pyyaml }: buildPythonPackage rec { pname = "pomegranate"; - version = "0.8.1"; - + version = "0.11.0"; + src = fetchFromGitHub { repo = pname; owner = "jmschrei"; rev = "v${version}"; - sha256 = "085nka5bh88bxbd5vl1azyv9cfpp6grz2ngclc85f9kgccac1djr"; + sha256 = "0gf7z343ag4g7pfccn1sdap3ihkaxrc9ca75awjhmsa2cyqs66df"; }; - propagatedBuildInputs = [ numpy scipy cython networkx joblib ]; + propagatedBuildInputs = [ numpy scipy cython networkx joblib pyyaml ]; checkInputs = [ nose ]; @@ -20,9 +20,5 @@ buildPythonPackage rec { homepage = https://github.com/jmschrei/pomegranate; license = licenses.mit; maintainers = with maintainers; [ rybern ]; - - # "pomegranate does not yet work with networkx 2.0" - # see https://github.com/jmschrei/pomegranate/issues/209 - broken = true; }; } diff --git a/pkgs/development/python-modules/portalocker/default.nix b/pkgs/development/python-modules/portalocker/default.nix index c9f44dbcceb..7d536c83782 100644 --- a/pkgs/development/python-modules/portalocker/default.nix +++ b/pkgs/development/python-modules/portalocker/default.nix @@ -10,12 +10,12 @@ }: buildPythonPackage rec { - version = "1.4.0"; + version = "1.5.0"; pname = "portalocker"; src = fetchPypi { inherit pname version; - sha256 = "0gwjnalfwl1mb9a04m9h3hrds75xmc9na666aiz2cgz0m545dcrz"; + sha256 = "08y5k39mn5a7n69wv0hsyjqb51lazs4i4dpxp42nla2lhllnpbyr"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/poyo/default.nix b/pkgs/development/python-modules/poyo/default.nix index 26dcd244c51..b6d2eb3bda9 100644 --- a/pkgs/development/python-modules/poyo/default.nix +++ b/pkgs/development/python-modules/poyo/default.nix @@ -4,12 +4,12 @@ }: buildPythonPackage rec { - version = "0.4.2"; + version = "0.5.0"; pname = "poyo"; src = fetchPypi { inherit pname version; - sha256 = "07fdxlqgnnzb8r6lasvdfjcbd8sb9af0wla08rbfs40j349m8jn3"; + sha256 = "1pflivs6j22frz0v3dqxnvc8yb8fb52g11lqr88z0i8cg2m5csg2"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix b/pkgs/development/python-modules/pre-commit/default.nix index ed44043eb9a..6b65af073f4 100644 --- a/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix +++ b/pkgs/development/python-modules/pre-commit/default.nix @@ -1,12 +1,25 @@ -{ stdenv, python3Packages }: -with python3Packages; buildPythonApplication rec { +{ lib, fetchPypi, buildPythonApplication, pythonOlder +, aspy-yaml +, cached-property +, cfgv +, futures +, identify +, importlib-metadata +, importlib-resources +, nodeenv +, six +, toml +, virtualenv +}: + +buildPythonApplication rec { pname = "pre-commit"; - version = "1.17.0"; + version = "1.18.1"; src = fetchPypi { inherit version; pname = "pre_commit"; - sha256 = "1qswk30w2cq8xvj16mhszsi3npp0z08s8lki1w67nif23c2kkk6c"; + sha256 = "0d9ja186g41kw3gmhbi6xjvaslz6z4xis4qn1q6jabkka6jz4qhp"; }; propagatedBuildInputs = [ @@ -19,13 +32,13 @@ with python3Packages; buildPythonApplication rec { toml virtualenv importlib-metadata - ] ++ stdenv.lib.optional (pythonOlder "3.7") importlib-resources - ++ stdenv.lib.optional (pythonOlder "3.2") futures; + ] ++ lib.optional (pythonOlder "3.7") importlib-resources + ++ lib.optional (pythonOlder "3.2") futures; - # Tests fail due to a missing windll dependency + # slow and impure doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A framework for managing and maintaining multi-language pre-commit hooks"; homepage = https://pre-commit.com/; license = licenses.mit; diff --git a/pkgs/development/python-modules/pyGithub/default.nix b/pkgs/development/python-modules/pyGithub/default.nix index be409e348ea..a4e3cada1fc 100644 --- a/pkgs/development/python-modules/pyGithub/default.nix +++ b/pkgs/development/python-modules/pyGithub/default.nix @@ -1,23 +1,20 @@ { stdenv, fetchFromGitHub -, buildPythonPackage, python-jose, pyjwt }: +, buildPythonPackage, python-jose, pyjwt, requests, deprecated, httpretty }: buildPythonPackage rec { pname = "PyGithub"; - version = "1.36"; - name = pname + "-" + version; + version = "1.43.8"; src = fetchFromGitHub { owner = "PyGithub"; repo = "PyGithub"; rev = "v${version}"; - sha256 = "0yb74f9hg2vdsy766m850hfb1ss17lbgcdvvklm4qf72w12nxc5w"; + sha256 = "1625v558xga5mwhl9jqmibywy5qafmg1vqrirqz6zfq1la1d22mw"; }; - postPatch = '' - # requires network - echo "" > github/tests/Issue142.py - ''; - propagatedBuildInputs = [ python-jose pyjwt ]; + propagatedBuildInputs = [ python-jose pyjwt requests deprecated httpretty ]; + doCheck = false; + meta = with stdenv.lib; { homepage = https://github.com/PyGithub/PyGithub; description = "A Python (2 and 3) library to access the GitHub API v3"; diff --git a/pkgs/development/python-modules/pybindgen/default.nix b/pkgs/development/python-modules/pybindgen/default.nix index 4d8d0589eda..a322518979a 100644 --- a/pkgs/development/python-modules/pybindgen/default.nix +++ b/pkgs/development/python-modules/pybindgen/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchPypi, buildPythonPackage, isPy3k, setuptools_scm, pygccxml }: buildPythonPackage rec { pname = "PyBindGen"; - version = "0.19.0"; + version = "0.20.0"; src = fetchPypi { inherit pname version; - sha256 = "23f2b760e352729208cd4fbadbc618bd00f95a0a24db21a4182833afcc3b5208"; + sha256 = "0l9pz4s7p82ddf9nq56y1fk84j5dbsff1r2xnfily0m7sahyvc8g"; }; buildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/pyfaidx/default.nix b/pkgs/development/python-modules/pyfaidx/default.nix new file mode 100644 index 00000000000..26c36e70d0c --- /dev/null +++ b/pkgs/development/python-modules/pyfaidx/default.nix @@ -0,0 +1,24 @@ +{ lib +, buildPythonPackage +, fetchPypi +, six +}: + +buildPythonPackage rec { + pname = "pyfaidx"; + version = "0.5.5.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1akc8hk8rlw7sv07bv1n2r471acvmxwc57gb69frjpcwggf2phls"; + }; + + propagatedBuildInputs = [ six ]; + + meta = with lib; { + homepage = "https://github.com/mdshw5/pyfaidx"; + description = "Python classes for indexing, retrieval, and in-place modification of FASTA files using a samtools compatible index"; + license = licenses.bsd3; + maintainers = [ maintainers.jbedo ]; + }; +} diff --git a/pkgs/development/python-modules/pyglet/default.nix b/pkgs/development/python-modules/pyglet/default.nix index b3093390e3b..aae37e0282f 100644 --- a/pkgs/development/python-modules/pyglet/default.nix +++ b/pkgs/development/python-modules/pyglet/default.nix @@ -11,12 +11,12 @@ }: buildPythonPackage rec { - version = "1.3.2"; + version = "1.4.1"; pname = "pyglet"; src = fetchPypi { inherit pname version; - sha256 = "b00570e7cdf6971af8953b6ece50d83d13272afa5d1f1197c58c0f478dd17743"; + sha256 = "132p484g53b9p8g3q2bcnhzyg9x37hsm4rhpscl4llngjw5fbk22"; }; # find_library doesn't reliably work with nix (https://github.com/NixOS/nixpkgs/issues/7307). diff --git a/pkgs/development/python-modules/pyhepmc/default.nix b/pkgs/development/python-modules/pyhepmc/default.nix index 0ff269c9874..26a91a313ee 100644 --- a/pkgs/development/python-modules/pyhepmc/default.nix +++ b/pkgs/development/python-modules/pyhepmc/default.nix @@ -42,9 +42,9 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ pkgs.swig ]; - buildInputs = [ pkgs.hepmc ]; + buildInputs = [ pkgs.hepmc2 ]; - HEPMCPATH = pkgs.hepmc; + HEPMCPATH = pkgs.hepmc2; checkPhase = '' ${python.interpreter} test/test1.py diff --git a/pkgs/development/python-modules/pylibgen/default.nix b/pkgs/development/python-modules/pylibgen/default.nix index ce0df266332..559b75eec41 100644 --- a/pkgs/development/python-modules/pylibgen/default.nix +++ b/pkgs/development/python-modules/pylibgen/default.nix @@ -1,31 +1,33 @@ -{ buildPythonPackage, lib, fetchPypi -, isPy3k +{ lib, buildPythonPackage, fetchFromGitHub +, pythonOlder , requests , pytest +, pre-commit }: buildPythonPackage rec { pname = "pylibgen"; - version = "2.0.1"; + version = "2.0.2"; + disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - sha256 = "3c2a82b47cb7225dcf4ecea27081b0185ae4d195499140cdbb9597d914e1ae9e"; + src = fetchFromGitHub { + owner = "joshuarli"; + repo = pname; + rev = "v${version}"; + sha256 = "1a9vhkgnkiwkicr2s287254mrkpnw9jq5r63q820dp3h74ba4kl1"; }; - disabled = !isPy3k; - propagatedBuildInputs = [ requests ]; - checkInputs = [ pytest ]; + checkInputs = [ pytest pre-commit ]; - # no tests in PyPI tarball + # literally every tests does a network call doCheck = false; - meta = { + meta = with lib; { description = "Python interface to Library Genesis"; homepage = https://pypi.org/project/pylibgen/; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.nico202 ]; + license = licenses.mit; + maintainers = [ maintainers.nico202 ]; }; } diff --git a/pkgs/development/python-modules/pyotp/default.nix b/pkgs/development/python-modules/pyotp/default.nix index 05ba24eac39..6c1dcadaccf 100644 --- a/pkgs/development/python-modules/pyotp/default.nix +++ b/pkgs/development/python-modules/pyotp/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyotp"; - version = "2.2.7"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "00p69nw431f0s2ilg0hnd77p1l22m06p9rq4f8zfapmavnmzw3xy"; + sha256 = "18d13ikra1iq0xyfqfm72zhgwxi2qi9ps6z1a6zmqp4qrn57wlzw"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/pypcap/default.nix b/pkgs/development/python-modules/pypcap/default.nix index dc916213fcd..620b1d81160 100644 --- a/pkgs/development/python-modules/pypcap/default.nix +++ b/pkgs/development/python-modules/pypcap/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pypcap"; - version = "1.2.2"; + version = "1.2.3"; src = fetchPypi { inherit pname version; - sha256 = "07ww25z4xydp11hb38halh1940gmp5lca11hwfb63zv3bps248x3"; + sha256 = "1w5i79gh7cswvznr8rhilcmzhnh2y5c4jwh2qrfnpx05zqigm1xd"; }; patches = [ diff --git a/pkgs/development/tools/profiling/pyprof2calltree/default.nix b/pkgs/development/python-modules/pyprof2calltree/default.nix index a2d98bcf238..198445177c4 100644 --- a/pkgs/development/tools/profiling/pyprof2calltree/default.nix +++ b/pkgs/development/python-modules/pyprof2calltree/default.nix @@ -1,6 +1,6 @@ -{ lib, buildPythonApplication, fetchFromGitHub }: +{ lib, buildPythonPackage, fetchFromGitHub }: -buildPythonApplication rec { +buildPythonPackage rec { pname = "pyprof2calltree"; version = "1.4.4"; diff --git a/pkgs/development/python-modules/pyslurm/default.nix b/pkgs/development/python-modules/pyslurm/default.nix index d8609ca0776..974ac4499ac 100644 --- a/pkgs/development/python-modules/pyslurm/default.nix +++ b/pkgs/development/python-modules/pyslurm/default.nix @@ -2,28 +2,15 @@ buildPythonPackage rec { pname = "pyslurm"; - version = "18-08-3"; + version = "19-05-0"; src = fetchFromGitHub { repo = "pyslurm"; owner = "PySlurm"; rev = version; - sha256 = "1rymx106xa99wd4n44s7jw0w41spg39y1ji4fgn01yk7wjfrdrwg"; + sha256 = "1lfb4q81y96syz5an1lzscfcvmfvlkf4cfl3i5zllw9r3gbarl2r"; }; - # Needed for patch below to apply - prePatch = '' - sed -i -e '/__max_slurm_hex_version__ = "0x1208/c__max_slurm_hex_version__ = "0x120804"' setup.py - ''; - - patches = [ - # Implements a less strict slurm version check - (fetchpatch { - url = "https://github.com/PySlurm/pyslurm/commit/d3703f2d58b5177d29092fe1aae1f7a96da61765.diff"; - sha256 = "1s41z9bhzhplgg08p1llc3i8zw20r1479s04y0l1vx0ak51b6w0k"; - }) - ]; - buildInputs = [ cython slurm ]; setupPyBuildFlags = [ "--slurm-lib=${slurm}/lib" "--slurm-inc=${slurm.dev}/include" ]; diff --git a/pkgs/development/python-modules/pysnmp/default.nix b/pkgs/development/python-modules/pysnmp/default.nix index 621820e39de..ae4c273fc00 100644 --- a/pkgs/development/python-modules/pysnmp/default.nix +++ b/pkgs/development/python-modules/pysnmp/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { - version = "4.4.10"; pname = "pysnmp"; + version = "4.4.11"; src = fetchPypi { inherit pname version; - sha256 = "0bbcnn49krawq8pkhpzc427yxki0kxjndhhn61140j3wjbvavhah"; + sha256 = "1v7vz045pami4nx5hfvk8drarcswjclb0pfmg932x95fddbdx2zy"; }; # NameError: name 'mibBuilder' is not defined diff --git a/pkgs/development/python-modules/pysonos/default.nix b/pkgs/development/python-modules/pysonos/default.nix index 3f4ee6fea28..ad0db8dc8bc 100644 --- a/pkgs/development/python-modules/pysonos/default.nix +++ b/pkgs/development/python-modules/pysonos/default.nix @@ -7,28 +7,32 @@ , ifaddr # Test dependencies -, pytest_3, pylint, flake8, graphviz +, pytest, pylint, flake8, graphviz , mock, sphinx, sphinx_rtd_theme }: buildPythonPackage rec { pname = "pysonos"; - version = "0.0.21"; + version = "0.0.22"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0x2nznjnm721qw9nys5ap3b6hq9s48bsd1yj5xih50pvn0rf0nz2"; + sha256 = "4a4fe630b97c81261246a448fe9dd2bdfaacd7df4453cf72f020599171416442"; }; propagatedBuildInputs = [ xmltodict requests ifaddr ]; checkInputs = [ - pytest_3 pylint flake8 graphviz + pytest pylint flake8 graphviz mock sphinx sphinx_rtd_theme ]; + checkPhase = '' + pytest --deselect=tests/test_discovery.py::TestDiscover::test_discover + ''; + meta = { homepage = https://github.com/amelchio/pysonos; description = "A SoCo fork with fixes for Home Assistant"; diff --git a/pkgs/development/python-modules/pytest-helpers-namespace/default.nix b/pkgs/development/python-modules/pytest-helpers-namespace/default.nix new file mode 100644 index 00000000000..a4e0cb809ae --- /dev/null +++ b/pkgs/development/python-modules/pytest-helpers-namespace/default.nix @@ -0,0 +1,35 @@ +{ buildPythonPackage +, fetchFromGitHub +, pytest +, stdenv +}: + +buildPythonPackage rec { + pname = "pytest-helpers-namespace"; + version = "2019.1.8"; + + src = fetchFromGitHub { + owner = "saltstack"; + repo = "${pname}"; + rev = "v${version}"; + sha256 = "0z9f25d2wpf3lnqzmmnrlvl5b1f7kqwjjf4nzs9x2bpf91s5zny1"; + }; + + buildInputs = [ pytest ]; + + checkInputs = [ pytest ]; + + checkPhase = '' + pytest + ''; + + # The tests fail with newest pytest. They passed with pytest_3, which no longer exists + doCheck = false; + + meta = with stdenv.lib; { + homepage = "https://github.com/saltstack/pytest-helpers-namespace"; + description = "PyTest Helpers Namespace"; + license = licenses.asl20; + maintainers = [ maintainers.kiwi ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-mpl/default.nix b/pkgs/development/python-modules/pytest-mpl/default.nix index 0baaa9c5dfc..37ba58977e1 100644 --- a/pkgs/development/python-modules/pytest-mpl/default.nix +++ b/pkgs/development/python-modules/pytest-mpl/default.nix @@ -1,4 +1,4 @@ -{ lib +{ stdenv , buildPythonPackage , fetchPypi , pytest @@ -15,6 +15,8 @@ buildPythonPackage rec { sha256 = "7006e63bf1ca9c50bea3d189c0f862751a16ce40bb373197b218f57af5b837c0"; }; + buildInputs = [ pytest ]; + propagatedBuildInputs = [ matplotlib nose @@ -24,6 +26,9 @@ buildPythonPackage rec { pytest ]; + # disable tests on darwin, because it requires a framework build of Python + doCheck = !stdenv.isDarwin; + checkPhase = '' export HOME=$(mktemp -d) mkdir -p $HOME/.config/matplotlib @@ -32,7 +37,7 @@ buildPythonPackage rec { pytest ''; - meta = with lib; { + meta = with stdenv.lib; { description = "Pytest plugin to help with testing figures output from Matplotlib"; homepage = https://github.com/matplotlib/pytest-mpl; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/pytest-ordering/default.nix b/pkgs/development/python-modules/pytest-ordering/default.nix new file mode 100644 index 00000000000..ec340806964 --- /dev/null +++ b/pkgs/development/python-modules/pytest-ordering/default.nix @@ -0,0 +1,31 @@ +{ lib, fetchFromGitHub, buildPythonPackage +, pytest }: + +buildPythonPackage rec { + pname = "pytest-ordering"; + version = "unstable-2019-06-19"; + + # Pypi lacks tests/ + # Resolves PytestUnknownMarkWarning from pytest + src = fetchFromGitHub { + owner = "ftobia"; + repo = pname; + rev = "492697ee26633cc31d329c1ceaa468375ee8ee9c"; + sha256 = "1xim0kj5g37p1skgvp8gdylpx949krmx60w3pw6j1m1h7sakmddn"; + }; + + checkInputs = [ + pytest + ]; + + checkPhase = '' + pytest tests + ''; + + meta = with lib; { + homepage = https://github.com/ftobia/pytest-ordering; + description = "Pytest plugin to run your tests in a specific order"; + license = licenses.mit; + maintainers = with maintainers; [ eadwu ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-pylint/default.nix b/pkgs/development/python-modules/pytest-pylint/default.nix index 8943f220fe6..52eeccc7cd0 100644 --- a/pkgs/development/python-modules/pytest-pylint/default.nix +++ b/pkgs/development/python-modules/pytest-pylint/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pytest-pylint"; - version = "0.14.0"; + version = "0.14.1"; src = fetchPypi { inherit pname version; - sha256 = "7bfbb66fc6dc160193a9e813a7c55e5ae32028f18660deeb90e1cb7e980cbbac"; + sha256 = "1v6jqxbvzaw6v3xxwd689agy01k0j06q5c3q8gn2f3jlkrvylf4c"; }; buildInputs = [ pytestrunner ]; diff --git a/pkgs/development/python-modules/python-rapidjson/default.nix b/pkgs/development/python-modules/python-rapidjson/default.nix index 07cbffad1f8..c25f97434b0 100644 --- a/pkgs/development/python-modules/python-rapidjson/default.nix +++ b/pkgs/development/python-modules/python-rapidjson/default.nix @@ -8,13 +8,13 @@ }: buildPythonPackage rec { - version = "0.7.1"; + version = "0.7.2"; pname = "python-rapidjson"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "3ea01520ebe28d270c79120a836d251fbb2187227695461a310fe0293f348b2d"; + sha256 = "0z8wzl5mjzs97y7sbhlm59kak3z377xln3z8lkjwrsh2sh5c9x3v"; }; LC_ALL="en_US.utf-8"; diff --git a/pkgs/development/python-modules/python-vipaccess/default.nix b/pkgs/development/python-modules/python-vipaccess/default.nix new file mode 100644 index 00000000000..30c6dff048a --- /dev/null +++ b/pkgs/development/python-modules/python-vipaccess/default.nix @@ -0,0 +1,42 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, lxml +, oath +, pycryptodome +, requests +, pytest +}: + +buildPythonPackage rec { + pname = "python-vipaccess"; + version = "0.10.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "1m6b7qipiaj6pz86kjhyq5m5jxxijpk58gpsdkj5bn0wjl6x1pg2"; + }; + + propagatedBuildInputs = [ + lxml + oath + pycryptodome + requests + ]; + + checkInputs = [ pytest ]; + # test_check_token_detects_valid_hotp_token, + # test_check_token_detects_valid_totp_token and + # test_check_token_detects_invlaid_token require network + checkPhase = '' + mv vipaccess vipaccess.hidden + pytest tests/ -k 'not test_check_token' + ''; + + meta = with stdenv.lib; { + description = "A free software implementation of Symantec's VIP Access application and protocol"; + homepage = "https://github.com/dlenski/python-vipaccess"; + license = licenses.asl20; + maintainers = with maintainers; [ aw ]; + }; +} diff --git a/pkgs/development/python-modules/python-xmp-toolkit/default.nix b/pkgs/development/python-modules/python-xmp-toolkit/default.nix new file mode 100644 index 00000000000..93fa36fa2fc --- /dev/null +++ b/pkgs/development/python-modules/python-xmp-toolkit/default.nix @@ -0,0 +1,44 @@ +{ buildPythonPackage +, exempi +, fetchFromGitHub +, mock +, pythonOlder +, pytz +, stdenv +}: + +buildPythonPackage rec { + pname = "python-xmp-toolkit"; + version = "2.0.2"; + + # PyPi has version 2.0.1; the tests fail + # There are commits for a 2.0.2 release that was never published + # Not to github, not to PyPi + # This is the latest commit from Jun 29, 2017 (as of Mar 13, 2019) + # It includes the commits for the unreleased version 2.0.2 and more + # Tests pass with this version + src = fetchFromGitHub { + owner = "python-xmp-toolkit"; + repo = "python-xmp-toolkit"; + rev = "5692bdf8dac3581a0d5fb3c5aeb29be0ab6a54fc"; + sha256 = "16bylcm183ilzp7mrpdzw0pzp6csv9v5v247914qsv2abg0hgl5y"; + }; + + buildInputs = [ exempi ]; + + checkInputs = stdenv.lib.optionals (pythonOlder "3.3") [ mock ]; + + propagatedBuildInputs = [ pytz ]; + + postPatch = '' + substituteInPlace libxmp/exempi.py \ + --replace "ctypes.util.find_library('exempi')" "'${exempi}/lib/libexempi${stdenv.hostPlatform.extensions.sharedLibrary}'" + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/python-xmp-toolkit/python-xmp-toolkit; + description = "Python XMP Toolkit for working with metadata"; + license = licenses.bsd3; + maintainers = [ maintainers.kiwi ]; + }; +} diff --git a/pkgs/development/python-modules/pytrends/default.nix b/pkgs/development/python-modules/pytrends/default.nix new file mode 100644 index 00000000000..b3ada6247e3 --- /dev/null +++ b/pkgs/development/python-modules/pytrends/default.nix @@ -0,0 +1,29 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, requests +, lxml +, pandas +}: + +buildPythonPackage rec { + pname = "pytrends"; + version = "4.6.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "03gnn2mgjvpc7pbcijy7xilrhgjg7x2pp6ci96pdyqnhkqv02d3n"; + }; + + doCheck = false; + + propagatedBuildInputs = [ requests lxml pandas ]; + + meta = with stdenv.lib; { + description = "Pseudo API for Google Trends"; + homepage = "https://github.com/GeneralMills/pytrends"; + license = [ licenses.asl20 ]; + maintainers = [ maintainers.mmahut ]; + }; + +} diff --git a/pkgs/development/python-modules/pyutilib/default.nix b/pkgs/development/python-modules/pyutilib/default.nix index 0e19b971a16..8d9157fd7fb 100644 --- a/pkgs/development/python-modules/pyutilib/default.nix +++ b/pkgs/development/python-modules/pyutilib/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "pyutilib"; - version = "5.7.0"; + version = "5.7.1"; src = fetchPypi { pname = "PyUtilib"; inherit version; - sha256 = "086fzgjb2mjgkfhg1hvc2gcyam2ab28mijygwica5fg4zz6rn32l"; + sha256 = "1m5ijc5qmv8hg4yj496ix77hbcf7ylk4sa98ym53sfsyz0mg3kxr"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/qtawesome/default.nix b/pkgs/development/python-modules/qtawesome/default.nix index 7b1b8b0444c..a6c431764be 100644 --- a/pkgs/development/python-modules/qtawesome/default.nix +++ b/pkgs/development/python-modules/qtawesome/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "QtAwesome"; - version = "0.5.7"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "1c70k7b91f64df0v12ykv3xqj9pzgk919k215fb3y0d64zip42ai"; + sha256 = "05qypwlzjkw31x7qgn01d4kcf40mbymg5c9h3i7cx2r8sw29akjy"; }; propagatedBuildInputs = [ qtpy six ]; diff --git a/pkgs/development/python-modules/qtconsole/default.nix b/pkgs/development/python-modules/qtconsole/default.nix index 6e3c25ef0dd..055a54612a0 100644 --- a/pkgs/development/python-modules/qtconsole/default.nix +++ b/pkgs/development/python-modules/qtconsole/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "qtconsole"; - version = "4.5.1"; + version = "4.5.2"; src = fetchPypi { inherit pname version; - sha256 = "4af84facdd6f00a6b9b2927255f717bb23ae4b7a20ba1d9ef0a5a5a8dbe01ae2"; + sha256 = "0z6d2rmzrx2dzbx94xxmsrl6vn6jjpzvb6014y2bqhwr7znbjzkn"; }; checkInputs = [ nose ] ++ lib.optionals isPy27 [mock]; diff --git a/pkgs/development/python-modules/qtpy/default.nix b/pkgs/development/python-modules/qtpy/default.nix index 19cfcff4ab1..5d2210e00c4 100644 --- a/pkgs/development/python-modules/qtpy/default.nix +++ b/pkgs/development/python-modules/qtpy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "QtPy"; - version = "1.8.0"; + version = "1.9.0"; src = fetchPypi { inherit pname version; - sha256 = "14hws3zc2d548bfkxk1j2xy4ll368rak3z16bz3pdlj9j259jrpb"; + sha256 = "13cw8l7zrhbdi03k1wl1pg9xdl4ahdfa7yz8gd0f23sxnm22rdrd"; }; # no concrete propagatedBuildInputs as multiple backends are supposed diff --git a/pkgs/development/python-modules/relatorio/default.nix b/pkgs/development/python-modules/relatorio/default.nix index e9f4b8e2bd6..13a41d14f02 100644 --- a/pkgs/development/python-modules/relatorio/default.nix +++ b/pkgs/development/python-modules/relatorio/default.nix @@ -2,10 +2,10 @@ buildPythonPackage rec { pname = "relatorio"; - version = "0.8.1"; + version = "0.9.0"; src = fetchPypi { inherit pname version; - sha256 = "149a1c4c2a35d9b9e634fe80cac405bc9b4c03a42f818302362183515e7e835d"; + sha256 = "0q93sl7ppfvjxylgq9m5n4xdgv4af7d69yxd84zszq10vjmpsg6k"; }; propagatedBuildInputs = [ genshi diff --git a/pkgs/development/python-modules/rpyc/default.nix b/pkgs/development/python-modules/rpyc/default.nix index b69bf1851a8..5fbfba39ddc 100644 --- a/pkgs/development/python-modules/rpyc/default.nix +++ b/pkgs/development/python-modules/rpyc/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "rpyc"; - version = "4.1.0"; + version = "4.1.1"; src = fetchPypi { inherit pname version; - sha256 = "1pz90h21f74n8i3cx5ndxm4r3rismkx5qbw1c0cmfci9a3009rq5"; + sha256 = "0rhmwq1jra2cs0j09z2ks4vnv0svi8lj21nq9qq50i52x4ml4yb7"; }; propagatedBuildInputs = [ nose plumbum ]; diff --git a/pkgs/development/python-modules/ruffus/default.nix b/pkgs/development/python-modules/ruffus/default.nix new file mode 100644 index 00000000000..1b3b271fb61 --- /dev/null +++ b/pkgs/development/python-modules/ruffus/default.nix @@ -0,0 +1,53 @@ +{ gevent +, buildPythonPackage +, fetchFromGitHub +, hostname +, pytest +, python +, stdenv +}: + +buildPythonPackage rec { + pname = "ruffus"; + version = "2.8.1"; + + src = fetchFromGitHub { + owner = "cgat-developers"; + repo = "${pname}"; + rev = "v${version}"; + sha256 = "1gyabqafq4s2sy0prh3k1m8859shzjmfxr7fimx10liflvki96a9"; + }; + + propagatedBuildInputs = [ gevent ]; + + postPatch = '' + sed -i -e 's|/bin/bash|${stdenv.shell}|' ruffus/test/Makefile + sed -i -e 's|\tpytest|\t${pytest}/bin/pytest|' ruffus/test/Makefile + sed -i -e 's|\tpython|\t${python.interpreter}|' ruffus/test/Makefile + sed -i -e 's|/usr/bin/env bash|${stdenv.shell}|' ruffus/test/run_all_unit_tests.cmd + sed -i -e 's|python3|${python.interpreter}|' ruffus/test/run_all_unit_tests3.cmd + sed -i -e 's|python %s|${python.interpreter} %s|' ruffus/test/test_drmaa_wrapper_run_job_locally.py + ''; + + makefile = "ruffus/test/Makefile"; + + checkInputs = [ + gevent + hostname + pytest + ]; + + checkPhase = '' + export HOME=$TMPDIR + cd ruffus/test + make all PYTEST_OPTIONS="-q --disable-warnings" + ''; + + meta = with stdenv.lib; { + description = "Light-weight Python Computational Pipeline Management"; + homepage = http://www.ruffus.org.uk; + license = licenses.mit; + maintainers = [ maintainers.kiwi ]; + }; +} + diff --git a/pkgs/development/python-modules/runway-python/default.nix b/pkgs/development/python-modules/runway-python/default.nix new file mode 100644 index 00000000000..958b1ee45b3 --- /dev/null +++ b/pkgs/development/python-modules/runway-python/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, flask +, flask-cors +, numpy +, pillow +, gevent +, wget +, six +, colorcet +}: + +buildPythonPackage rec { + pname = "runway-python"; + version = "0.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "cd23550211aa8542d9c06516e25c32de3963fff50d0793d94def271a4e2b4514"; + }; + + propagatedBuildInputs = [ flask flask-cors numpy pillow gevent wget six colorcet ]; + + # tests are not packaged in the released tarball + doCheck = false; + + meta = { + description = "Helper library for creating Runway models"; + homepage = https://github.com/runwayml/model-sdk; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ prusnak ]; + }; +} diff --git a/pkgs/development/python-modules/scapy/default.nix b/pkgs/development/python-modules/scapy/default.nix index 7ca3fc0f94b..8f51b1eda21 100644 --- a/pkgs/development/python-modules/scapy/default.nix +++ b/pkgs/development/python-modules/scapy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "scapy"; - version = "2.4.2"; + version = "2.4.3"; disabled = isPyPy; @@ -21,15 +21,14 @@ buildPythonPackage rec { owner = "secdev"; repo = "scapy"; rev = "v${version}"; - sha256 = "03xzjklvc6y4d87k0rqpx5h112ld5nvgfldrbd8c4mx6f9mmd11n"; + sha256 = "08ypdzp0p3gvmz3pwi0i9q5f7hz9cq8yn6gawia49ynallwnv4zy"; }; # TODO: Temporary workaround patches = [ ./fix-version.patch ]; postPatch = '' - sed -i "s/NIXPKGS_SCAPY_VERSION/${version}/" \ - setup.py scapy/__init__.py + sed -i "s/NIXPKGS_SCAPY_VERSION/${version}/" scapy/__init__.py '' + lib.optionalString withManufDb '' substituteInPlace scapy/data.py --replace "/opt/wireshark" "${wireshark}" ''; diff --git a/pkgs/development/python-modules/scapy/fix-version.patch b/pkgs/development/python-modules/scapy/fix-version.patch index 7ecb16c3b7c..c39458e9fea 100644 --- a/pkgs/development/python-modules/scapy/fix-version.patch +++ b/pkgs/development/python-modules/scapy/fix-version.patch @@ -1,26 +1,13 @@ ---- a/setup.py 2018-02-15 22:14:08.531591678 +0100 -+++ b/setup.py 2018-03-27 17:15:38.617315539 +0200 -@@ -47,7 +47,7 @@ +diff --git a/scapy/__init__.py b/scapy/__init__.py +index d5ad6164..245ce2fb 100644 +--- a/scapy/__init__.py ++++ b/scapy/__init__.py +@@ -90,7 +90,7 @@ def _version(): + return 'unknown.version' - setup( - name='scapy', -- version=__import__('scapy').VERSION, -+ version='NIXPKGS_SCAPY_VERSION', - packages=[ - 'scapy', - 'scapy/arch', ---- a/scapy/__init__.py 2018-03-27 17:38:52.706481269 +0200 -+++ b/scapy/__init__.py 2018-03-27 17:39:56.576688890 +0200 -@@ -82,9 +82,10 @@ - if match: - return "git-archive.dev" + match.group(1) - elif sha1: -- return "git-archive.dev" + sha1 -+ return 'NIXPKGS_SCAPY_VERSION' - else: -- return 'unknown.version' -+ return 'NIXPKGS_SCAPY_VERSION' -+ - VERSION = _version() +-VERSION = __version__ = _version() ++VERSION = __version__ = "NIXPKGS_SCAPY_VERSION" + VERSION_MAIN = re.search(r"[0-9.]+", VERSION).group() + if __name__ == "__main__": diff --git a/pkgs/development/python-modules/sepaxml/default.nix b/pkgs/development/python-modules/sepaxml/default.nix index deb24a7130a..6e6809663a6 100644 --- a/pkgs/development/python-modules/sepaxml/default.nix +++ b/pkgs/development/python-modules/sepaxml/default.nix @@ -1,17 +1,32 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k }: +{ stdenv, buildPythonPackage, fetchFromGitHub, isPy27 +, lxml +, pytest +, text-unidecode +, xmlschema +}: buildPythonPackage rec { - version = "2.0.0"; + version = "2.1.0"; pname = "sepaxml"; - disabled = !isPy3k; + disabled = isPy27; - src = fetchPypi { - inherit pname version; - sha256 = "0jhj8fa0lbyaw15q485kyyli9qgrmqr47a6z6pgqm40kwmjghiyc"; + src = fetchFromGitHub { + owner = "raphaelm"; + repo = "python-sepaxml"; + rev = version; + sha256 = "0lkb0nnyxmwvm6gkwls8w2290b66lwz9bv8p39wwcn7flabviwhj"; }; - # no tests included in PyPI package - doCheck = false; + propagatedBuildInputs = [ + text-unidecode + xmlschema + ]; + + checkInputs = [ pytest lxml ]; + + checkPhase = '' + pytest + ''; meta = with stdenv.lib; { homepage = https://github.com/raphaelm/python-sepaxml/; diff --git a/pkgs/development/python-modules/shodan/default.nix b/pkgs/development/python-modules/shodan/default.nix index cefe7dac221..8723a7b940c 100644 --- a/pkgs/development/python-modules/shodan/default.nix +++ b/pkgs/development/python-modules/shodan/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "shodan"; - version = "1.13.0"; + version = "1.14.0"; src = fetchPypi { inherit pname version; - sha256 = "06z9h5vxrvqns3yr4jfrxifw0iqdn6ijlnznpmyi8nc18h8yma2a"; + sha256 = "0c5x53757p6ihh1f8xqsal2gi9ikcl3464b38qinva51s0kkb58k"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/simplefix/default.nix b/pkgs/development/python-modules/simplefix/default.nix new file mode 100644 index 00000000000..8b84d6a248e --- /dev/null +++ b/pkgs/development/python-modules/simplefix/default.nix @@ -0,0 +1,25 @@ +{ lib, python, buildPythonPackage, fetchFromGitHub }: + +buildPythonPackage rec { + pname = "simplefix"; + version = "1.0.12"; + + src = fetchFromGitHub { + repo = "simplefix"; + owner = "da4089"; + rev = "v${version}"; + sha256 = "0pnyqxpki1ija0kha7axi6irgiifcz4w77libagkv46b1z11cc4r"; + }; + + checkPhase = '' + cd test + ${python.interpreter} -m unittest all + ''; + + meta = with lib; { + description = "Simple FIX Protocol implementation for Python"; + homepage = https://github.com/da4089/simplefix; + license = licenses.mit; + maintainers = with maintainers; [ catern ]; + }; +} diff --git a/pkgs/development/python-modules/simplejson/default.nix b/pkgs/development/python-modules/simplejson/default.nix index 9e80830f438..abd4854c73f 100644 --- a/pkgs/development/python-modules/simplejson/default.nix +++ b/pkgs/development/python-modules/simplejson/default.nix @@ -1,18 +1,20 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , stdenv , pytest }: buildPythonPackage rec { pname = "simplejson"; - version = "3.16.0"; + version = "3.16.1"; doCheck = !stdenv.isDarwin; - src = fetchPypi { - inherit pname version; - sha256 = "b1f329139ba647a9548aa05fb95d046b4a677643070dc2afc05fa2e975d09ca5"; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "1v80dbk3ajhgz7q5cc8k0dd22zj9rrlz838c90l5g3w1i280r1iq"; }; # Package does not need pytest, but its a bit easier debugging. diff --git a/pkgs/development/python-modules/snscrape/default.nix b/pkgs/development/python-modules/snscrape/default.nix index 40b2626bade..a97d2e82c34 100644 --- a/pkgs/development/python-modules/snscrape/default.nix +++ b/pkgs/development/python-modules/snscrape/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , isPy3k , fetchPypi +, setuptools_scm , requests , lxml , beautifulsoup4 @@ -9,13 +10,13 @@ buildPythonPackage rec { pname = "snscrape"; - version = "0.2.0"; + version = "0.3.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "02mlpzkvpl2mv30cknq6ngw02y7gj2614qikq25ncrpg5vb903d9"; + sha256 = "1f3lyq06l8s4kcsmwbxcwcxnv6mvz9c3zj70np8vnx149p3zi983"; }; # There are no tests; make sure the executable works. @@ -24,6 +25,7 @@ buildPythonPackage rec { snscrape --help ''; + nativeBuildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ requests lxml beautifulsoup4 ]; meta = with lib; { diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index 1529d2ededb..cdef1b2a9bd 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -25,11 +25,11 @@ buildPythonPackage rec { pname = "spacy"; - version = "2.1.7"; + version = "2.1.8"; src = fetchPypi { inherit pname version; - sha256 = "0k4kh9jnpdawaqjxwcdi2h01s85s5r338ajgv9kkq59iha4hichh"; + sha256 = "1dja0crbai2n1l19m0hkv2fkj9r6zzy5ijd6dffp60v7lrch8lcw"; }; prePatch = '' diff --git a/pkgs/development/python-modules/sqlalchemy-utils/default.nix b/pkgs/development/python-modules/sqlalchemy-utils/default.nix new file mode 100644 index 00000000000..1212b6c94b0 --- /dev/null +++ b/pkgs/development/python-modules/sqlalchemy-utils/default.nix @@ -0,0 +1,50 @@ +{ lib, fetchPypi, buildPythonPackage +, six, sqlalchemy +, mock, pytz, isort, flake8, jinja2, pg8000, pyodbc, pytest, pymysql, dateutil +, docutils, flexmock, psycopg2, pygments }: + +buildPythonPackage rec { + pname = "sqlalchemy-utils"; + version = "0.34.0"; + + src = fetchPypi { + inherit version; + pname = "SQLAlchemy-Utils"; + sha256 = "0rlixs084isgxsvvpz96njqzikvg8x021sgjp4yj71jpd8blvg8f"; + }; + + propagatedBuildInputs = [ + six + sqlalchemy + ]; + + # Attempts to access localhost and there's also no database access + doCheck = false; + checkInputs = [ + mock + pytz + isort + flake8 + jinja2 + pg8000 + pyodbc + pytest + pymysql + dateutil + docutils + flexmock + psycopg2 + pygments + ]; + + checkPhase = '' + pytest tests + ''; + + meta = with lib; { + homepage = https://github.com/kvesteri/sqlalchemy-utils; + description = "Various utility functions and datatypes for SQLAlchemy"; + license = licenses.bsd3; + maintainers = with maintainers; [ eadwu ]; + }; +} diff --git a/pkgs/development/python-modules/stm32loader/default.nix b/pkgs/development/python-modules/stm32loader/default.nix new file mode 100644 index 00000000000..13272a5a0b7 --- /dev/null +++ b/pkgs/development/python-modules/stm32loader/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, isPy27 +, fetchPypi +, progress +, pyserial +, pytest +, mock +}: + +buildPythonPackage rec { + pname = "stm32loader"; + version = "0.5.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1w6jg4dcyz6si6dcyx727sxi75wnl0j89xkiwqmsw286s1y8ijjw"; + }; + + propagatedBuildInputs = [ progress pyserial ]; + + checkInputs = [ pytest ] ++ lib.optional isPy27 mock; + + checkPhase = '' + pytest --strict tests/unit + ''; + + meta = with lib; { + description = "Flash firmware to STM32 microcontrollers in Python"; + homepage = https://github.com/florisla/stm32loader; + changelog = "https://github.com/florisla/stm32loader/blob/v${version}/CHANGELOG.md"; + license = licenses.gpl3; + maintainers = with maintainers; [ emily ]; + }; +} diff --git a/pkgs/development/python-modules/traits/default.nix b/pkgs/development/python-modules/traits/default.nix index bfc3ae475eb..bcf205aa1d2 100644 --- a/pkgs/development/python-modules/traits/default.nix +++ b/pkgs/development/python-modules/traits/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "traits"; - version = "5.1.1"; + version = "5.1.2"; src = fetchPypi { inherit pname version; - sha256 = "0lwmqgkjihqkf269xmdqsa302p378zjcpz01k9a98br7ngzrsj64"; + sha256 = "0a17qmpw0z9h7ybh5yxrghvkcf2q90vgxzbnv1n4i0fxhi7mjy3s"; }; # Use pytest because its easier to discover tests diff --git a/pkgs/development/python-modules/unittest-data-provider/default.nix b/pkgs/development/python-modules/unittest-data-provider/default.nix new file mode 100644 index 00000000000..ec34a451156 --- /dev/null +++ b/pkgs/development/python-modules/unittest-data-provider/default.nix @@ -0,0 +1,21 @@ +{ buildPythonPackage +, lib +, fetchPypi +}: + +buildPythonPackage rec { + version = "1.0.1"; + pname = "unittest-data-provider"; + + src = fetchPypi { + inherit pname version; + sha256 = "1gn2ka4vqpayx4cpbp8712agqjh3wdpk9smdxnp709ccc2v7zg46"; + }; + + meta = with lib; { + description = "PHPUnit-like @dataprovider decorator for unittest"; + homepage = https://github.com/yourlabs/unittest-data-provider; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/development/python-modules/uranium/default.nix b/pkgs/development/python-modules/uranium/default.nix index 6365846bd26..aec0f731554 100644 --- a/pkgs/development/python-modules/uranium/default.nix +++ b/pkgs/development/python-modules/uranium/default.nix @@ -2,7 +2,7 @@ , pyqt5, numpy, scipy, shapely, libarcus, doxygen, gettext, pythonOlder }: buildPythonPackage rec { - version = "4.1.0"; + version = "4.2.0"; pname = "uranium"; format = "other"; @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "Ultimaker"; repo = "Uranium"; rev = version; - sha256 = "0vjlir9rd3xdlb8icdcr51qjmnh8nny6ajycria9idccriaqficj"; + sha256 = "1dc3s6zya7bbpvzh4acbs65aj899siwd8jr9snnsrdyl9qh8hhq9"; }; disabled = pythonOlder "3.5.0"; @@ -32,6 +32,6 @@ buildPythonPackage rec { homepage = https://github.com/Ultimaker/Uranium; license = licenses.lgpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ abbradar ]; + maintainers = with maintainers; [ abbradar gebner ]; }; } diff --git a/pkgs/development/python-modules/urlgrabber/default.nix b/pkgs/development/python-modules/urlgrabber/default.nix index 528846d7238..ffd99734f93 100644 --- a/pkgs/development/python-modules/urlgrabber/default.nix +++ b/pkgs/development/python-modules/urlgrabber/default.nix @@ -1,18 +1,16 @@ -{ stdenv, buildPythonPackage, fetchPypi, pycurl, isPy3k }: +{ stdenv, buildPythonPackage, fetchPypi, pycurl, six }: buildPythonPackage rec { pname = "urlgrabber"; - version = "3.10.2"; + version = "4.0.0"; name = "${pname}-${version}"; - disabled = isPy3k; - src = fetchPypi { inherit pname version; - sha256 = "0w1h7hlsq406bxfy2pn4i9bd003bwl0q9b7p03z3g6yl0d21ddq5"; + sha256 = "0fazs574fgixd525cn2dh027f4qf0c0gbwcfyfkhc6fkblfa1ibr"; }; - propagatedBuildInputs = [ pycurl ]; + propagatedBuildInputs = [ pycurl six ]; meta = with stdenv.lib; { homepage = http://urlgrabber.baseurl.org; @@ -21,4 +19,3 @@ buildPythonPackage rec { maintainers = with maintainers; [ qknight ]; }; } - diff --git a/pkgs/development/python-modules/vdf/default.nix b/pkgs/development/python-modules/vdf/default.nix index 1c924d8973d..2ce3e24f4cd 100644 --- a/pkgs/development/python-modules/vdf/default.nix +++ b/pkgs/development/python-modules/vdf/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "vdf"; - version = "3.1"; + version = "3.2"; src = fetchFromGitHub { owner = "ValvePython"; repo = pname; rev = "v${version}"; - sha256 = "19xqjq2159w2l9vaxlkickvy3zksp9ssdkvbfcfggxz31miwp1zr"; + sha256 = "08rb982hcwc9pr9gl0zfk9266h84fwbz097qjfkss3srwghr1247"; }; checkInputs = [ pytest pytestcov mock ]; diff --git a/pkgs/development/python-modules/vega_datasets/default.nix b/pkgs/development/python-modules/vega_datasets/default.nix index af1489df035..2d3dda551fb 100644 --- a/pkgs/development/python-modules/vega_datasets/default.nix +++ b/pkgs/development/python-modules/vega_datasets/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { checkInputs = [ pytest ]; checkPhase = '' - py.test vega_datasets --doctest-modules + py.test vega_datasets --doctest-modules -k 'not column_names' ''; meta = with lib; { diff --git a/pkgs/development/python-modules/webrtcvad/default.nix b/pkgs/development/python-modules/webrtcvad/default.nix new file mode 100644 index 00000000000..7bd0f20bfa1 --- /dev/null +++ b/pkgs/development/python-modules/webrtcvad/default.nix @@ -0,0 +1,24 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "webrtcvad"; + version = "2.0.10"; + + src = fetchPypi { + inherit pname version; + sha256 = "f1bed2fb25b63fb7b1a55d64090c993c9c9167b28485ae0bcdd81cf6ede96aea"; + }; + + # required WAV files for testing are not included in the tarball + doCheck = false; + + meta = { + description = "Interface to the Google WebRTC Voice Activity Detector (VAD)"; + homepage = https://github.com/wiseman/py-webrtcvad; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ prusnak ]; + }; +} diff --git a/pkgs/development/python-modules/wget/default.nix b/pkgs/development/python-modules/wget/default.nix new file mode 100644 index 00000000000..502c7f64b86 --- /dev/null +++ b/pkgs/development/python-modules/wget/default.nix @@ -0,0 +1,22 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "wget"; + version = "3.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "35e630eca2aa50ce998b9b1a127bb26b30dfee573702782aa982f875e3f16061"; + extension = "zip"; + }; + + meta = { + description = "Pure python download utility"; + homepage = http://bitbucket.org/techtonik/python-wget/; + license = with lib.licenses; [ unlicense ]; + maintainers = with lib.maintainers; [ prusnak ]; + }; +} diff --git a/pkgs/development/python-modules/wikipedia/default.nix b/pkgs/development/python-modules/wikipedia/default.nix deleted file mode 100644 index 19b7c42558e..00000000000 --- a/pkgs/development/python-modules/wikipedia/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, beautifulsoup4 -, requests -, python -}: - -buildPythonPackage rec { - pname = "wikipedia"; - version = "1.4.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "db0fad1829fdd441b1852306e9856398204dc0786d2996dd2e0c8bb8e26133b2"; - }; - - propagatedBuildInputs = [ - beautifulsoup4 - requests - ]; - - checkPhase = '' - runHook preCheck - - ${python.interpreter} -m unittest discover tests/ '*test.py' - - runHook postCheck - ''; - - meta = with lib; { - description = "Wikipedia API for Python"; - homepage = https://github.com/goldsmith/Wikipedia; - license = licenses.mit; - maintainers = [ maintainers.worldofpeace ]; - }; -} diff --git a/pkgs/development/python-modules/wurlitzer/default.nix b/pkgs/development/python-modules/wurlitzer/default.nix index 322c85b5810..d1797acb7d2 100644 --- a/pkgs/development/python-modules/wurlitzer/default.nix +++ b/pkgs/development/python-modules/wurlitzer/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "wurlitzer"; - version = "1.0.2"; + version = "1.0.3"; src = fetchPypi { inherit pname version; - sha256 = "23e85af0850b98add77bef0a1eb47b243baab29160131d349234c9dfc9e57add"; + sha256 = "0nab45pfgqdxhhyshf717xfzniss2h3bx19zdaq9gqr6v8lw6wpr"; }; checkInputs = [ mock pytest ]; diff --git a/pkgs/development/python-modules/wxPython/4.0.nix b/pkgs/development/python-modules/wxPython/4.0.nix index c953fe9fe1e..9f6e9866cef 100644 --- a/pkgs/development/python-modules/wxPython/4.0.nix +++ b/pkgs/development/python-modules/wxPython/4.0.nix @@ -1,8 +1,11 @@ { lib +, stdenv +, openglSupport ? true +, libX11 +, pyopengl , buildPythonPackage , fetchPypi , pkgconfig -, gtk3 , libjpeg , libtiff , SDL @@ -11,6 +14,16 @@ , freeglut , xorg , which +, cairo +, requests +, pango +, pathlib2 +, python +, doxygen +, ncurses +, libpng +, gstreamer +, wxGTK }: buildPythonPackage rec { @@ -22,14 +35,43 @@ buildPythonPackage rec { sha256 = "35cc8ae9dd5246e2c9861bb796026bbcb9fb083e4d49650f776622171ecdab37"; }; - nativeBuildInputs = [ - pkgconfig - ]; + doCheck = false; - buildInputs = [ - gtk3 libjpeg libtiff SDL gst-plugins-base libnotify freeglut xorg.libSM - which - ]; + nativeBuildInputs = [ pkgconfig which doxygen wxGTK ]; + + buildInputs = [ libjpeg libtiff SDL + gst-plugins-base libnotify freeglut xorg.libSM ncurses + requests libpng gstreamer libX11 + pathlib2 + (wxGTK.gtk) + ] + ++ lib.optional openglSupport pyopengl; + + hardeningDisable = [ "format" ]; + + DOXYGEN = "${doxygen}/bin/doxygen"; + + preConfigure = lib.optionalString (!stdenv.isDarwin) '' + substituteInPlace wx/lib/wxcairo/wx_pycairo.py \ + --replace 'cairoLib = None' 'cairoLib = ctypes.CDLL("${cairo}/lib/libcairo.so")' + substituteInPlace wx/lib/wxcairo/wx_pycairo.py \ + --replace '_dlls = dict()' '_dlls = {k: ctypes.CDLL(v) for k, v in [ + ("gdk", "${wxGTK.gtk}/lib/libgtk-x11-2.0.so"), + ("pangocairo", "${pango.out}/lib/libpangocairo-1.0.so"), + ("appsvc", None) + ]}' + ''; + + buildPhase = '' + ${python.interpreter} build.py -v --use_syswx dox etg --nodoc sip build_py + ''; + + installPhase = '' + ${python.interpreter} setup.py install --skip-build --prefix=$out + wrapPythonPrograms + ''; + + passthru = { inherit wxGTK openglSupport; }; meta = { @@ -38,4 +80,4 @@ buildPythonPackage rec { license = lib.licenses.wxWindows; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/xmlschema/default.nix b/pkgs/development/python-modules/xmlschema/default.nix new file mode 100644 index 00000000000..c021bde60cd --- /dev/null +++ b/pkgs/development/python-modules/xmlschema/default.nix @@ -0,0 +1,39 @@ +{ lib, buildPythonPackage, fetchFromGitHub +, elementpath +, pytest +}: + +buildPythonPackage rec { + version = "1.0.13"; + pname = "xmlschema"; + + src = fetchFromGitHub { + owner = "sissaschool"; + repo = "xmlschema"; + rev = "v${version}"; + sha256 = "182439gqhlxhr9rdi9ak33z4ffy1w9syhykkckkl6mq050c80qdr"; + }; + + propagatedBuildInputs = [ elementpath ]; + + checkInputs = [ pytest ]; + + # Ignore broken fixtures, and tests for files which don't exist. + # For darwin, we need to explicity say we can't reach network + checkPhase = '' + substituteInPlace xmlschema/tests/__init__.py \ + --replace "SKIP_REMOTE_TESTS = " "SKIP_REMOTE_TESTS = True #" + pytest . \ + --ignore=xmlschema/tests/test_factory.py \ + --ignore=xmlschema/tests/test_validators.py \ + --ignore=xmlschema/tests/test_schemas.py \ + -k 'not element_tree_import_script' + ''; + + meta = with lib; { + description = "XML Schema validator and data conversion library for Python"; + homepage = "https://github.com/sissaschool/xmlschema"; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/development/python-modules/yapsy/default.nix b/pkgs/development/python-modules/yapsy/default.nix index 9aa1985270d..dfdd3dd3c05 100644 --- a/pkgs/development/python-modules/yapsy/default.nix +++ b/pkgs/development/python-modules/yapsy/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "Yapsy"; - version = "1.12.0"; + version = "1.12.2"; src = fetchPypi { inherit pname version; - sha256 = "0g1yd8nvhfdasckb929rijmj040x25ycns2b3l5wq53gm4lv537h"; + sha256 = "12rznbnswfw0w7qfbvmmffr9r317gl1rqg36nijwzsklkjgks4fq"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/yattag/default.nix b/pkgs/development/python-modules/yattag/default.nix index 89a9e1abdc4..30518a19399 100644 --- a/pkgs/development/python-modules/yattag/default.nix +++ b/pkgs/development/python-modules/yattag/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "yattag"; - version = "1.11.2"; + version = "1.12.2"; src = fetchPypi { inherit pname version; - sha256 = "0grf7hskbxfxj60qmd44xiwmr9mzmi09inilvhykw28m0c84s8fp"; + sha256 = "1g0zhf09vs8cq0l5lx10dnqpimvg5mzh9k0z12n6nnfsw11cila7"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/zeep/default.nix b/pkgs/development/python-modules/zeep/default.nix index da6bdcde463..1aa03983f68 100644 --- a/pkgs/development/python-modules/zeep/default.nix +++ b/pkgs/development/python-modules/zeep/default.nix @@ -18,7 +18,7 @@ , freezegun , mock , pretend -, pytest_3 +, pytest , pytestcov , requests-mock , aioresponses @@ -54,12 +54,15 @@ buildPythonPackage rec { mock pretend pytestcov - pytest_3 + pytest requests-mock ] ++ lib.optional isPy3k aioresponses; checkPhase = '' runHook preCheck + # fix compatibility with pytest 4 + substituteInPlace tests/conftest.py \ + --replace 'request.node.get_marker("requests")' 'request.node.get_closest_marker("requests")' # ignored tests requires xmlsec python module HOME=$(mktemp -d) pytest tests --ignore tests/test_wsse_signature.py runHook postCheck diff --git a/pkgs/development/python-modules/zetup/default.nix b/pkgs/development/python-modules/zetup/default.nix index ee9270f3596..dcebf7d4ecf 100644 --- a/pkgs/development/python-modules/zetup/default.nix +++ b/pkgs/development/python-modules/zetup/default.nix @@ -1,14 +1,14 @@ { stdenv, buildPythonPackage, fetchPypi , setuptools_scm, pathpy, nbconvert -, pytest_3 }: +, pytest }: buildPythonPackage rec { pname = "zetup"; - version = "0.2.48"; + version = "0.2.52"; src = fetchPypi { inherit pname version; - sha256 = "41af61e8e103656ee633f89ff67d6a94848b9b9a836d351bb813b87a139a7c46"; + sha256 = "9ce97276acf0425499251c5eb700f6a3820adc52859df1e03c6d0f0b88a452cd"; }; # Python 3.7 compatibility @@ -19,10 +19,10 @@ buildPythonPackage rec { ''; checkPhase = '' - py.test test -k "not TestObject" + py.test test -k "not TestObject" --deselect=test/test_zetup_config.py::test_classifiers ''; - checkInputs = [ pytest_3 pathpy nbconvert ]; + checkInputs = [ pytest pathpy nbconvert ]; propagatedBuildInputs = [ setuptools_scm ]; meta = with stdenv.lib; { diff --git a/pkgs/development/r-modules/bioc-packages.nix b/pkgs/development/r-modules/bioc-packages.nix index 82727234124..03a30aad499 100644 --- a/pkgs/development/r-modules/bioc-packages.nix +++ b/pkgs/development/r-modules/bioc-packages.nix @@ -943,7 +943,7 @@ in with self; { chipenrich = derive2 { name="chipenrich"; version="2.6.1"; sha256="0nm55lfac405spccl9f19p5ij8mdaj6lm7qmaf4xqagsaf5x0pa9"; depends=[AnnotationDbi BiocGenerics chipenrich_data GenomeInfoDb GenomicRanges IRanges lattice latticeExtra mgcv org_Dm_eg_db org_Dr_eg_db org_Hs_eg_db org_Mm_eg_db org_Rn_eg_db plyr rms rtracklayer S4Vectors stringr]; }; chipseq = derive2 { name="chipseq"; version="1.32.0"; sha256="1pp1rm5fs3hlar5x4dl3a3b4gara7qwf81dbvka6r1n78hrf9x1b"; depends=[BiocGenerics GenomicRanges IRanges lattice S4Vectors ShortRead]; }; chopsticks = derive2 { name="chopsticks"; version="1.48.0"; sha256="0r52z0hjaxinw11jzg8cyhdpg2g1027vd5aiijwi6bmipdzw4sfk"; depends=[survival]; }; - chroGPS = derive2 { name="chroGPS"; version="2.0.1"; sha256="1bn5s1r927ifhwqifws0wgs7v15fk8922kbm8qdkg5zaqibj5qx7"; depends=[Biobase changepoint cluster DPpackage ellipse GenomicRanges ICSNP IRanges MASS vegan]; }; + chroGPS = derive2 { name="chroGPS"; version="2.0.1"; sha256="1bn5s1r927ifhwqifws0wgs7v15fk8922kbm8qdkg5zaqibj5qx7"; depends=[Biobase changepoint cluster ellipse GenomicRanges ICSNP IRanges MASS vegan]; }; chromDraw = derive2 { name="chromDraw"; version="2.12.0"; sha256="0qqam9vklg2cwsvcp9fm3l3c4lmjzf2lnxrv5dci16f8q55z88cl"; depends=[GenomicRanges Rcpp]; }; chromPlot = derive2 { name="chromPlot"; version="1.10.0"; sha256="15f7wmak0rp0bfzqsjmz6i8zk5g4axsgk7034qg4jw9hlp0nkd6v"; depends=[biomaRt GenomicRanges]; }; chromVAR = derive2 { name="chromVAR"; version="1.4.1"; sha256="16q9pmjlaqc7nvaxg9arfsrrnpcyzvz0gb5zq7l3g2jgjp4pfi30"; depends=[BiocGenerics BiocParallel Biostrings BSgenome DT GenomeInfoDb GenomicRanges ggplot2 IRanges Matrix miniUI nabor plotly RColorBrewer Rcpp RcppArmadillo Rsamtools Rtsne S4Vectors shiny SummarizedExperiment TFBSTools]; }; diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix index eca1fda4f6f..ed205130cae 100644 --- a/pkgs/development/r-modules/cran-packages.nix +++ b/pkgs/development/r-modules/cran-packages.nix @@ -4,7 +4,7 @@ # Rscript generate-r-packages.R cran >new && mv new cran-packages.nix { self, derive }: -let derive2 = derive { snapshot = "2019-07-01"; }; +let derive2 = derive { snapshot = "2019-08-05"; }; in with self; { A3 = derive2 { name="A3"; version="1.0.0"; sha256="017hq9pjsv1h9i7cqk5cfx27as54shlhdsdvr6jkhb8jfkpdb6cw"; depends=[pbapply xtable]; }; ABC_RAP = derive2 { name="ABC.RAP"; version="0.9.0"; sha256="1kdspln17v0krvahcd55vib4dv5azp60b3r1zf489x10qqbp1mxk"; depends=[]; }; @@ -33,14 +33,15 @@ in with self; { ADPF = derive2 { name="ADPF"; version="0.0.1"; sha256="1n7302xx77ngvp9i2h582i1mqslzllcdr0bn3pl2zk9jd8k97p7n"; depends=[]; }; ADPclust = derive2 { name="ADPclust"; version="0.7"; sha256="0s47cpsjykn7imsssa9w9b6g9d1sz2yah78yqzxmh0i3lqd757c1"; depends=[cluster dplyr fields knitr]; }; AEDForecasting = derive2 { name="AEDForecasting"; version="0.20.0"; sha256="16q2sn5zzvysyy3r32jnr21pbdkkn0k0sbarni6fdkx7pj27yijn"; depends=[changepoint forecast signal]; }; - AER = derive2 { name="AER"; version="1.2-6"; sha256="0x4l8ridghxlqjvq5wyv34yvy8mj5bzjrw9cik7f069q4lnklg35"; depends=[car Formula lmtest sandwich survival zoo]; }; + AER = derive2 { name="AER"; version="1.2-7"; sha256="14wahf8qwv66rv7wbv53y8rslid140n9n7kcr8nhqw8kcdh5rvis"; depends=[car Formula lmtest sandwich survival zoo]; }; AF = derive2 { name="AF"; version="0.1.5"; sha256="1r87ra55g0qm2s8cgsmdwck93ia2vr8zfab3in45mxm5xc501xgk"; depends=[data_table drgee ivtools stdReg survival]; }; AFM = derive2 { name="AFM"; version="1.2.6"; sha256="0yngk3j1wkamqzrwibn2csbn61jbdb872n0gi4d3hyhgilqzwbwf"; depends=[data_table dbscan fftwtools fractaldim ggplot2 gridExtra gstat igraph mixtools moments plyr png pracma rgl scales shiny shinyjs sp stringr]; }; AFheritability = derive2 { name="AFheritability"; version="0.1.0"; sha256="03w0a4z2x539ykyzdxm1mfqkhzz03cg0aqvgi062jrrm5m6f57ix"; depends=[ggplot2 mvtnorm reshape2 shiny]; }; AGD = derive2 { name="AGD"; version="0.39"; sha256="0hmq684snnffc2v7vmns4ky200a6zh1ggiap03n5cvpb3nlqc6lr"; depends=[gamlss gamlss_dist]; }; - AGHmatrix = derive2 { name="AGHmatrix"; version="0.0.5"; sha256="015wyvrrry4vfdg6qhjj3phjnrdx9707sp2mpf7fr67n2irc65d5"; depends=[Matrix]; }; + AGHmatrix = derive2 { name="AGHmatrix"; version="1.0.2"; sha256="0qipqk8p80463hfkbjnkw8ivziqj2xb15l54x52kcgbd9hl4zami"; depends=[Matrix zoo]; }; AGSDest = derive2 { name="AGSDest"; version="2.3.2"; sha256="0f3qchvdi2n1cr8ipjj332dw8hdza58dvfk21p0c6bhmxzg7f71i"; depends=[ldbounds]; }; AGread = derive2 { name="AGread"; version="0.2.2"; sha256="08d705fh11ksxijqjlc3ny7rclq7hw12f161h277fjdx71wgn8hp"; depends=[anytime binaryLogic data_table DescTools dplyr GGIR lubridate magrittr rlang seewave stringr]; }; + AHM = derive2 { name="AHM"; version="1.0.1"; sha256="00r1rn7d64a18rckbxvla5yapqv00p9ajxv72fx7s6p80kfal89w"; depends=[devtools dplyr glmnet Matrix mixexp plgp quadprog tibble tidyr]; }; AHMbook = derive2 { name="AHMbook"; version="0.1.4"; sha256="1cxyk420pzhh1scagxjmpm328xrcc1mpdrrch92yfgbgx09zkr4c"; depends=[coda plotrix RandomFields raster sp unmarked]; }; AHR = derive2 { name="AHR"; version="1.5.0"; sha256="0sscw80cz4r1xmdymp9knz0dfans7yzwjwklv7ahafxlflw5527h"; depends=[etm MASS Rcpp RcppArmadillo survival]; }; AICcmodavg = derive2 { name="AICcmodavg"; version="2.2-2"; sha256="0kpdl31wmwk5i4cqcwlm66c9s0c2b793army9dx50hdgrrzqc0na"; depends=[lattice MASS Matrix nlme survival unmarked VGAM xtable]; }; @@ -62,12 +63,13 @@ in with self; { AMModels = derive2 { name="AMModels"; version="0.1.4"; sha256="18h075bzk8s75b3zmjd0x8c6dpl40445d4kv8n0p4ldnx80b1aha"; depends=[unmarked]; }; AMOEBA = derive2 { name="AMOEBA"; version="1.1"; sha256="1npzh3rpfnxd4r1pj1hm214sfgbw4wmq4ws093lnl7pvsl0q37xn"; depends=[rlecuyer snowfall spdep]; }; AMORE = derive2 { name="AMORE"; version="0.2-15"; sha256="00zfqcsah2353mrhqkv8bbh24l8gaxk4y78icr9kxy4pqb2988yz"; depends=[]; }; + AMPLE = derive2 { name="AMPLE"; version="0.0.1"; sha256="1qgr5672s7w7w34r9392rygnw2mx7fcnkwgk42baf10wl9iflgs2"; depends=[dplyr ggplot2 RColorBrewer shiny shinyjs tidyr]; }; AMR = derive2 { name="AMR"; version="0.7.1"; sha256="1dgdiaa0xfdgdyaps2mx7xb4zis8rf5npa9cr2lz72nlhh3b0h5h"; depends=[backports crayon data_table dplyr ggplot2 hms knitr microbenchmark rlang scales tidyr]; }; ANN2 = derive2 { name="ANN2"; version="2.3.2"; sha256="0ib6cs2az0hhfg7vj4dk6fxbwjlc305psqjs188fdya2jrxgq1gs"; depends=[ggplot2 Rcpp RcppArmadillo reshape2 testthat viridisLite]; }; ANOM = derive2 { name="ANOM"; version="0.5"; sha256="14nfy9xplbabfprwxz5fvx26nmqhp657vr6d90dc8vk8ds63ckiz"; depends=[ggplot2 MCPAN multcomp nparcomp SimComp]; }; ANOVA_TFNs = derive2 { name="ANOVA.TFNs"; version="1.0"; sha256="0dwspvxj2gzyvxsd9xyhv47n1hjlqa7z9qza4h3hn1xda12vkjly"; depends=[FuzzyNumbers]; }; ANOVAShiny = derive2 { name="ANOVAShiny"; version="0.1.0"; sha256="1z8wi8c8j3rlchfk1vx101qz1r9j2jl5lfh72y5lqsisqxl2fyyz"; depends=[DescTools dplyr HH rhandsontable rmarkdown shiny]; }; - ANOVAreplication = derive2 { name="ANOVAreplication"; version="1.1.3"; sha256="1cmps21lrmk6lh6gx0q9fz2736q7cibfcisvir6hnik3ablv70bn"; depends=[quadprog shiny]; }; + ANOVAreplication = derive2 { name="ANOVAreplication"; version="1.1.4"; sha256="0rq4aphjmqrr4pm55vpc8qr4rghqkmlsqsvxzarx3kmr3aqlmqg8"; depends=[quadprog shiny]; }; APCanalysis = derive2 { name="APCanalysis"; version="1.0"; sha256="11snn5i8zyjpzf58ica762fpp14v7x5h8a8iwx4s4v81pgvlx862"; depends=[]; }; APFr = derive2 { name="APFr"; version="1.0.2"; sha256="1vax7rfccds6qz3bi6n1h3nzl9jnxpwk331wmpsbqlk23md3m4g4"; depends=[]; }; APML0 = derive2 { name="APML0"; version="0.9"; sha256="1scvcrcsjgdrq9gfv8qxbd703k76cyk01ml93bcr8j8kiwv05z0f"; depends=[Matrix Rcpp RcppEigen]; }; @@ -104,7 +106,7 @@ in with self; { AUCRF = derive2 { name="AUCRF"; version="1.1"; sha256="00d7jcg2dyvf7sc9w7vxxd85m7nsbcmfqsavrv236vxfpfc9yn7i"; depends=[randomForest]; }; AUtests = derive2 { name="AUtests"; version="0.98"; sha256="0m2nl55qfwfzlf92f43b9q75xqvrlx7qzcz6qlnjbjcr80s0qj9q"; depends=[logistf]; }; AWR = derive2 { name="AWR"; version="1.11.189"; sha256="0q9ss6cyx8vv85zif5v4s2bkv0amhyvzbs41mjjgmwb1csg53jgd"; depends=[rJava]; }; - AWR_Athena = derive2 { name="AWR.Athena"; version="2.0.6-1"; sha256="0kp5g9fcjdx5904l6b5l03h80hiqq12xx3jlj67y7w9brr2aj5qr"; depends=[rJava RJDBC]; }; + AWR_Athena = derive2 { name="AWR.Athena"; version="2.0.7-0"; sha256="1j9bqhyk0jzry4g379ml65gwxlszn7pjif1dywgns98jbry8mavh"; depends=[rJava RJDBC]; }; AWR_KMS = derive2 { name="AWR.KMS"; version="0.1"; sha256="00aqhyqlncsv0vfcyhaazxaclwm63v5kscssash7529avdwd4gqg"; depends=[AWR jsonlite rJava]; }; AWR_Kinesis = derive2 { name="AWR.Kinesis"; version="1.7.3"; sha256="1gfjzbb8xxfd2x5zabysqi0x10sb1c9826wqw8y555nsxgksqxz8"; depends=[AWR futile_logger jsonlite rJava]; }; AbSim = derive2 { name="AbSim"; version="0.2.6"; sha256="16ddjk8b6xw80ch4jis1y751i9561wdxh0gifbf15qiz3vjckq8m"; depends=[ape poweRlaw]; }; @@ -132,7 +134,7 @@ in with self; { AdhereR = derive2 { name="AdhereR"; version="0.5"; sha256="0wma06v02k50j0j8j5k1py3y6mwl8q7bsb288gyn67ms9wgv4fb5"; depends=[clipr colourpicker data_table DBI haven highlight knitr lubridate manipulate readODS readxl RMariaDB RSQLite scales shiny shinyjs shinyWidgets V8 viridisLite]; }; AdjBQR = derive2 { name="AdjBQR"; version="1.0"; sha256="14437pyz9v09ighwqvy1lcw0vfp2gaqzs9nzrb1gkfbb8ndzjw7k"; depends=[coda MHadaptive quantreg survival]; }; AdvBinomApps = derive2 { name="AdvBinomApps"; version="1.0"; sha256="1cnmn6c2dyl8qfl7g5sqwbjb52psqxzrj1mbm06zak2y1j7j8f49"; depends=[GenBinomApps rootSolve]; }; - AdvDif4 = derive2 { name="AdvDif4"; version="0.4.18"; sha256="1zcia5n8vb01j6m2hjh5jviyqpzk5f1zk69fryy8jlf5ammmr34f"; depends=[]; }; + AdvDif4 = derive2 { name="AdvDif4"; version="0.7.18"; sha256="1xdbk7w55cb2fh0mqlyrkdpnglrs55kyvvp32anvf2nw3ssrfmy7"; depends=[]; }; AeRobiology = derive2 { name="AeRobiology"; version="2.0.1"; sha256="14d5gjx53v2wfij8m4br0k7lfi6x2frc8ny1li4g8c05qv2dvnbb"; depends=[circular data_table dplyr ggplot2 ggvis lubridate plotly scales tidyr writexl zoo]; }; AggregateR = derive2 { name="AggregateR"; version="0.0.2"; sha256="15gxzs3baa6f1rqwv7s7k6zybx0za1mpzc7db1n47jy9rbh2yxb2"; depends=[dummy]; }; AgreementInterval = derive2 { name="AgreementInterval"; version="0.1.1"; sha256="1bvinzylvsaipa8mq15f45b6h37znavlrdl0rbrx1pqw52r7z8kv"; depends=[psych]; }; @@ -155,7 +157,7 @@ in with self; { AmyloGram = derive2 { name="AmyloGram"; version="1.1"; sha256="1xdi3i3nw4fzj4d040r55f0gid72gy3vbz5nbdrvapl97zk3kp8c"; depends=[biogram ranger seqinr shiny]; }; AnDE = derive2 { name="AnDE"; version="1.0"; sha256="1yil8ab50wvlqmdla9kmfba8vfgy5r694r6igb58s6vnmld78yf2"; depends=[discretization foreign functional stringr]; }; AnaCoDa = derive2 { name="AnaCoDa"; version="0.1.3.0"; sha256="1aps8fnh2d4vw5c9ypmgqnvwqzkjjfrmm7wq4xcy6lmlqks35zdv"; depends=[mvtnorm Rcpp]; }; - AnalyzeFMRI = derive2 { name="AnalyzeFMRI"; version="1.1-19"; sha256="0bhx82arwbazbnvpdmqcnnb502hxzv9zbl16z070p4vfkf0mincl"; depends=[fastICA R_matlab tkrplot]; }; + AnalyzeFMRI = derive2 { name="AnalyzeFMRI"; version="1.1-20"; sha256="1r2w6wf44p75r5m2hflnk1q71kv4vgds4hxyl5viyl6mg417brg5"; depends=[fastICA R_matlab tkrplot]; }; AnalyzeTS = derive2 { name="AnalyzeTS"; version="2.2"; sha256="0ll4g8yzxhricz56vin8hhyplrmvjmkwfldya41vz6y6bwhywnmb"; depends=[MASS TSA tseries TTR urca]; }; AncestryMapper = derive2 { name="AncestryMapper"; version="2.0"; sha256="1fr2y1a5rn7rq8aly94f618kywix32jwysi70nfhaqx8hf4zzprb"; depends=[svd]; }; AnglerCreelSurveySimulation = derive2 { name="AnglerCreelSurveySimulation"; version="1.0.2"; sha256="1nhd0i30g5wb5jh96gfaa0lgnbnj0m2vy4gz7v2c3142396zalnx"; depends=[dplyr ggplot2]; }; @@ -164,7 +166,7 @@ in with self; { AnnuityRIR = derive2 { name="AnnuityRIR"; version="1.0-0"; sha256="0yvfqzwhm5nhywfhzkxkfm07c0qi6z21j1cdaypz89qn567aj1d9"; depends=[actuar EnvStats fitdistrplus mc2d tseries]; }; AntAngioCOOL = derive2 { name="AntAngioCOOL"; version="1.2"; sha256="1krwms0y3xppc2y4m0az51wcbh4jq7mlr0jwinp66w8gh4k3qnp2"; depends=[caret rJava rpart RWeka]; }; AntWeb = derive2 { name="AntWeb"; version="0.7"; sha256="1ykfg3zzjdvjppr2l4f26lx00cn5vaqhhz1j1b5yh113ggyl40qw"; depends=[assertthat httr leafletR plyr rjson]; }; - AnthropMMD = derive2 { name="AnthropMMD"; version="2.5.3"; sha256="03xgnpzy6acb8zrhspjlv75vq46cbiprsm0vy2slcn7665axa60x"; depends=[scatterplot3d shiny smacof]; }; + AnthropMMD = derive2 { name="AnthropMMD"; version="3.0.1"; sha256="0f2j4nwni87r11zav4lvy0c8k9v6yrk2li3vls2xa02nlci64x26"; depends=[plotrix scatterplot3d shiny smacof]; }; Anthropometry = derive2 { name="Anthropometry"; version="1.12"; sha256="1m9ynypl5hyyqqmknd9hgys927bsglhg3l9rydy36l7lk1kf2m9m"; depends=[archetypes biclust cluster depth FNN ICGE nnls rgl shapes]; }; Aoptbdtvc = derive2 { name="Aoptbdtvc"; version="0.0.2"; sha256="1bygvf8vgzz3wa4485x2xxpk784zmw1nwsjjjysm12brrldh8zzh"; depends=[lpSolve MASS]; }; ApacheLogProcessor = derive2 { name="ApacheLogProcessor"; version="0.2.3"; sha256="0h4snigh1yhp34vw52h4b6qbh9c4cvwz2cx8fwvbnw6lslmg5cgv"; depends=[doParallel foreach stringr]; }; @@ -186,6 +188,7 @@ in with self; { AssocAFC = derive2 { name="AssocAFC"; version="1.0.2"; sha256="1rjiiir472dnr15xyvpn81s62nf01gl70khr8mrni65ssp5m30fb"; depends=[CompQuadForm]; }; AssocTests = derive2 { name="AssocTests"; version="0.0-4"; sha256="1fhqzbj4aj4srkiba79w8wdyc7yy701izklxqqa7lsifnca6gn4j"; depends=[cluster combinat fExtremes mvtnorm]; }; AssotesteR = derive2 { name="AssotesteR"; version="0.1-10"; sha256="0aysilg79vprcyjirqz6c5s1ry1ia92xik3l38qrw1gf3vfli9cw"; depends=[mvtnorm]; }; + AsyK = derive2 { name="AsyK"; version="0.1.0"; sha256="0m3byaa39m9d8l3pcbjxczvwc395wq5rj55qd7afmnj9a5zhgnaq"; 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=[]; }; @@ -198,13 +201,12 @@ in with self; { Autoplotprotein = derive2 { name="Autoplotprotein"; version="1.1"; sha256="13mxqmhhdiq7mz4m6nx39dsq7x3bm8fsgskswx48vsq6x2k6byxa"; depends=[ade4 plotrix plyr seqinr XML]; }; AutoregressionMDE = derive2 { name="AutoregressionMDE"; version="1.0"; sha256="1dmg0q4sp2d2anzhw2my8xjhpyjsx0kf7r202q5bkw8yr57jnhvr"; depends=[]; }; AzureAuth = derive2 { name="AzureAuth"; version="1.1.1"; sha256="0lamvfgdf1yc8p1v6q83i9j08s4h0657vzma0b0k7999xn60ffry"; depends=[httr jose jsonlite openssl R6 rappdirs]; }; - AzureContainers = derive2 { name="AzureContainers"; version="1.0.2"; sha256="0ixyqcs0l90sqlfgkykl6bzp4fs6ba4d8w6d39irbn0kq4rbp3h1"; depends=[AzureAuth AzureGraph AzureRMR httr openssl R6]; }; - AzureGraph = derive2 { name="AzureGraph"; version="1.0.2"; sha256="0c4p3zk7q7nx85zzpsfxrlnzq2ic45j6i6dqqq9yfvk17lf4vysb"; depends=[AzureAuth httr jsonlite openssl R6]; }; - AzureKeyVault = derive2 { name="AzureKeyVault"; version="1.0.0"; sha256="078m23a7fcvljm7a7za6krnqifbmsapirr3sdg05h92fknj4ajgk"; depends=[AzureAuth AzureGraph AzureRMR httr jose jsonlite openssl R6]; }; - AzureKusto = derive2 { name="AzureKusto"; version="1.0.1"; sha256="0xmsdvsqq2ccvxfjgz95xgn1z3f8m9avki5ljyx35772fcjdbkqs"; depends=[AzureAuth AzureRMR DBI dplyr httr jsonlite openssl R6 rlang tibble tidyselect]; }; - AzureML = derive2 { name="AzureML"; version="0.2.14"; sha256="1jhlbgfm3mr772hdkfi8jbv5lw8a08yb49sqaa14m1nz4ar9rckv"; depends=[base64enc codetools curl foreign jsonlite miniCRAN uuid]; }; - AzureRMR = derive2 { name="AzureRMR"; version="2.1.2"; sha256="01rp6kjyzlbmhl0g2lwzn3lafm0dl06sh87vg37zn6vr01jcc4sw"; depends=[AzureAuth httr jsonlite R6 uuid]; }; - AzureStor = derive2 { name="AzureStor"; version="2.0.2"; sha256="16wf5m5pzhph0hcbyvb16lxikllj67wk6sbrmkl9gpif6g7nvbyc"; depends=[AzureRMR httr mime openssl R6 xml2]; }; + AzureContainers = derive2 { name="AzureContainers"; version="1.1.0"; sha256="0c6xq47k4mggnc7id4xkzc4cznsg8b0aam6iymk587727a6rw1jw"; depends=[AzureAuth AzureGraph AzureRMR httr openssl R6]; }; + AzureGraph = derive2 { name="AzureGraph"; version="1.0.3"; sha256="0klfdx89rqx69qkvkyf8xbvy4x2ximlb5yav6l2jmcfaw739vdyh"; depends=[AzureAuth httr jsonlite openssl R6]; }; + AzureKeyVault = derive2 { name="AzureKeyVault"; version="1.0.1"; sha256="0vchsn7pcsbw6xq1v4qslaysaq1pwirsjmkv2w8skvhbjdxc84km"; depends=[AzureAuth AzureGraph AzureRMR httr jose jsonlite openssl R6]; }; + AzureKusto = derive2 { name="AzureKusto"; version="1.0.2"; sha256="08vac33zh3nz3iwgp8npvzjzxz6g8n1r8pami35zj5a71g4mrw36"; depends=[AzureAuth AzureRMR DBI dplyr httr jsonlite openssl R6 rlang tibble tidyselect]; }; + AzureRMR = derive2 { name="AzureRMR"; version="2.1.3"; sha256="0r801kn46s64i9a3gdpaciaai6wsz9sk9r4ira1x8wgm4w7m25q1"; depends=[AzureAuth httr jsonlite R6 uuid]; }; + AzureStor = derive2 { name="AzureStor"; version="2.1.0"; sha256="098pldcvwh5yqfl9xxmdh9wbpisxbmazi9fppncvisj9i6pw2n8w"; depends=[AzureRMR httr mime openssl R6 xml2]; }; AzureVM = derive2 { name="AzureVM"; version="2.0.0"; sha256="195mwr4bf79ryisvi7rv3i70ajvdcdy0l2n5zij6bhxwzbkb63db"; depends=[AzureRMR jsonlite R6]; }; 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]; }; @@ -218,7 +220,7 @@ in with self; { BAMBI = derive2 { name="BAMBI"; version="2.1.0"; sha256="029yzjv6zj54g9g0g4c6aj89dilcasnjipsf2d95n1xkzpvssvyp"; depends=[bridgesampling coda future_apply gtools label_switching lattice loo mvtnorm qrng RColorBrewer Rcpp RcppArmadillo rootSolve scales]; }; BAMMtools = derive2 { name="BAMMtools"; version="2.1.6"; sha256="01mb40w3g0xy93pl9064ky8kd46sa7qlz6by1r6kchcfhajx8plv"; depends=[ape gplots Rcpp]; }; BANEScarparkinglite = derive2 { name="BANEScarparkinglite"; version="0.1.2"; sha256="0yxsgk4p7i8arjkchsiml6lx97inpmaihb61787vcl8kxyx7v6wr"; depends=[dplyr httr lubridate RCurl readr rvest XML xml2 zoo]; }; - BANOVA = derive2 { name="BANOVA"; version="1.1.2"; sha256="04f11394z3zni1fxk60zd61kgy1603nfb81wkkqg8jh4997nhbmi"; depends=[coda rjags rstan runjags]; }; + BANOVA = derive2 { name="BANOVA"; version="1.1.3"; sha256="11f5s1paskq5z3hwy6gs8irgignjfmjr9qz3kxnir1ahxvrxs7ma"; depends=[coda rjags rstan runjags]; }; BART = derive2 { name="BART"; version="2.5"; sha256="0ljlzk114r0r57mc4jy2ivx3fk953v1c70gmcq63z5j2z9dd7cak"; depends=[nlme nnet Rcpp survival]; }; BAS = derive2 { name="BAS"; version="1.5.3"; sha256="0xf8wd42mlk6dkkiwzf9lyb5fvqmpjsqyzay146d6p2y1zk65lc0"; depends=[]; }; BASIX = derive2 { name="BASIX"; version="1.1"; sha256="18dkvv1iwskfnlpl6xridcgqpalbbpm2616mvc3hfrc0b26v01id"; depends=[]; }; @@ -267,7 +269,7 @@ in with self; { BH = derive2 { name="BH"; version="1.69.0-1"; sha256="18mckfwxxv8m8rzaz03mg2h6vhaj7y131h6yasfg0s73nxj47zd0"; depends=[]; }; BHH2 = derive2 { name="BHH2"; version="2016.05.31"; sha256="1m4fcx979nbm97hi89vbjjix0sx6qhdzs486risck9bi7yzih5k4"; depends=[]; }; BHMSMAfMRI = derive2 { name="BHMSMAfMRI"; version="1.3"; sha256="1cha6bw0zvv30y2hjl1a4d04g1r80dfa7r7zi63q5jjnnbklbswg"; depends=[oro_nifti wavethresh]; }; - BHSBVAR = derive2 { name="BHSBVAR"; version="1.0.3"; sha256="1k9bqxsxx4rxi0kr7zskdlryvcq45fxifrnk7sd9lsx63s6qlrjm"; depends=[Rcpp RcppArmadillo]; }; + BHSBVAR = derive2 { name="BHSBVAR"; version="1.0.4"; sha256="19sqcfg6w6cnk35bxdc0wzizh0slhl684yhjh7zyg1k92dvprfr6"; depends=[Rcpp RcppArmadillo]; }; BHTSpack = derive2 { name="BHTSpack"; version="0.5"; sha256="1sz99sgxhiajxca5bx2ns9g9qs9ymsvh8i5882nlp7c78qxmqc4g"; depends=[R2HTML xtable]; }; BICORN = derive2 { name="BICORN"; version="0.1.0"; sha256="0mqk8vgp6jdk7f0paa06yqlibkd1y3vs69pg7i9mkvxmda7p4nkq"; depends=[]; }; BIEN = derive2 { name="BIEN"; version="1.2.3"; sha256="0p23kahba55gkk6wx10ii6vrni3b7ia2a4jb64ww4kwp86bknx3d"; depends=[ape DBI rgdal rgeos RPostgreSQL sp]; }; @@ -293,18 +295,17 @@ in with self; { BMRBr = derive2 { name="BMRBr"; version="0.2.0"; sha256="0v2ysap5jfkq9fc5blqlfhsv2bs8rqybmp5z4q3g6y3y7qzhypjw"; depends=[rvest xml2]; }; BMRV = derive2 { name="BMRV"; version="1.32"; sha256="1j1cwjk3l7f06nqdwrqdyhzm43bb8hj5wgdd14zc1grxyfc9ya95"; depends=[BH]; }; BMS = derive2 { name="BMS"; version="0.3.4"; sha256="0z3mk1xd1fphf80kdbashkn04jwsr2bghms4d7nav3pw73q41wql"; depends=[]; }; - BMSC = derive2 { name="BMSC"; version="0.2.0"; sha256="049g14829rfgwx52isdl4028d7gh1wb7dbmnj9zz0skwb7qrpz9g"; depends=[BH dplyr ggplot2 loo R_utils Rcpp RcppEigen rstan rstantools StanHeaders]; }; BMT = derive2 { name="BMT"; version="0.1.0.3"; sha256="1vdah5bsn41s2qriq15xi7dw9qzngaacmn5gk6yc7hi89dwyy3yj"; depends=[fitdistrplus partitions]; }; BMTME = derive2 { name="BMTME"; version="1.0.6"; sha256="1x15h3l459g4k7i97yry2wlb4arw35mkv7jiad6d23jifz5l6485"; depends=[BGLR doSNOW dplyr foreach matrixcalc mvtnorm progress Rcpp RcppArmadillo snow tidyr]; }; - BMhyb = derive2 { name="BMhyb"; version="1.5.2"; sha256="0sf12xibr22i3pqdb7zay1mmgfnvqxdlimsbd8y5pi4ybiqz8bl8"; depends=[ape corpcor DEoptim geiger lhs Matrix mvtnorm numDeriv phylobase phytools TreeSim viridis]; }; + BMhyb = derive2 { name="BMhyb"; version="2.1.5"; sha256="0yyvrn5akj132zkxlg5kicj12d7agzmi84jird4aj7hvi88l5wwv"; depends=[ape corpcor cowplot DEoptim geiger ggplot2 igraph lhs MASS Matrix metR mvtnorm numDeriv phytools plyr TreeSim viridis]; }; BMhyd = derive2 { name="BMhyd"; version="1.2-8"; sha256="14pv5f621zq5x9i408zjm8k80hcsabkjpdf86gk3ylgw5yqcivrx"; depends=[ape corpcor geiger mvtnorm numDeriv phylobase phytools TreeSim]; }; BMisc = derive2 { name="BMisc"; version="1.3.1"; sha256="0wh17bf1ii6zan09n59cf9257nb60nh08ig01id9k0bvm9f14ay6"; depends=[formula_tools plm]; }; BNDataGenerator = derive2 { name="BNDataGenerator"; version="1.0"; sha256="17zi83jhpn9ygavkpr9haffvd4622sca18jzzxxxmfq0ilrj201g"; depends=[]; }; BNN = derive2 { name="BNN"; version="1.0.2"; sha256="13h9xqfdqnc9d8brx1xlmvb4nrkpwncwjz98y7i3wijih85wkikd"; depends=[mvtnorm]; }; BNPMIXcluster = derive2 { name="BNPMIXcluster"; version="1.2.4"; sha256="06s0cs3anbby93n7pjcin9195agfzfq9im6f9k7ih3cbg8mzfaqy"; depends=[gplots MASS matrixcalc mvtnorm plyr Rcpp RcppArmadillo truncnorm]; }; BNPTSclust = derive2 { name="BNPTSclust"; version="1.1"; sha256="1zmxwg6zn3nqqm1sw2n4pvq47mv7ygb4lf1c6yhn3xaf1rqmf26s"; depends=[MASS mvtnorm]; }; - BNPdensity = derive2 { name="BNPdensity"; version="2017.03"; sha256="0anpi75wwx91dbm937ydgcpd8wchm0nyciy4xdhppsvzq9v3d2hp"; depends=[]; }; - BNPmix = derive2 { name="BNPmix"; version="0.1.2"; sha256="10zm1ds07gb9iih8rh72djzimw3ja3qja7fsjxga25qrw0pdf7ic"; depends=[ggplot2 Rcpp RcppArmadillo]; }; + BNPdensity = derive2 { name="BNPdensity"; version="2019.7.9"; sha256="1r6cisb4ygk8jxdlc2kma7f61rviad5782di8r3ksp5nal6gb31f"; depends=[coda dplyr ggplot2 gridExtra survival tidyr viridis]; }; + BNPmix = derive2 { name="BNPmix"; version="0.2.2"; sha256="0q4kn4ryn9m9vcxjsnbp2rcd9cn3na09nci79g30lscgwfci7w0a"; depends=[ggplot2 Rcpp RcppArmadillo]; }; BNSL = derive2 { name="BNSL"; version="0.1.4"; sha256="0nrlx55364kgvkdpyaimgjxwnzmmdl1gmvyv3wkm8n2jyki92xxp"; depends=[bnlearn igraph Rcpp]; }; BNSP = derive2 { name="BNSP"; version="2.1.0"; sha256="01nfzyzd1s55rhc1mghlcqgq6cnp8g44acyfb89vd0w9mdwgj8r0"; depends=[coda corrplot cubature Formula ggplot2 gridExtra mgcv plot3D plyr threejs]; }; BOG = derive2 { name="BOG"; version="2.0"; sha256="0lz5af813b67hfl4hzcydn58sjhgn5706n2h44g488bks928k940"; depends=[DIME hash]; }; @@ -317,7 +318,7 @@ in with self; { BSDA = derive2 { name="BSDA"; version="1.2.0"; sha256="0gs33yyca45jd4f5k5f7qid4ayw2rnl2wl7a6m7vf39dfx7ympm2"; depends=[e1071 lattice]; }; BSGS = derive2 { name="BSGS"; version="2.0"; sha256="08m8g4zbsp55msqbic4f17lcry07mdn0f5a61zdcy2msn2ihzzf9"; depends=[batchmeans MASS plyr pscl]; }; BSGW = derive2 { name="BSGW"; version="0.9.2"; sha256="1q6qvm9yxh35wywrzs3kr31jsa0bmbwrqh0r3qjc0dzi6q8n6pjy"; depends=[doParallel foreach MfUSampler survival]; }; - BSL = derive2 { name="BSL"; version="2.0.0"; sha256="14wd7g2b2l3777c07f392mb4dy9azy645zwlfc6lrh8lbcrgqdlc"; depends=[coda copula cvTools foreach ggplot2 glasso gridExtra MASS mvtnorm Rcpp RcppArmadillo]; }; + BSL = derive2 { name="BSL"; version="3.0.0"; sha256="1cmydj59slj88awc2i7jg84hfaa9j3qp4d1042dgamc7xqvfh397"; depends=[coda copula foreach ggplot2 glasso gridExtra MASS mvtnorm Rcpp RcppArmadillo]; }; BSPADATA = derive2 { name="BSPADATA"; version="1.0"; sha256="1g709i0icxlxq2ljb2sm5iyc8ljqxadi62xc4mg702fsgl0x5ny9"; depends=[mvtnorm pscl spdep]; }; BSSasymp = derive2 { name="BSSasymp"; version="1.2-1"; sha256="0w141yxqpck59n85rjc6d3qy6bwhk1z80zsm21hda0bgfwy9v6wy"; depends=[fICA JADE]; }; BSagri = derive2 { name="BSagri"; version="0.1-10"; sha256="096l2ilr4x2fbjxchkksxkbiyaf7wwdmzn4xyjx001w873x9dgf6"; depends=[boot gamlss MCPAN mratios multcomp mvtnorm]; }; @@ -329,7 +330,7 @@ in with self; { BTYDplus = derive2 { name="BTYDplus"; version="1.0.1"; sha256="0x8as4zskpbsvhh8gnvzgp833dkv01cs5fqfva9qri296343kppv"; depends=[bayesm BTYD coda data_table mvtnorm Rcpp]; }; BTdecayLasso = derive2 { name="BTdecayLasso"; version="0.1.0"; sha256="0x1s2zvv3vnapk5wp8582zwflsqvgc8khkvl5ch9i70v739jxp15"; depends=[ggplot2 optimr]; }; BUCSS = derive2 { name="BUCSS"; version="1.1.0"; sha256="1agx6yd29zq6gvwgnd0qahjnk5z7gdbijbg7rk85d5x6pihwmh9q"; depends=[]; }; - BVAR = derive2 { name="BVAR"; version="0.1.3"; sha256="0dhg5l1r6ayh14c4h26v1p91vy8qi1zkwjj6grz0wc3w2whcs8gi"; depends=[MASS]; }; + BVAR = derive2 { name="BVAR"; version="0.1.5"; sha256="0vq1a4a5l444asbbr5f9ha6s3py9n24dria1a7yk3wfh302fj15s"; depends=[MASS]; }; BVS = derive2 { name="BVS"; version="4.12.1"; sha256="111g61bpwh80v6gy44q087swcrnnnzdcibm22pzzi9jsfphy6l0c"; depends=[haplo_stats MASS msm]; }; BVSNLP = derive2 { name="BVSNLP"; version="1.1.8"; sha256="0qlmvi189ky6h0a3jyvyil488asx3v6x52mvca7s93dvarxr6rw1"; depends=[doParallel foreach Rcpp RcppArmadillo RcppEigen RcppNumerical]; }; BWStest = derive2 { name="BWStest"; version="0.2.2"; sha256="02amzlfprmw5pyis0dg0kg0x8xqh50a4vfdcxxmklrzik3b1vzzs"; depends=[memoise Rcpp]; }; @@ -343,6 +344,7 @@ in with self; { BalanceCheck = derive2 { name="BalanceCheck"; version="0.2"; sha256="0aal641vfbjk3w6ipwbqqmm9nnxs962hjmpph9wnqaqk5r6s7brs"; depends=[ade4 mvtnorm]; }; BalancedSampling = derive2 { name="BalancedSampling"; version="1.5.5"; sha256="01ayvjfs83dbnk0m9xb7y9rnxxpfpb6w4qjdffd6hdhcn2s5f73d"; depends=[Rcpp SamplingBigData]; }; Ball = derive2 { name="Ball"; version="1.3.8"; sha256="0zzi4xmarha30n5c2k452vr4dli1nc1rpx79pwfaj5h0rn1q01yy"; depends=[gam mvtnorm survival]; }; + BallMapper = derive2 { name="BallMapper"; version="0.1.0"; sha256="1v0n4nyxhz3i7jkyrg3zgznz4z0rim68pv60dvn8197q81z0bk7g"; depends=[fields igraph networkD3 scales testthat]; }; BarBorGradient = derive2 { name="BarBorGradient"; version="1.0.5"; sha256="0g2g7hrm23as1xbj79g48r8sj3gsj66fmi895jqlqfbqrl2fl7a5"; depends=[]; }; BarcodingR = derive2 { name="BarcodingR"; version="1.0-2"; sha256="1mn5rdax8v1s2z3apk9z0kzy4hw19m8ql6j91l6wd29g2n2bjqxx"; depends=[ape class nnet sp]; }; Barnard = derive2 { name="Barnard"; version="1.8"; sha256="1ki58hjs5kpmp76kwj1qi6hwmdvjphqb1lvrlhnmkgqxg4hw4vqg"; depends=[]; }; @@ -358,7 +360,7 @@ in with self; { BayesBD = derive2 { name="BayesBD"; version="1.2"; sha256="10ik2lndqgmy6pvdm6cx4fsxgjb2fgi6hlz5ic35ab7fkpi90ka5"; depends=[jpeg mritc png Rcpp RcppArmadillo shiny]; }; BayesBinMix = derive2 { name="BayesBinMix"; version="1.4.1"; sha256="1b18qg0mjbmrilwqffrq33gw04fzask2xgj1bp4cli51cjf2slf7"; depends=[coda doParallel foreach label_switching]; }; BayesCR = derive2 { name="BayesCR"; version="2.1"; sha256="1qav7l64iqqdvr1v6c7hlzvbx7zbvsa55pyisvkq5rsayy1rdsl1"; depends=[mnormt mvtnorm rootSolve truncdist]; }; - BayesCTDesign = derive2 { name="BayesCTDesign"; version="0.5.0"; sha256="0q37q2mwvg9616chr2xzgd4mrpv9rqsqq9p0lc02gi35ay7hafcp"; depends=[eha ggplot2 reshape2 survival]; }; + BayesCTDesign = derive2 { name="BayesCTDesign"; version="0.6.0"; sha256="1ym2v5ynmb28miwivyjx604vfsfi5ksmaha0far0ddq2cl06if2q"; depends=[eha ggplot2 reshape2 survival]; }; BayesCombo = derive2 { name="BayesCombo"; version="1.0"; sha256="01rzjja0xzvqyjivl8a9da13v13ylm4dwv4f27cmgz2znakfg5y8"; depends=[]; }; BayesComm = derive2 { name="BayesComm"; version="0.1-2"; sha256="1rrbvwcfm93cw0m33g0zn6nyshfjc97kb3fby9cga0zaixc0a8rk"; depends=[abind coda mvtnorm Rcpp RcppArmadillo]; }; BayesDA = derive2 { name="BayesDA"; version="2012.04-1"; sha256="0fp27cmhw8dsxr4mc1flm6qh907476kph8ch2889g9p31xm1psjc"; depends=[]; }; @@ -381,7 +383,6 @@ in with self; { BayesS5 = derive2 { name="BayesS5"; version="1.31"; sha256="1azxn3r0s52zy6y5qsa6yx331795mkk7fb28fcinv2zx9iyvk33w"; depends=[abind Matrix snowfall]; }; BayesSAE = derive2 { name="BayesSAE"; version="1.0-2"; sha256="1xbx9hr254agpcqs1fl7qi7h19fd2bbmjszn44l566n2svgvxwf5"; depends=[coda Formula lattice]; }; BayesSenMC = derive2 { name="BayesSenMC"; version="0.1.1"; sha256="0bvlhhivdaw386ir5zb47bxg5dbqlfjfxbs28gjdr0csskwvh107"; depends=[dplyr ggplot2 lme4 Rcpp rstan]; }; - BayesSingleSub = derive2 { name="BayesSingleSub"; version="0.6.2"; sha256="0hgmyhg4mpxx7k91hbfa9h3533mqyn9rz4kl9kb30cc9g7g0m045"; depends=[coda MCMCpack mvtnorm]; }; BayesSpec = derive2 { name="BayesSpec"; version="0.5.3"; sha256="17gchdijcjhbr2y4glbq9szjh4qmgivzh6p4fllh589da18nzjcr"; depends=[mvtnorm pscl trust]; }; BayesSummaryStatLM = derive2 { name="BayesSummaryStatLM"; version="1.0-1"; sha256="05mlgyi4fglvjkpqyw3vcjpipqllx37svcb20c1mrsa46m6fm4s7"; depends=[ff mvnfast]; }; BayesTree = derive2 { name="BayesTree"; version="0.3-1.4"; sha256="0saca1ln582szqzc2c78z24b1lszzhc9hvsin73kb7r2dlg5ciii"; depends=[nnet]; }; @@ -392,7 +393,7 @@ in with self; { BayesX = derive2 { name="BayesX"; version="0.3-0"; sha256="0vgi0yng53x0w18h4n0ygqmcky7jwmk99j4gcv2vwhcmz45s73j0"; depends=[coda colorspace maptools shapefiles sp]; }; BayesXsrc = derive2 { name="BayesXsrc"; version="3.0-1"; sha256="0l8c6xsyqj09m722hdanr1d9n6a1ps77ybm1jaqmp86bqmq1br03"; depends=[]; }; BayesianAnimalTracker = derive2 { name="BayesianAnimalTracker"; version="1.2"; sha256="1pgjijqznfdpvw296h5vksnxgspxs7qhy6s84ww7abnlhg59bz5s"; depends=[TrackReconstruction]; }; - BayesianFROC = derive2 { name="BayesianFROC"; version="0.1.3"; sha256="1vwbspzwqx68y5yml9rm8ldagx391qg8m0wqf5k2qvy7n92vcl6l"; depends=[bridgesampling car crayon DiagrammeR ggplot2 knitr Rcpp readxl rstan xlsx]; }; + BayesianFROC = derive2 { name="BayesianFROC"; version="0.1.5"; sha256="11dpha68vh68ifxk721p3jiklaaavzq06cs12ph95lakrlbv9mr8"; depends=[bridgesampling car crayon DiagrammeR ggplot2 knitr pracma Rcpp readxl rhandsontable rstan shiny shinydashboard xlsx]; }; BayesianGLasso = derive2 { name="BayesianGLasso"; version="0.2.0"; sha256="09yb1qqx6qlsspk3ndrcqxy0956iqznw0rmyvqxgxxp3zd3y21xp"; depends=[MASS statmod]; }; BayesianNetwork = derive2 { name="BayesianNetwork"; version="0.1.5"; sha256="0vnnxzxz68dkfwr9wif8lam3a4khgbslbf49xkygqm8n1swysx2x"; depends=[bnlearn heatmaply lattice networkD3 plotly rintrojs shiny shinyAce shinydashboard shinytest shinyWidgets testthat]; }; BayesianPower = derive2 { name="BayesianPower"; version="0.1.6"; sha256="1n41blyqmjq2zdhbz8srsx32piyg26fwgzfphhka12ybk93b2d2h"; depends=[]; }; @@ -408,6 +409,7 @@ in with self; { Bergm = derive2 { name="Bergm"; version="5.0.0"; sha256="0l04hg5rwgi5vgb7h987f0j3shb0vz9w26zmk4hm7vfbwb9xxix6"; depends=[coda ergm Matrix matrixcalc MCMCpack mvtnorm network]; }; Bessel = derive2 { name="Bessel"; version="0.6-0"; sha256="0iwm08nhlivi4zwcqdi296a1l4n4lfanfxhaysh9vcsyk1kpiacf"; depends=[Rmpfr]; }; BetaBit = derive2 { name="BetaBit"; version="1.3"; sha256="1x9mfnijgi8726p82d52g2zgmliwsc97v2g96mz9ccz2vqqnwq4w"; depends=[digest]; }; + BetaPASS = derive2 { name="BetaPASS"; version="1.0-1"; sha256="0c9a3bv9q9nzz3iw3jwqrkfqk4zd6ybaq4jlijja6rl2gqrprsi2"; depends=[betareg ggplot2 lmtest Rcpp reshape]; }; BeviMed = derive2 { name="BeviMed"; version="5.3"; sha256="01q5pr776ki973bcld20cqpsz9f10bb30vj95da9gbz5af6bvb14"; depends=[Rcpp]; }; BeyondBenford = derive2 { name="BeyondBenford"; version="1.1"; sha256="1mqrzd6hpfsqxwm2sgc2lmgx7czvaj7qvhs05pj6p63n0fiimq9c"; depends=[]; }; Bhat = derive2 { name="Bhat"; version="0.9-10"; sha256="1vg4pzrk3y0dk1kbf80mxsbz9ammkysh6bn26maiplmjagbj954v"; depends=[]; }; @@ -430,13 +432,13 @@ in with self; { BinQuasi = derive2 { name="BinQuasi"; version="0.1-6"; sha256="0jf7zf3yqr2kgcm6h35234x2dqf65d2dzsh63b4q8m5l36r77k59"; depends=[BiocGenerics csaw edgeR GenomicAlignments GenomicRanges IRanges mgcv pracma quadprog RMySQL Rsamtools S4Vectors SummarizedExperiment]; }; Binarize = derive2 { name="Binarize"; version="1.3"; sha256="0xmgxlfyvgkv7xpngy9am6ihzwbjbfgp7psfnyhb1v0kj9iy7ids"; depends=[diptest]; }; BinaryEMVS = derive2 { name="BinaryEMVS"; version="0.1"; sha256="1ainp6pg481yqhjc4f1pkxzxczbi3qm0kgq280vndq859ldfkpnh"; depends=[]; }; - BinaryEPPM = derive2 { name="BinaryEPPM"; version="2.2"; sha256="0la8mi2wadcxwrq882n4zxvihyqkp8m383c28gl9gm4fs8cqwlxi"; depends=[expm Formula lmtest numDeriv]; }; + BinaryEPPM = derive2 { name="BinaryEPPM"; version="2.3"; sha256="0fydh3pp7y0glk2rhihcslzx10hgn5la922jbnqzg2nplvzv7ybj"; depends=[expm Formula lmtest numDeriv]; }; BinarybalancedCut = derive2 { name="BinarybalancedCut"; version="0.2"; sha256="1rs7x7ggqzaz9r2912g0fi9x7przd8gjy6pianx457w5f39fqx4v"; depends=[ggplot2 reshape2]; }; BioCircos = derive2 { name="BioCircos"; version="0.3.4"; sha256="1gl57r47p5z1wzs94xzc26j2r8z5hpqr4163b01x6jwzvbrlfwhz"; depends=[htmlwidgets jsonlite plyr RColorBrewer]; }; BioFTF = derive2 { name="BioFTF"; version="1.2-0"; sha256="03r6fhpc4dqrcnbl73j9kav1l7rblgfldpbkl2p367vv20xggqih"; depends=[]; }; BioInstaller = derive2 { name="BioInstaller"; version="0.3.7"; sha256="0xbxv2ln39z70javxbx5rf77yf9zyjif3ppnr3id7cmy24hhqcab"; depends=[configr devtools futile_logger git2r jsonlite liteq R_utils RCurl rvest shiny stringi stringr]; }; BioMark = derive2 { name="BioMark"; version="0.4.5"; sha256="1ifc72bayy3azbilajqqzl0is6z7l1zaadchcg3n8lhmjrv5sk3m"; depends=[glmnet MASS pls st]; }; - BioMedR = derive2 { name="BioMedR"; version="1.1.2"; sha256="0b72fqp2kkvszv4rrz42xidivy6lk4w92rcq1zjqd9vlkvmgx7h8"; depends=[Biostrings ChemmineR fmcsR GOSemSim org_Hs_eg_db pls randomForest rcdk RCurl rjson]; }; + BioMedR = derive2 { name="BioMedR"; version="1.2.1"; sha256="0l3nmnqv0gzkbby4fhajbba910zpnbyckvxwds353pn54g9pcry7"; depends=[Biostrings ChemmineR fmcsR GOSemSim MASS org_Hs_eg_db pls randomForest rcdk RCurl rjson]; }; BioPET = derive2 { name="BioPET"; version="0.2.2"; sha256="0zgq7i37d0rnjhlkcrl44x62vhz0njsv2fldm64j9r4wc02z1q9n"; depends=[ggplot2 gridExtra pROC VGAM]; }; BioStatR = derive2 { name="BioStatR"; version="3.0.0"; sha256="1fv37xckhpn0b744r71q7h57pr5j2y0v8hcc97cgzdsqd8p4axmk"; depends=[ggplot2]; }; BiocManager = derive2 { name="BiocManager"; version="1.30.4"; sha256="0kxs76pixk1d2lpvkyrq6nnvv1rqf55ph5f7igkadyyqirf3y2ah"; depends=[]; }; @@ -480,7 +482,6 @@ in with self; { BootstrapQTL = derive2 { name="BootstrapQTL"; version="1.0.2"; sha256="1qf93wmrh6znm81jr3gyn1sl8x4i6pdx811r70fg8k026fbfjn3a"; depends=[data_table foreach MatrixEQTL]; }; Boruta = derive2 { name="Boruta"; version="6.0.0"; sha256="1pp8zal1vhxlzdhl20phn39m3ffhw5glyqbcgwa0w14zw2mpm6hw"; depends=[ranger]; }; BosonSampling = derive2 { name="BosonSampling"; version="0.1.1"; sha256="0wxn12h903a0mlrkrr3w4qd9ld2a4bifs95i98cnl2dsb76rwf12"; depends=[Rcpp RcppArmadillo]; }; - BoutrosLab_plotting_general = derive2 { name="BoutrosLab.plotting.general"; version="5.9.2"; sha256="0cyhqglz0mhfi8yk3a1qdry5ljd8rjzayqj1hyw44w9b8xsm6659"; depends=[cluster e1071 gridExtra gtable hexbin lattice latticeExtra MASS]; }; BradleyTerry2 = derive2 { name="BradleyTerry2"; version="1.1-0"; sha256="13lhs6rynyj9cw13panqbn2jzkhq5fixhfd0ldr128gvw5d43hxg"; depends=[brglm gtools lme4 qvcalc]; }; BradleyTerryScalable = derive2 { name="BradleyTerryScalable"; version="0.1.0"; sha256="0g12fkfs2sykyd6fzf924zv8gj2js452c4pf0pz2p6156chwrk8c"; depends=[dplyr igraph Matrix purrr Rcpp RcppArmadillo]; }; BrailleR = derive2 { name="BrailleR"; version="0.29.1"; sha256="0n6njampfav84yd68vi4nw8h3dm285m3wfqi048ghiw740sa4rjk"; depends=[devtools dplyr extrafont ggplot2 gridGraphics gridSVG hunspell knitr magrittr moments nortest reticulate rmarkdown roloc rolocISCCNBS whisker XML xtable]; }; @@ -499,10 +500,10 @@ in with self; { BuyseTest = derive2 { name="BuyseTest"; version="1.7"; sha256="0sjbwacpkw54wwzxd6866dzd03scl5g8ixcxs5ry26b2w0dncy60"; depends=[data_table doParallel foreach lava prodlim Rcpp RcppArmadillo]; }; C443 = derive2 { name="C443"; version="1.0.0"; sha256="0d04769m9kkjqpj1cgfhqrri893nwi6qn7fz63z5pkym5cig5yyi"; depends=[cluster ggplot2 gridExtra igraph MASS partykit qgraph RColorBrewer reshape2 rpart]; }; C50 = derive2 { name="C50"; version="0.1.2"; sha256="1fpspmsm62h077dkdhii23bs3sxlblabfqj4waz794ihw1b9hicg"; depends=[Cubist partykit]; }; - CA3variants = derive2 { name="CA3variants"; version="1.0"; sha256="006r3a8jhkbgdfpycbdv3q1pfx9pkf102cgi285awgdhs6fhh88s"; depends=[ggplot2 ggrepel gridExtra]; }; + CA3variants = derive2 { name="CA3variants"; version="2.0"; sha256="1wnc9qfcligpsi5ycmzw0igm14h6lvf4vd82aygnas6q41vnypwz"; depends=[ggplot2 ggrepel gridExtra multichull]; }; CADFtest = derive2 { name="CADFtest"; version="0.3-3"; sha256="06bwv728ckalzibxginzfica24w18m4g87i0i064m3q89ghmnlqm"; depends=[dynlm sandwich tseries urca]; }; CADStat = derive2 { name="CADStat"; version="3.0.8"; sha256="0wdglw1vyd5gz70r9ma0mwshvizv39nb4ahp8pvr70c4qqzsfhc0"; depends=[bio_infer car gdata gmodels JavaGD JGR lattice MASS quantreg rJava rpart XML]; }; - CAISEr = derive2 { name="CAISEr"; version="0.3.3"; sha256="1jbmc2ajmvqs7i1qxx1drx6nqqwl29hxk02qmyf8iamg7ip4adqi"; depends=[assertthat pbmcapply]; }; + CAISEr = derive2 { name="CAISEr"; version="1.0.14"; sha256="0jfpn4ih5dc55jjiivbdscpm6jw250js8p8gvcnsdf3pgrzp8cxr"; depends=[assertthat ggplot2 gridExtra lattice pbmcapply]; }; CALF = derive2 { name="CALF"; version="0.2.0"; sha256="12w1vr0rk6m4lv6zvqrf45k81d301ln1253wyy9xi6mv1hkabg0v"; depends=[ggplot2]; }; CALIBERrfimpute = derive2 { name="CALIBERrfimpute"; version="1.0-1"; sha256="1xsnqyj0qdi081rdnpas9ciy9zbhdcjx3lphl6drk0bbmik3znkv"; depends=[mice mvtnorm randomForest]; }; CAM = derive2 { name="CAM"; version="1.0"; sha256="07mmrz6j8cm6zgaw2zcxgkxb7abd651kb80526r271snjgvpr5bl"; depends=[glmnet Matrix mboost mgcv]; }; @@ -521,6 +522,7 @@ in with self; { CATT = derive2 { name="CATT"; version="2.0"; sha256="12xdspl1gbf51snyrl44nn7alfyccdfihibkgvzr66lrby8b8fhg"; depends=[]; }; CATTexact = derive2 { name="CATTexact"; version="0.1.0"; sha256="0mklkmay9ph4d0z2l1gcg0lj429xkyhmz7srdil5rgwqxx9dnqs8"; depends=[]; }; CATkit = derive2 { name="CATkit"; version="3.3.3"; sha256="01q2ssyg0jcjgahaslfgpakjsv2wil654lc6xrg5xbbrkx7ccb90"; depends=[assertr CombMSC Hmisc magic MASS png rtf season signal]; }; + CAWaR = derive2 { name="CAWaR"; version="0.0.1"; sha256="1z8xmwnxwlk0nhi22nabwzggizzsp8jzwfln0h2hkk7h1p8xjlhk"; depends=[fieldRS ggplot2 lubridate raster rgdal rgeos rsMove RStoolbox sp spatialEco]; }; CAinterprTools = derive2 { name="CAinterprTools"; version="1.0.0"; sha256="1ia4qfvj0nzxi6pwqnha2vpfcx3qwaw4vrjqiza11sai274j0pjy"; depends=[ca classInt cluster FactoMineR ggplot2 ggrepel Hmisc RcmdrMisc reshape2]; }; CAvariants = derive2 { name="CAvariants"; version="4.0"; sha256="16k25rhwzih1spbp0m80lv2vfrbm8l5ajkgp2i27gvnhhln227qm"; depends=[ggplot2 ggrepel gridExtra rgl]; }; CB2 = derive2 { name="CB2"; version="1.2.1"; sha256="089cf0pcy5xyzr6pl9ljqc52cy2bh2xfxhfh7iika2wv932wwq98"; depends=[dplyr ggplot2 glue magrittr metap pheatmap Rcpp RcppArmadillo stringr tibble tidyr]; }; @@ -554,7 +556,7 @@ in with self; { CHCN = derive2 { name="CHCN"; version="1.5"; sha256="18n8f002w0p0l1s5mrrsyjddn10kdbb6b7jx1v9h1m81ifdbv0xb"; depends=[bitops RCurl]; }; CHFF = derive2 { name="CHFF"; version="0.1.0"; sha256="0jv75p1bnwsad2vpxf1zwq97al9xxhk2hpnpsilf0jn0w7g9b2d3"; depends=[]; }; CHMM = derive2 { name="CHMM"; version="0.1.1"; sha256="07fdvnwhblwvljbl2z0vs42nwki67yl5ly3fj40p50k3rnqqmavj"; depends=[mclust]; }; - CHNOSZ = derive2 { name="CHNOSZ"; version="1.3.2"; sha256="01ixqd9fwxr74ifk5c7s9q5f92pdgwqy4wyi2ipk16kzj4q5w8xr"; depends=[]; }; + CHNOSZ = derive2 { name="CHNOSZ"; version="1.3.3"; sha256="02rlznp4vkdwkf23jy84dciv2mv1421ghqxllw4i2z2jxgxvb921"; depends=[]; }; CHsharp = derive2 { name="CHsharp"; version="0.4"; sha256="19mb5zzi9x4pm2z9jbha5dz4k5f1iqjv31aisyv4qh14k5ysdz2i"; depends=[KernSmooth scatterplot3d]; }; CIAAWconsensus = derive2 { name="CIAAWconsensus"; version="1.3"; sha256="0yhay4fp5lyf0sdcf807yvys17qz9cr5f5ikim25mq336p7fp03x"; depends=[Matrix mvtnorm numDeriv stringr]; }; CIEE = derive2 { name="CIEE"; version="0.1.1"; sha256="03kq9cp0v41y0r2l9j5imcrsail2xsvlzhhhsrw454d4s9gqdql9"; depends=[survival]; }; @@ -581,7 +583,7 @@ in with self; { CNLTreg = derive2 { name="CNLTreg"; version="0.1-2"; sha256="07yi0ajil1113663v3gp5d3453r4l9qm442jnpydx4ygvjk7m2ha"; depends=[adlift miscTools nlt]; }; CNLTtsa = derive2 { name="CNLTtsa"; version="0.1-2"; sha256="1vy0jjg6s8yvsvkx4pin183y5bnikm5cmjcpa9znz9dj1w6hwr5r"; depends=[adlift CNLTreg fields nlt]; }; CNOGpro = derive2 { name="CNOGpro"; version="1.1"; sha256="1frsmhfqrlg1vsa06cabqmrzngq4p5gqwyb9qgnsgg81a9ybm6l8"; depends=[seqinr]; }; - CNVScope = derive2 { name="CNVScope"; version="1.9.7"; sha256="1xj82nwkv27wfwrks9rckdgmhlqfl4n0zmcqqa3f9ryx79jm7zbl"; depends=[BiocManager biomaRt blockseg BSgenome_Hsapiens_UCSC_hg19 circlize ComplexHeatmap data_table doParallel dplyr DT foreach GenomicFeatures GenomicInteractions GenomicRanges ggplot2 heatmaply HiCseg htmltools htmlwidgets igraph InteractionSet IRanges jointseg logging magrittr Matrix matrixStats numbers OpenImageR plotly plyr RCurl readr reshape2 rslurm rtracklayer S4Vectors shiny shinycssloaders shinyjs shinythemes spatialfil tidyr visNetwork]; }; + CNVScope = derive2 { name="CNVScope"; version="2.7.0"; sha256="1m5g6qfqlqnysqcmia54hasb1bdp70a1jzlqb8dz8830lzw797fi"; depends=[BiocManager biomaRt blockseg BSgenome_Hsapiens_UCSC_hg19 circlize data_table doParallel dplyr foreach GenomicFeatures GenomicInteractions GenomicRanges ggplot2 heatmaply HiCseg htmltools htmlwidgets igraph InteractionSet IRanges jointseg logging magrittr Matrix matrixStats numbers OpenImageR plotly plyr RCurl reshape2 rslurm rtracklayer S4Vectors shiny shinycssloaders shinyjs shinythemes spatialfil stringr tibble tidyr visNetwork]; }; CNprep = derive2 { name="CNprep"; version="2.0"; sha256="08dpjikx3ldqzw2kwb12q0kbw15qzl09srjdfs0sz9si0x6bfxs6"; depends=[mclust rlecuyer]; }; CNull = derive2 { name="CNull"; version="1.0"; sha256="14hy86zg18hqxi63bfzrpkz70yrzfxp2v2pva5xnrvx9dmlyz820"; depends=[ape Matrix PhyloMeasures Rcpp]; }; COBRA = derive2 { name="COBRA"; version="0.99.4"; sha256="1r1cw12d7c148pcgcg08bfsr1q1s736kfpyyss6b4d7ny7wgmqy4"; depends=[]; }; @@ -662,8 +664,9 @@ in with self; { CausalImpact = derive2 { name="CausalImpact"; version="1.2.3"; sha256="16qwf1kcs7x6qw18zpabs4zsv3m7xwxixf89krnipydiwlpxjjn6"; depends=[assertthat Boom bsts dplyr ggplot2 zoo]; }; CausalKinetiX = derive2 { name="CausalKinetiX"; version="0.2.1"; sha256="0haxw4vvbw48hlvsl1d1y3xm48qm5vl0d3k5lj89ajwc618nk5jg"; depends=[cvTools deSolve fda glmnet pspline quadprog randomForest sundialr]; }; Causata = derive2 { name="Causata"; version="4.2-0"; sha256="04lndjy4rdf063z75zv42b000z06ffnr91pv2sql1ks6w60zmh1m"; depends=[boot data_table foreach ggplot2 glmnet R_utils RCurl rjson RMySQL stringr XML yaml]; }; + CautiousLearning = derive2 { name="CautiousLearning"; version="1.0.1"; sha256="1m5x93l4bscrpcxk0pva6d6n2qnzhzxh0a6a81p97l8lqgs1qw2q"; depends=[BH Rcpp sitmo spc]; }; CePa = derive2 { name="CePa"; version="0.6"; sha256="1qpxx9x656g678wp190q29vxkb54sfkalg0csg0ndlcvi03dvl3d"; depends=[graph igraph Rgraphviz]; }; - CeRNASeek = derive2 { name="CeRNASeek"; version="1.0"; sha256="016z4wsv6mz622rrvnaxbd6ri21pinahasmdswf62vp9l8jahq25"; depends=[gtools igraph]; }; + CeRNASeek = derive2 { name="CeRNASeek"; version="2.1"; sha256="007wzq18p8dp7v4dplxsnq3i1qvd740s59nv9ygcr28d6gvsx1fy"; depends=[gtools igraph survival]; }; CensMixReg = derive2 { name="CensMixReg"; version="3.1"; sha256="1r7w84bjdxnkhiw7gh499scc6m3ba9b2a8cwayn6sg5a524yn9gs"; depends=[ClusterR mixsmsn mnormt mvtnorm trimcluster]; }; CensRegMod = derive2 { name="CensRegMod"; version="1.0"; sha256="0qqwkxn8knhcjb6mph7mp7mma56zxslbvkfgfajq2lq4gbg901y4"; depends=[]; }; CensSpatial = derive2 { name="CensSpatial"; version="1.3"; sha256="0gd1c5qlk71avv0s3jqwb00h9cm6djg9qwzc1znc3kh61wx9kvfi"; depends=[geoR lattice moments msm mvtnorm numDeriv optimx psych raster tmvtnorm]; }; @@ -676,13 +679,13 @@ in with self; { ChangepointTesting = derive2 { name="ChangepointTesting"; version="1.0"; sha256="1nb78b1jpp0wpy9ah2fxkh53hlmb2f82b68msbfhancb8zp2lclv"; depends=[]; }; ChannelAttribution = derive2 { name="ChannelAttribution"; version="1.16"; sha256="02kxybv9299j36xl4wk6d50crdnz0f6qbyxjiy6xf0s7hnlcr44c"; depends=[Rcpp RcppArmadillo]; }; ChannelAttributionApp = derive2 { name="ChannelAttributionApp"; version="1.1"; sha256="0qy92ij1riynz7dhri3z85pafww5w9j1gx1bcgr8phlr32a7had7"; depends=[ChannelAttribution data_table ggplot2 shiny]; }; - Chaos01 = derive2 { name="Chaos01"; version="1.1.1"; sha256="0ibxibmlyc6wkhqj2achwkwdkniin60y8xh8b80nq6ggmm7w9crw"; depends=[]; }; + Chaos01 = derive2 { name="Chaos01"; version="1.2.0"; sha256="10780nxdakk4xnbzdnrcm3z66ipx5pf676n9s1arb4g624splc61"; depends=[]; }; ChaosGame = derive2 { name="ChaosGame"; version="0.4"; sha256="10bq8i6b6zkg8nzq5np998xabyvijizxfbvw1m2nvfh74vxspj4p"; 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="5.1.9"; sha256="0xhwb62s5cs1rfnk9wq6zkgfgs598l7m2cfsf84r690v64qiqycb"; depends=[ChemoSpecUtils plyr]; }; + ChemoSpec = derive2 { name="ChemoSpec"; version="5.1.48"; sha256="0jadmz03y6zybmhm2zg8qbhrhgawxbf4c3fs021qyhvlcrs162q7"; depends=[ChemoSpecUtils plyr]; }; ChemoSpec2D = derive2 { name="ChemoSpec2D"; version="0.3.166"; sha256="0b0pis55kz4r55qxwdlic87crnhkifvcylngkaxsfv1vqqz2wwlc"; depends=[ChemoSpecUtils]; }; - ChemoSpecUtils = derive2 { name="ChemoSpecUtils"; version="0.3.20"; sha256="1xrs7rjrb5q33njlz7988sawz0dy4ara9y44lf8v528j0m0hqpwc"; depends=[plyr]; }; + ChemoSpecUtils = derive2 { name="ChemoSpecUtils"; version="0.3.39"; sha256="1vd7miin5f236n5w9q7iy64fncycnh8zs0n04mir8ks76lzbga7w"; depends=[plyr]; }; ChemometricsWithR = derive2 { name="ChemometricsWithR"; version="0.1.13"; sha256="166va1g3m1wv21qkmw4wpz0bsrclh3jih8smxphdc13l9pqgclpq"; depends=[devtools kohonen MASS pls]; }; ChillModels = derive2 { name="ChillModels"; version="1.0.0"; sha256="1829ybafx53kjwr6dbgixq3ayyvzbd9cdp4qw3l3kld6936kjilm"; depends=[]; }; ChoR = derive2 { name="ChoR"; version="0.0-4"; sha256="08mildsx542zfm0kcdakcv7c71hb4jgbcq1lhidf0fz76zj1pzk1"; depends=[commonsMath rJava]; }; @@ -708,20 +711,23 @@ in with self; { CliftLRD = derive2 { name="CliftLRD"; version="0.1-1"; sha256="0qsdv568klxg6chgw329jbfjmf6w61hly2vxp90yzdfkca03z2s4"; depends=[CNLTreg liftLRD]; }; ClimClass = derive2 { name="ClimClass"; version="2.1.0"; sha256="1r836md31z2r5d9xckkbalzbhm4kf5paljv71kxpy53q92k7yi91"; depends=[geosphere ggplot2 reshape2]; }; ClimDown = derive2 { name="ClimDown"; version="1.0.2"; sha256="0dbv5vn985bi9nqxhq7jcj6k38s8dlbqnln3adgd0ih2fwilvalg"; depends=[abind fields foreach ncdf4 PCICt seas udunits2]; }; - ClimProjDiags = derive2 { name="ClimProjDiags"; version="0.0.3"; sha256="15s2fzrjsav5qa5hbjxixz6398swmdr3isyr5a6f0hjc2bb12d5z"; depends=[climdex_pcic multiApply PCICt plyr]; }; + ClimInd = derive2 { name="ClimInd"; version="0.1-2"; sha256="0brimmkr8ccdbpmcmgbd8ydx4cy0yblfrzcgx151x83wskzq04sj"; depends=[chron SPEI weathermetrics]; }; + ClimProjDiags = derive2 { name="ClimProjDiags"; version="0.0.4"; sha256="1819kv0h7qh285nykncdqr808b9v5fviccr0fbv2im7zni497scq"; depends=[climdex_pcic multiApply PCICt plyr]; }; ClinReport = derive2 { name="ClinReport"; version="0.9.1.12"; sha256="0c0ixr28p8gj3mx2pkrmjvs13g9h8fv1y6ririvrwkbmrdikq7g3"; depends=[dplyr emmeans flextable ggplot2 officer reshape2 xtable]; }; ClinicalTrialSummary = derive2 { name="ClinicalTrialSummary"; version="1.1.1"; sha256="0b5by4sn9yvrvxr9921yqsgp8ma3g1hi2qbp5j9m836db1zjhyla"; depends=[Rcpp]; }; CloneSeeker = derive2 { name="CloneSeeker"; version="1.0.7"; sha256="07rh577m7xp6v0adchp0mbfs0mkglpv7p27794rm958nvfsmffds"; depends=[combinat gtools quantmod]; }; ClueR = derive2 { name="ClueR"; version="1.4"; sha256="0awl3ag48idg0396hcgqrh5f16mbgximr5xbxjiimib5zysdc558"; depends=[e1071]; }; ClusVis = derive2 { name="ClusVis"; version="1.2.0"; sha256="06yckdl3gxjia1gjjqpc29lvy4f7qf47fncslng9ggjnks6il145"; depends=[MASS mgcv mvtnorm Rcpp RcppArmadillo Rmixmod VarSelLCM]; }; - ClustBlock = derive2 { name="ClustBlock"; version="1.0.0"; sha256="1qfk2dyx2wnc81x6wc3c6lrbxbwiwyxxvgy89sslwy4c0i61gpp0"; depends=[FactoMineR]; }; + ClussCluster = derive2 { name="ClussCluster"; version="0.1.0"; sha256="1436849m2mnm8j7lf653zv8lcvvg2ch8kkks4bvr39kx21wxy8ss"; depends=[ggplot2 reshape2 rlang scales VennDiagram]; }; + ClustBlock = derive2 { name="ClustBlock"; version="2.0.0"; sha256="0g6z4l4ilpamdi8wfmlwz21kjiwlwnl702i38rzlyvysr1afsxv1"; depends=[FactoMineR]; }; ClustGeo = derive2 { name="ClustGeo"; version="2.0"; sha256="1p5k2w1k7hnacbazzj2yhxh4z2jngnsl4v5a9b3c8z1dr4nhcwxc"; depends=[sp spdep]; }; + ClustImpute = derive2 { name="ClustImpute"; version="0.1.3"; sha256="1rfs8vbpqjskl5ap12x6qmxg4ygaaycaas8x3ylaqvlvyy9ywhki"; depends=[ClusterR copula dplyr magrittr rlang]; }; ClustMMDD = derive2 { name="ClustMMDD"; version="1.0.4"; sha256="0sblf3crpai53dflhyi27yn6mg0xyy9dxhwsk8j57sq5vr50x686"; depends=[Rcpp]; }; ClustOfVar = derive2 { name="ClustOfVar"; version="1.1"; sha256="0grhkab7s58ji4cf7cxh7ahd2dxrj8aqfdf3119b40zxkxbwxcr0"; depends=[PCAmixdata]; }; ClustVarLV = derive2 { name="ClustVarLV"; version="2.0.0"; sha256="03fv3mzmimsmg3d4mlp1j4d1y6qhaaaaml3f6bd8v39h03kd9450"; depends=[doParallel foreach iterators plyr Rcpp RcppEigen]; }; Cluster_OBeu = derive2 { name="Cluster.OBeu"; version="1.2.2"; sha256="1hh5aah5vnk1ld4hhpslr7hvxhw2b5x55rzxrm6j101sw533706h"; depends=[car cluster clValid data_tree dendextend jsonlite mclust RCurl reshape reshape2 stringr]; }; ClusterBootstrap = derive2 { name="ClusterBootstrap"; version="1.0.0"; sha256="0m1lfp27vn3ybwimwkrihff5v2bvdc4c46x8bha8hw0wma14lw5i"; depends=[]; }; - ClusterR = derive2 { name="ClusterR"; version="1.1.9"; sha256="0l5q2ydqrvdq3f1a6j1g6vfzqvaiq4p2j0h6ir4bh2l8m8d3xlsz"; depends=[FD ggplot2 gmp gtools Rcpp RcppArmadillo]; }; + ClusterR = derive2 { name="ClusterR"; version="1.2.0"; sha256="1l5b6n29gslv0xq79xhqd3rniv51bawbrz3qdnjc3677fpgirlx7"; depends=[FD ggplot2 gmp gtools Rcpp RcppArmadillo]; }; ClusterRankTest = derive2 { name="ClusterRankTest"; version="1.0"; sha256="01gzalhibqcdx3a6yc2cm1v77rscva73v5m5m0qkrgqdp9c8ph2a"; depends=[]; }; ClusterStability = derive2 { name="ClusterStability"; version="1.0.3"; sha256="1laa5m3y1rc7jr8q3i9qb3izs7qmadz169w9xm8q3mm3834ngn9b"; depends=[cluster clusterCrit copula Rcpp WeightedCluster]; }; ClusteredMutations = derive2 { name="ClusteredMutations"; version="1.0.1"; sha256="1n31nnvpjh1faw751k8m3ga3wfl0yhdpnszwckqhfzlma1jr8z04"; depends=[seriation]; }; @@ -775,7 +781,6 @@ in with self; { ConjointChecks = derive2 { name="ConjointChecks"; version="0.0.9"; sha256="097mhiz8zjmmkiiapr3zfx7v35xirg57nqp1swd72dixaa23nhr1"; depends=[]; }; ConnMatTools = derive2 { name="ConnMatTools"; version="0.3.3"; sha256="0zsn3al3di0fd9hkqljpqqy4zbmh97xr6cdi4fzv80ax81fjfqyk"; depends=[]; }; ConsRank = derive2 { name="ConsRank"; version="2.0.1"; sha256="18f1gqa46f8jrcf2zj4njyy78cl0scjs9k8s9mvg0f9dpr44xnan"; depends=[gtools proxy rgl]; }; - ContaminatedMixt = derive2 { name="ContaminatedMixt"; version="1.3.3"; sha256="16pkpgvg46xscp6z2xlhlnfzc9048jlgqxxbqa4c90z7dclcmrqk"; depends=[caret mclust mixture mnormt mvtnorm]; }; ContourFunctions = derive2 { name="ContourFunctions"; version="0.1.1"; sha256="00p5bdiq8hj95lkr86iwyh50qw0d0d4gs9hhbzcix6lwn8dwqd3s"; depends=[]; }; ConvergenceClubs = derive2 { name="ConvergenceClubs"; version="1.4.3"; sha256="0glfnwmfs6xv4d1h5y0859srvj3y68192589mdjcx0jgkgk2c9np"; depends=[lmtest sandwich]; }; ConvergenceConcepts = derive2 { name="ConvergenceConcepts"; version="1.2.1"; sha256="0kl67ds6369mxl2i93h43r00ji12qkg0k9m4jhcxsb0ydd8rfqgp"; depends=[lattice tkrplot]; }; @@ -789,7 +794,6 @@ in with self; { CopulaREMADA = derive2 { name="CopulaREMADA"; version="1.3"; sha256="152g8nfa3ksj0dlzlch9a6g18b1vi6dlw748a6m55haghchbyr9l"; depends=[matlab mc2d statmod tensor]; }; CopyDetect = derive2 { name="CopyDetect"; version="1.3"; sha256="1g3bwd805h62x93xvvn67acf9v6vn7s7ghxpvjhwcfdfj7fwzh6l"; depends=[mirt]; }; CorDiff = derive2 { name="CorDiff"; version="1.0"; sha256="12rgfhygrdq1ign4ybr8g171wxic8zbp83n1xdsnqpj910k5jdr5"; depends=[mcc]; }; - CorReg = derive2 { name="CorReg"; version="1.2.8"; sha256="18l9aiv2ipvs14ycnzq99yvnkws38wnj42zbk5jqgv33kn37qbx2"; depends=[corrplot elasticnet glmnet lars MASS Matrix mclust mvtnorm Rcpp RcppEigen Rmixmod rpart]; }; Corbi = derive2 { name="Corbi"; version="0.4-4"; sha256="0s56hl2hr73kf8y7syq441wy1b9gjjcnvpgdigcc9g7gi0bkjx35"; depends=[CRF Matrix mpmi]; }; CoreGx = derive2 { name="CoreGx"; version="0.1.0"; sha256="1hw7hnd259cspy043js8rv5mb600j3kdhrcq9iva0nmy1qayxdbl"; depends=[Biobase lsa piano rlang]; }; CornerstoneR = derive2 { name="CornerstoneR"; version="1.1.1"; sha256="017j7s3m97sxahgnvk9sm7rfx81cjp1xzsmw7b1aqi7301zjrqa7"; depends=[checkmate data_table ranger vcd]; }; @@ -797,6 +801,7 @@ in with self; { CorrBin = derive2 { name="CorrBin"; version="1.6"; sha256="0iwad5qf7hqii02s5f85155c5s7v8ghnac4l6l3c45dshrpapp2m"; depends=[boot combinat dirmult geepack mvtnorm]; }; CorrMixed = derive2 { name="CorrMixed"; version="0.1-13"; sha256="02zg5kmv5qxnasnz872r3z7x7dmdcniq1x5xyfnnb3niwkdjgxzx"; depends=[nlme psych]; }; CorrToolBox = derive2 { name="CorrToolBox"; version="1.6.1"; sha256="1hqbb3raw86g3ww8dmapyy8lac2avs6jbjklfvi9gx06lyw4kv9r"; depends=[BinNonNor BinOrdNonNor GenOrd moments mvtnorm psych]; }; + CorrectOverloadedPeaks = derive2 { name="CorrectOverloadedPeaks"; version="1.2.17"; sha256="1g7irjbhwnbhk74y3qxcjlrsn2yz8q6wn7ih16wq669nswryxhxk"; depends=[bitops digest XML]; }; CorrectedFDR = derive2 { name="CorrectedFDR"; version="1.0"; sha256="15047cfjniljzhznkbzq3hyq221y9k7fa04f69zm0k0sxr627gxg"; depends=[]; }; Correlplot = derive2 { name="Correlplot"; version="1.0-2"; sha256="0prxnbi7ga5d23i0i4qpynfb3zrsgjxam47km6nsj1prakdkrq7w"; depends=[calibrate xtable]; }; CosW = derive2 { name="CosW"; version="0.1"; sha256="12l4w8b5jnr8773hxk7khrdn705x6bdbw7s8z8w95bfbbi12dj6v"; depends=[fdrtool pracma]; }; @@ -817,7 +822,7 @@ in with self; { CreditRisk = derive2 { name="CreditRisk"; version="0.1.3"; sha256="09ks8xlsrbp3an1drcwmmd6df4fsfz61z21ma2p62a1pk0bnc86c"; depends=[fOptions]; }; CrossClustering = derive2 { name="CrossClustering"; version="4.0.3"; sha256="05lbdmblwmmv24h46ixxabbrp7mpajyv7raw1p5h0dmsbfbq9hi5"; depends=[assertive cli cluster crayon dplyr flip glue magrittr mclust purrr]; }; CrossScreening = derive2 { name="CrossScreening"; version="0.1.1"; sha256="1gig80r8p611ysn35ajx7xdjj5wnkcf1vspcf0i06dmh75xpm3w9"; depends=[plyr tables]; }; - CrossVA = derive2 { name="CrossVA"; version="0.9.8"; sha256="0jqsw937j6vn7c1xqv22211nhjldq8mdmds7hklksn9sji7pdkq7"; depends=[stringi]; }; + CrossVA = derive2 { name="CrossVA"; version="0.9.9"; sha256="0k2czhnb3jws86p2iv9fv3qarxbh1dd4xxnv2hdwz0y82y6mkkvx"; depends=[stringi]; }; CrossValidate = derive2 { name="CrossValidate"; version="2.3.4"; sha256="1q5wnw2llvlw3hbjg0zccipk3ns31m2339x1aj6m526zhvgl2wvx"; depends=[Modeler oompaBase]; }; Crossover = derive2 { name="Crossover"; version="0.1-18"; sha256="108lzy76jc85gy8nz97pb3d5dhsgwwx26a9rn2xpzk6iwhngvk4x"; depends=[CommonJavaJars crossdes digest ggplot2 JavaGD MASS Matrix multcomp Rcpp RcppArmadillo rJava xtable]; }; CryptRndTest = derive2 { name="CryptRndTest"; version="1.2.2"; sha256="1cg0agwqp1f7pgxdf9wilwparklyfsv900r47fpihnqw3ycvbdai"; depends=[gmp kSamples LambertW MissMech Rmpfr sfsmisc tseries]; }; @@ -840,7 +845,7 @@ in with self; { DAIME = derive2 { name="DAIME"; version="1.1"; sha256="0kgss7gdwn1fd25arcwai915gm18qm5ffpq4f7qj2pg0lk4hvp0r"; depends=[]; }; DAISIE = derive2 { name="DAISIE"; version="1.4"; sha256="16653wwz20lhf3bpzflpj5d1h7j3cqyfaqk5gn24aifga2jc0wbb"; depends=[DDD deSolve Matrix subplex tensor]; }; DAKS = derive2 { name="DAKS"; version="2.1-3"; sha256="0vmpwxvksnmyq40faimbgpj0y3zbk519986n38ipwdfzllcg0zs4"; depends=[relations sets]; }; - DALEX = derive2 { name="DALEX"; version="0.4"; sha256="1mr8lqq8s4aacmh7xdhmkmv8vsjqjczlqlaw27xnsljgj2kgq87a"; depends=[ggplot2]; }; + DALEX = derive2 { name="DALEX"; version="0.4.4"; sha256="04i17ni8g595jj8dxdfwr9vsxmdn2kkam90ab68vlwws3ywqjl6r"; depends=[ggplot2]; }; DALEX2 = derive2 { name="DALEX2"; version="0.9"; sha256="1k39gswksicrb60nx7zzna3mqdm36ckg590iw511ga7frnb8fjl9"; depends=[]; }; DALY = derive2 { name="DALY"; version="1.5.0"; sha256="1v7ld01xcn5jiygl1c3xhd5h71ip90lks87fs9gmpnivp8jz5cr5"; depends=[]; }; DAMOCLES = derive2 { name="DAMOCLES"; version="1.1"; sha256="07z8mynhqnk1zcvm84w09xzkiy2dfxwhmnpi6gaddr3p0waql4gj"; depends=[ape caper deSolve expm geiger matrixStats picante]; }; @@ -856,7 +861,7 @@ in with self; { DBfit = derive2 { name="DBfit"; version="1.0"; sha256="19jdf693ygwfchlqvh0kywid14v0b53p33rr2dvmaqmsc6pfxbbf"; depends=[Rfit]; }; DCA = derive2 { name="DCA"; version="2.0"; sha256="1acy33vyf814kr0aj6kdvi9f1qzgynwwzv57ll01gd0iqq36374f"; depends=[coin elasticnet GPArotation locfdr modeest mvtnorm PMA]; }; DCD = derive2 { name="DCD"; version="0.1.0"; sha256="0p6vk8fdvpcvb1bb5fwy3h1v8y3djlvcm5jl5lnx30ngqj6d7rcj"; depends=[data_table doParallel foreach ggplot2 igraph lattice lsa Matrix plyr qlcMatrix Rdpack ROCR WGCNA]; }; - DCEM = derive2 { name="DCEM"; version="0.0.2"; sha256="126qfk1zbmmlcqm7rbrq61z9l5wm4dspqfzglhqjb92m14i2pnm3"; depends=[MASS matrixcalc mvtnorm]; }; + DCEM = derive2 { name="DCEM"; version="1.0.0"; sha256="192y07bik0xhs5ja9fmp2ds0qncwpkybarixnak4i35afcky7w7d"; depends=[MASS matrixcalc mvtnorm]; }; DCG = derive2 { name="DCG"; version="0.9.3"; sha256="08718x6v3g7kpfv0gpgm19cn3d3ynj7yagzs0jic1j5rwvn04pfb"; depends=[]; }; 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]; }; @@ -876,6 +881,8 @@ in with self; { DDoutlier = derive2 { name="DDoutlier"; version="0.1.0"; sha256="1az5zq0l3kj959572mlpc4zl73f16iag0yrs217fa9m8xpd3c2sd"; depends=[dbscan pracma proxy]; }; DECIDE = derive2 { name="DECIDE"; version="1.2"; sha256="18kn2pm9r0ims2k1jfsfzh258wwxz0xg86rsbwgq6szh0azlq3qy"; depends=[]; }; DEEPR = derive2 { name="DEEPR"; version="0.1"; sha256="0q8970q3gpjxwxdf2bkhpnqrxpm00w27b20a9sn9vv314rn1n7s8"; depends=[dirmult]; }; + DEEVD = derive2 { name="DEEVD"; version="0.1.0"; sha256="037h40mi4ka5w6m6bhry5mk7rcchss07vn08pzcyikcllnnn2vaf"; depends=[evd]; }; + DELTD = derive2 { name="DELTD"; version="0.1.0"; sha256="05kj07lxav7b16ndmzakd29bpy0h3y2cmx6if7x7hyy7vnkj3c38"; depends=[]; }; DEMEtics = derive2 { name="DEMEtics"; version="0.8-7"; sha256="1s59qim60d4gp5rxjacdbmxdbpdm7cy9samn088w8fs0q232vjjx"; depends=[]; }; DEMOVA = derive2 { name="DEMOVA"; version="1.0"; sha256="09dqhhhihphhdnplmhdq4q5zwc0qvqhirdrxa9x6fr43vwa5zfp4"; depends=[leaps]; }; DES = derive2 { name="DES"; version="1.0.0"; sha256="16p38i8ykwc8gjw6c9dhdwjjpa1b17n9wqhz3rhkbzjh978pky31"; depends=[]; }; @@ -887,6 +894,7 @@ in with self; { DEploid = derive2 { name="DEploid"; version="0.5.2"; sha256="0xjczfql6jl4jxxwvdn3gmwj8bawhj5w6hdamrb0yjdjlhdwb11y"; depends=[htmlwidgets magrittr plotly Rcpp rmarkdown scales]; }; DFIT = derive2 { name="DFIT"; version="1.0-3"; sha256="1h0wvcplb7j7dqz9hkaw30x92ngxzkdvkwpg0142hrqb201zfrac"; depends=[ggplot2 mvtnorm simex]; }; DGCA = derive2 { name="DGCA"; version="1.0.1"; sha256="1lqqzrsidkli4bk4jikq5f75jzqyzhv94n882yic5ndxgv26p9ic"; depends=[matrixStats WGCNA]; }; + DGLMExtPois = derive2 { name="DGLMExtPois"; version="0.1.0"; sha256="1c6lys605sggni40792d1xq8ll5nbdc75r92c87grx7zh74sz98m"; depends=[compoisson COMPoissonReg nloptr progress]; }; DGM = derive2 { name="DGM"; version="1.7.2"; sha256="0z0f8bazzsahvjkpfif50db700mqb7arcglwsfxcar9qdy082vsn"; depends=[data_table ggplot2 Rcpp RcppArmadillo reshape2]; }; DGVM3D = derive2 { name="DGVM3D"; version="1.0.0"; sha256="17cxv8rm7kmxms7v7hzbwbdwa3xl1hwgiljf97ppwswglqyik9iv"; depends=[rgl]; }; DHARMa = derive2 { name="DHARMa"; version="0.2.4"; sha256="0fkzf05p5k22kvicbiizx8aricjkgvkvg2874kmibkycld3qrblq"; depends=[ape doParallel foreach gap glmmTMB lme4 lmtest MASS mgcv qrnn sfsmisc spaMM]; }; @@ -919,8 +927,7 @@ in with self; { DOvalidation = derive2 { name="DOvalidation"; version="1.1.0"; sha256="1mzws3w7djpxnfqxjcqwgia7p17kb0qlnzj6qcfg2m1vamb1cn2z"; depends=[]; }; DPBBM = derive2 { name="DPBBM"; version="0.2.5"; sha256="1qypxrcm3sb727lqb09ssjf3hblixqayw3qsyql01imrxwm609i2"; depends=[CEoptim gplots tmvtnorm VGAM]; }; DPP = derive2 { name="DPP"; version="0.1.2"; sha256="1qalcm4gwh03qpy07d0p323ccq8xmk04v6z30g7wg6ic613bqg7m"; depends=[coda Rcpp]; }; - DPWeibull = derive2 { name="DPWeibull"; version="1.3"; sha256="143mvynkb6k7fbaxlyisw7a4acssqjyh7jld5myz55ns3r3fablw"; depends=[DPpackage matrixStats Rcpp truncdist]; }; - DPpackage = derive2 { name="DPpackage"; version="1.1-7.4"; sha256="0lfw55kbjwr1dqkd98p6488p6c0nh5pkfkc9wpds8wsqm38siad6"; depends=[MASS nlme survival]; }; + DPWeibull = derive2 { name="DPWeibull"; version="1.3"; sha256="143mvynkb6k7fbaxlyisw7a4acssqjyh7jld5myz55ns3r3fablw"; depends=[matrixStats Rcpp truncdist]; }; DPtree = derive2 { name="DPtree"; version="1.0.1"; sha256="0d7zf695lwkx4gv50f08cbi3p3mjjay0qgrbmvybf9m15i4zmyd7"; depends=[MASS MCMCpack plyr Rdpack]; }; DREGAR = derive2 { name="DREGAR"; version="0.1.3.0"; sha256="15cplshs85r0z659mc7xmj5db7vc95wxs01c34isc22p8z0a287i"; depends=[msgps]; }; DRHotNet = derive2 { name="DRHotNet"; version="1.0"; sha256="0lfhypcc222lrsgiya4xh2b524p2xg92ww2f3filjw4qhvi6q5k9"; depends=[maptools raster sp spatstat spdep]; }; @@ -928,10 +935,10 @@ in with self; { DRR = derive2 { name="DRR"; version="0.0.3"; sha256="1yd1fvllfkcrwg9v322n4wkk4q4q84nvy58y4vac9pdr3yf3i4vl"; depends=[CVST kernlab Matrix]; }; DRaWR = derive2 { name="DRaWR"; version="1.0.1"; sha256="1pfdczwzd236c64yw94bgbk0hbl4dhlgjfjwkljmqgqrzsddvgqh"; depends=[Matrix ROCR]; }; DRomics = derive2 { name="DRomics"; version="1.0-2"; sha256="0kvhby807h4ilmrlbcxlmw3rncvg9i428n8rl40v2w865a0p6861"; depends=[ggplot2 limma]; }; - DSAIDE = derive2 { name="DSAIDE"; version="0.8.0"; sha256="07nngh3gs7n2myr1fwfqaq9ys56h16mjrha19gxjgsmcf5dp3bi4"; depends=[adaptivetau deSolve dplyr ggplot2 gridExtra lhs plotly shiny XML]; }; - DSAIRM = derive2 { name="DSAIRM"; version="0.8.0"; sha256="1mc3xqbciim53d7gglnpgla4c4i0ps3vw83d64rp39wzhrpnxv5c"; depends=[adaptivetau boot deSolve dplyr ggplot2 gridExtra lhs nloptr plotly shiny XML]; }; + DSAIDE = derive2 { name="DSAIDE"; version="0.8.2"; sha256="00qpnqqdzj8bfg2i04w47hq7by7p17n6prp7w5vzis72y7s3d07l"; depends=[adaptivetau deSolve dplyr ggplot2 gridExtra lhs nloptr plotly shiny XML]; }; + DSAIRM = derive2 { name="DSAIRM"; version="0.8.2"; sha256="05m6hm9h8f41n3wswbp7z80kfvmn65jypj9fwlv3k8bdm4lw1mla"; depends=[adaptivetau boot deSolve dplyr ggplot2 gridExtra lhs nloptr plotly shiny XML]; }; DSBayes = derive2 { name="DSBayes"; version="1.1"; sha256="0iv4l11dww45qg8x6xcf82f9rcz8bcb9w1mj7c7ha9glv5sfb25v"; depends=[BB]; }; - DSL = derive2 { name="DSL"; version="0.1-6"; sha256="0fmqxladifqqcs4mpb8a1az74fyb4gb8l2y5gzqaad3dbiz82qih"; depends=[]; }; + DSL = derive2 { name="DSL"; version="0.1-6.1"; sha256="1zgw3dpgzbb63n1rasz8s519d9x5g3ri05xsjyxm1i6zczcnymmc"; depends=[]; }; DSpat = derive2 { name="DSpat"; version="0.1.6"; sha256="1v6dahrp8q7fx0yrwgh6lk3ll2l8lzy146r28vkhz08ab8hiw431"; depends=[mgcv RandomFields rgeos sp spatstat]; }; DSsim = derive2 { name="DSsim"; version="1.1.4"; sha256="0cspyd6msh8aci3w1fv234ca2bwpi6ylkbl45d4k0v3wzzfj20hk"; depends=[fields mgcv mrds rgeos shapefiles sp splancs]; }; DStree = derive2 { name="DStree"; version="1.0"; sha256="14wba25ylmsyrndh007kl377dv4r34wr1555yxl6kyxrs4yg3jir"; depends=[Ecdat pec Rcpp rpart rpart_plot survival]; }; @@ -941,6 +948,7 @@ in with self; { DTAXG = derive2 { name="DTAXG"; version="0.1.0"; sha256="1jxa0ix0z35i0xdnjl698j8iqjmp6nz8ckah9bap5ay9rkq0xd7f"; depends=[]; }; DTComPair = derive2 { name="DTComPair"; version="1.0.3"; sha256="1af2293ckkpz0gjcibgzzvz37852cav4wa4girpc87yn3p4ajlri"; depends=[gee PropCIs]; }; DTDA = derive2 { name="DTDA"; version="2.1-1"; sha256="0hi2qjcwd6zrzx87mdn1kns5f2h6jh7sz9jpgbi0p0i80xg8jnn3"; depends=[]; }; + DTDA_cif = derive2 { name="DTDA.cif"; version="1.0"; sha256="1gfhcbb5y7yw93f1flpj0p3n62drvck3wi0vswdrzzbbgb0qr2l2"; depends=[doParallel foreach Rcpp]; }; DTDA_ni = derive2 { name="DTDA.ni"; version="1.0"; sha256="0c45cz4y629bc0jnf3m35ywqkrnjcdqbssbb6m10j8b4gszdi35i"; depends=[]; }; DTK = derive2 { name="DTK"; version="3.5"; sha256="0nxcvx25by2nfi47samzpfrd65qpgvcgd5hnq9psx83gv502g55l"; depends=[]; }; DTMCPack = derive2 { name="DTMCPack"; version="0.1-2"; sha256="0bibas5cf06qq834x9q2l2fyh6q9wrg07k8cn6almcyirzax6811"; depends=[]; }; @@ -950,7 +958,7 @@ in with self; { DTSg = derive2 { name="DTSg"; version="0.1.2"; sha256="0j83ysgw5sq4m4sg4a2k2fpmc8g0xbc9hgnlkmyr1cwl3r4xw4ks"; depends=[assertive_base assertive_numbers assertive_sets assertive_types data_table R6]; }; DTWBI = derive2 { name="DTWBI"; version="1.1"; sha256="06lp4yc5nhacrgic78l014g2w1ibwgs8dp8zrahk5aripaczl25y"; depends=[dtw e1071 entropy lsa rlist]; }; DTWUMI = derive2 { name="DTWUMI"; version="1.0"; sha256="0pybgbfs2yp2ljbs0kra5z70x3llkiwdngp6cadgs3j9rar4vq4q"; depends=[dtw DTWBI e1071 entropy lsa rlist]; }; - DVHmetrics = derive2 { name="DVHmetrics"; version="0.3.8"; sha256="1d4ykhy0x2ypfb52n8b2lcyd7nsrcixk7dsnkajc8avkbn4ylgrw"; depends=[ggplot2 KernSmooth shiny]; }; + DVHmetrics = derive2 { name="DVHmetrics"; version="0.3.9"; sha256="1m13lhxgw7yj44s5spmlb4xxkranfbmjfh8lhrksikd796vxms3s"; depends=[ggplot2 KernSmooth reshape2 shiny]; }; DWDLargeR = derive2 { name="DWDLargeR"; version="0.1-0"; sha256="1bxdvgj38xv2xj98njpyhy12b54nccwnc3v92kkpd3i7nwbw48dy"; depends=[Matrix SparseM]; }; DWLasso = derive2 { name="DWLasso"; version="1.1"; sha256="1i8j8wjfvg69ldr8ahz1zv3m2wgxd701iph94ad22zs9qwqfg16z"; depends=[glmnet hglasso Matrix]; }; DWreg = derive2 { name="DWreg"; version="2.0"; sha256="0bgahzgcxz86n0ady97l48zyahv3p2iyc2ivbij1xrfx3wcx3b5n"; depends=[DiscreteWeibull Ecdat maxLik survival]; }; @@ -972,8 +980,8 @@ in with self; { DataPackageR = derive2 { name="DataPackageR"; version="0.15.7"; sha256="11bra0kgmvag4mp6hpljd8m3r1306cbncmz3x71iybkahimws813"; depends=[assertthat crayon desc devtools digest futile_logger knitr purrr rmarkdown roxygen2 rprojroot stringr usethis yaml]; }; DataSpaceR = derive2 { name="DataSpaceR"; version="0.6.3"; sha256="13hbh2wm9vfwzrr5vsq1nyd6670msd47wbq3smdpwk5vwl8w7m35"; depends=[assertthat curl data_table digest httr jsonlite R6 Rlabkey]; }; DataVisualizations = derive2 { name="DataVisualizations"; version="1.1.6"; sha256="0xw40nq6r64c5z2q3kwnr7nn97ar1mwnzifpd0j3l65nyar9dswf"; depends=[AdaptGauss ggplot2 Rcpp RcppArmadillo sp]; }; - DataViz = derive2 { name="DataViz"; version="0.2.6"; sha256="09pszs46vzcjjrmgf9sya89qp53qjm1x68vkq3m27cz5an39qzfy"; depends=[Rcpp tibble]; }; - DatabaseConnector = derive2 { name="DatabaseConnector"; version="2.3.0"; sha256="1mzdc57jlrmi7v7whgjwjy1pmkq9hn4fr6nwgn0biwdfbk6jc2q5"; depends=[bit DatabaseConnectorJars DBI ff ffbase rJava SqlRender urltools]; }; + DataViz = derive2 { name="DataViz"; version="0.2.7"; sha256="0skyj254ljg00vfv91mbwv9r9idaw8f6fj0ccvgmmlq183xg16qk"; depends=[Rcpp tibble]; }; + DatabaseConnector = derive2 { name="DatabaseConnector"; version="2.4.1"; sha256="0f0kybbi47x585rxlgdhcmrn1wr9399pd26692czg4h9qwvnka52"; depends=[bit DatabaseConnectorJars DBI ff ffbase rJava SqlRender urltools]; }; DatabaseConnectorJars = derive2 { name="DatabaseConnectorJars"; version="1.1.0"; sha256="18m6ynj30r5xdy51b3s39h0jcz1k2wgka888skr6ds2233lhqk2w"; depends=[rJava]; }; DatabionicSwarm = derive2 { name="DatabionicSwarm"; version="1.1.1"; sha256="06i5vinyjkmlmz8q9m7zzc86hhyand45vxv9w7lkah5yzc785n3c"; depends=[deldir GeneralizedUmatrix Rcpp RcppArmadillo]; }; Davies = derive2 { name="Davies"; version="1.1-9"; sha256="19n2szki2dc8z01zh5a7bq4scgisnpd2qqbiimgrswjrykgh2fpm"; depends=[]; }; @@ -1002,7 +1010,7 @@ in with self; { DepthProc = derive2 { name="DepthProc"; version="2.1.1"; sha256="059hqqjxaa6k65k6snbxvq4kpcqigri86v909kgw9vxq0jmb5pl7"; depends=[colorspace geometry ggplot2 lattice MASS np Rcpp RcppArmadillo rrcov sm zoo]; }; Deriv = derive2 { name="Deriv"; version="3.8.5"; sha256="0815ws2zmla3ici1n8amkc8fz8lwpbg5z68m8j3nhc79m2ikvm20"; depends=[]; }; DescTools = derive2 { name="DescTools"; version="0.99.28"; sha256="001xjyf19c7sy8x7gfs7krjcj39zsbx2cgc5ds3c4p16fhxnw8vg"; depends=[BH boot expm foreign manipulate MASS mvtnorm Rcpp]; }; - DescToolsAddIns = derive2 { name="DescToolsAddIns"; version="1.2"; sha256="0dkinmiwv47wdpdj75idxjcalm2r4mljspfis5k7hyxmy20hi1nv"; depends=[DescTools rstudioapi]; }; + DescToolsAddIns = derive2 { name="DescToolsAddIns"; version="1.3"; sha256="114zhx26rcbnnpjcm9igbnv4yx4q378z4mi1xjnsy2wn1dwh397a"; depends=[DescTools foreign manipulate rstudioapi writexl]; }; DescribeDisplay = derive2 { name="DescribeDisplay"; version="0.2.7"; sha256="0241mbz0y3ala7fsb4fwjd0xigsk0wq77hfrjyvnnp97rfjfzmcv"; depends=[GGally ggplot2 plyr reshape2 scales]; }; DescriptiveStats_OBeu = derive2 { name="DescriptiveStats.OBeu"; version="1.3.1"; sha256="1bqq56m4vhmgijxpyllpy08xx29k0p7lhmd0iwa06jdw4lj5rdah"; depends=[dplyr jsonlite magrittr RCurl reshape]; }; DesignLibrary = derive2 { name="DesignLibrary"; version="0.1.4"; sha256="16j9ca3y8mcdbd64yqm6js4lb9hjc74dh4r5y3h1ifvwzj0a78yc"; depends=[DeclareDesign estimatr fabricatr generics glue randomizr rlang]; }; @@ -1018,7 +1026,7 @@ in with self; { DiagrammeR = derive2 { name="DiagrammeR"; version="1.0.1"; sha256="04zhyci6ywysbp2lliaz5sv0qmssxx63gr3d7kkhkjcgc37qmvnc"; depends=[downloader dplyr glue htmltools htmlwidgets igraph influenceR magrittr purrr RColorBrewer readr rgexf rlang rstudioapi scales stringr tibble tidyr viridis visNetwork]; }; DiagrammeRsvg = derive2 { name="DiagrammeRsvg"; version="0.1"; sha256="0j2cm1mx3zrb2k3pcrb96z2z3kws61gyyjsjjv5rqcb5lzdgi65k"; depends=[V8]; }; DiallelAnalysisR = derive2 { name="DiallelAnalysisR"; version="0.1.1"; sha256="1diwzckn0f2dv0vj2mdzy7k3md6j472xzj82ip23adwr27vlfsi3"; depends=[ggplot2]; }; - DiceDesign = derive2 { name="DiceDesign"; version="1.8"; sha256="0154nsnr7g4nq4i3w1q3dlxj42a17hmir4gizr03jv7rn61vvkp4"; depends=[]; }; + DiceDesign = derive2 { name="DiceDesign"; version="1.8-1"; sha256="11s1m543kxd6gv4amh8z6pph1n67sj9sfwm6hjy83wfs65syf5vp"; depends=[]; }; DiceEval = derive2 { name="DiceEval"; version="1.4"; sha256="06p3v161ig714k7z59iji64xhxw1a68kqhnlwhwpjpyrx7kn137b"; depends=[DiceKriging]; }; DiceKriging = derive2 { name="DiceKriging"; version="1.5.6"; sha256="14jfwvj8vhrngcpkqdzr6klhnqwgr1g5wm5rqz8q6w7ip4nnsii5"; depends=[]; }; DiceOptim = derive2 { name="DiceOptim"; version="2.0"; sha256="1hx4379yb6d36c494qc237vld4jnfxq18m994p5ii9ks6s7amifn"; depends=[DiceDesign DiceKriging mnormt pbivnorm randtoolbox rgenoud]; }; @@ -1038,7 +1046,7 @@ in with self; { DirichletReg = derive2 { name="DirichletReg"; version="0.6-3.1"; sha256="1lz4b166grrs6vs98mf6a0wg4hvh0p901h697h9dkfhkxw8cqj3f"; depends=[Formula maxLik rgl]; }; DisHet = derive2 { name="DisHet"; version="1.0.0"; sha256="056jcs1qpiyadnmlzd0cj4kp0qzkichxi0pdnxypyq1fsqnpvan3"; depends=[gtools matrixStats]; }; DisImpact = derive2 { name="DisImpact"; version="0.0.4"; sha256="1fv446wr5b8ixcs473vqv5ak9q46vhgzflc1zg8x7k5q5fdwqhmm"; depends=[dplyr magrittr rlang]; }; - DiscreteFDR = derive2 { name="DiscreteFDR"; version="1.2"; sha256="1dfwk3c94rx66dm30w5i4287f509msw24x0lyfaxychyqmdzv8np"; depends=[]; }; + DiscreteFDR = derive2 { name="DiscreteFDR"; version="1.3-1"; sha256="0ij6r8l8xxjmnp0x29p0wlnq7bk1rmg7hxzfrs9qhb410rjxc3r4"; depends=[Rcpp]; }; DiscreteInverseWeibull = derive2 { name="DiscreteInverseWeibull"; version="1.0.2"; sha256="0vjsvl4m4zccfgizv7mzidbbpzqcm101x448vllcdcrn2xlnkmnq"; depends=[Rsolnp]; }; DiscreteLaplace = derive2 { name="DiscreteLaplace"; version="1.1.1"; sha256="17w4vjvsm7jacvwckjczyah3hglq044r3m6vqdcrg8haz884rav2"; depends=[]; }; DiscreteWeibull = derive2 { name="DiscreteWeibull"; version="1.1"; sha256="1rg3ax6jryagf5d3h8m44x9wyhr2qff3srfa9zrk6i64p1ahk9lr"; depends=[Rsolnp]; }; @@ -1051,7 +1059,7 @@ in with self; { DivMelt = derive2 { name="DivMelt"; version="1.0.3"; sha256="03vkz8d283l3zgqg7bh5dg3bss27pxv4qih7zwspwyjk81nw3xmr"; depends=[glmnet]; }; DiversityOccupancy = derive2 { name="DiversityOccupancy"; version="1.0.6"; sha256="16x3fpchgd12mccvr1k11vjka97sy5vjvjcyd5y3pskgnpycc2sv"; depends=[dplyr ggplot2 glmulti MuMIn qpcR raster unmarked vegan]; }; DnE = derive2 { name="DnE"; version="2.1.0"; sha256="02cbfb3m9xf24wkgqc06k3k0rx7qlqh4ma43khg6fpvif6yyahrn"; depends=[]; }; - DoE_MIParray = derive2 { name="DoE.MIParray"; version="0.12"; sha256="1dxz7iv0m6fs92y9m9wija73gnm4xhq5j0z04fnvp8m5v1wynjiy"; depends=[combinat DoE_base]; }; + DoE_MIParray = derive2 { name="DoE.MIParray"; version="0.13"; sha256="0lbcqfizgrnqmp0b2yn14br7xmabbhywy8h7161hx6hnvnam5r99"; depends=[combinat DoE_base]; }; DoE_base = derive2 { name="DoE.base"; version="1.1-3"; sha256="0y195kf3fldis17z20blrqkav4xsmy9xq6ak3gw9mgb9x59y7661"; depends=[combinat conf_design lattice MASS numbers partitions vcd]; }; DoE_wrapper = derive2 { name="DoE.wrapper"; version="0.10"; sha256="1kknqfpvrs46iksydg0mlld3wnjqcdhm82cx2sc20k3rpmz463b1"; depends=[AlgDesign DiceDesign DoE_base FrF2 lhs rsm]; }; DoEstRare = derive2 { name="DoEstRare"; version="0.2"; sha256="0y9ymw7114jk1rwiasq400bpgvkxv6rpc954c7v9mgxd3c2nfza7"; depends=[]; }; @@ -1066,6 +1074,7 @@ in with self; { DrBats = derive2 { name="DrBats"; version="0.1.4"; sha256="0jzl1jklxsbqf5hv3a71lckk51jxi1lnbk5zmvd4x3y9b9azl2cq"; depends=[ade4 coda MASS Matrix rstan sde]; }; DrImpute = derive2 { name="DrImpute"; version="1.0"; sha256="1adzarrwqb282pqgx2yqswp9rpwd1naxsmar54kddr6qyd6b923b"; depends=[Rcpp RcppArmadillo]; }; DrInsight = derive2 { name="DrInsight"; version="0.1.1"; sha256="02lqf6bwbgcgyg5zx16nvnzpagmcmbsngnhmyv47256vsd9vppjd"; depends=[igraph qusage]; }; + DramaAnalysis = derive2 { name="DramaAnalysis"; version="3.0.0"; sha256="0hqyy79fyc13fxfrj9ghpydvys2j5pizfvsfii1dhk2a2adh7h3y"; depends=[data_table git2r httr readr reshape2 stringr tokenizers xml2]; }; DriftBurstHypothesis = derive2 { name="DriftBurstHypothesis"; version="0.1.3"; sha256="12zisrh2wra33hm4m4rzr5r3cxc3gdapv93c18wna64skbggvbv6"; depends=[Rcpp RcppArmadillo xts zoo]; }; DrillR = derive2 { name="DrillR"; version="0.1"; sha256="0n7pim5kk0wfdjcc67v4vvdb7wyhn5bcgi2a12nbyfyydss7pk1g"; depends=[httr]; }; DrugClust = derive2 { name="DrugClust"; version="0.2"; sha256="0acvjqwzkbjmy101m501l7fkfxzkp6zflwvn56li5307xv9ggnfg"; depends=[cclust cluster e1071 MESS ROCR]; }; @@ -1079,8 +1088,8 @@ in with self; { DynTxRegime = derive2 { name="DynTxRegime"; version="4.1"; sha256="1gjklpyjf9gl1h94v8lhra0vg90bnci7f70nzmvg2gkfyin7jygv"; depends=[dfoptim kernlab modelObj rgenoud]; }; DynaRankR = derive2 { name="DynaRankR"; version="1.0.0"; sha256="1smxgsxl0s5ynlphssd2q59f40zxin8im91fdcvawchc4qj2lmgg"; depends=[dplyr rlang]; }; DynamicDistribution = derive2 { name="DynamicDistribution"; version="1.1"; sha256="1s78hpj2pxjs4vixin1i816qjbn3wk7b8rd2zdjp4d4rbxifcqf5"; depends=[]; }; - DynamicGP = derive2 { name="DynamicGP"; version="1.1-2"; sha256="0myw6k2jnb1g1cfyacbib5bv43jiv2n451220hv5v87514y3z5kf"; depends=[lhs]; }; - E4tools = derive2 { name="E4tools"; version="0.1.0"; sha256="10kjy86lqn1k7lv3hykcskjyqmgxmwn1iwx4gsdgsvjg7xp4q303"; depends=[accelerometry anytime BBmisc chron data_table DataCombine ggplot2 hms scales signal]; }; + DynamicGP = derive2 { name="DynamicGP"; version="1.1-4"; sha256="0zlhlxbi53zd79dgp09625ghb5lfl5s4sdmf2849ajcc83wqfiih"; depends=[lhs]; }; + E4tools = derive2 { name="E4tools"; version="0.1.1"; sha256="1kmj1fddybjia9ninhcy75kdmq152zjw7s24chpqr5wsblffr3yx"; depends=[accelerometry anytime BBmisc chron data_table DataCombine doParallel doSNOW foreach ggplot2 hms scales signal]; }; EAinference = derive2 { name="EAinference"; version="0.2.3"; sha256="1kzcfya3z6rf1vqjn72yjymdhrn4dzgmwifh3w6k22cy5jxffzn4"; depends=[hdi limSolve MASS msm mvtnorm Rcpp RcppArmadillo]; }; EBASS = derive2 { name="EBASS"; version="0.1"; sha256="14hxzj06wrc4ihflr7dqk28fsjwbcizr0jy54vhv0mk1y1gd4201"; depends=[]; }; EBEN = derive2 { name="EBEN"; version="4.6"; sha256="0gcf5b2viiq69vs8bd8nhk65g9sbzgg212w7zpnz4y6cv9jkk5zz"; depends=[]; }; @@ -1105,7 +1114,7 @@ in with self; { EFAutilities = derive2 { name="EFAutilities"; version="2.0.0"; sha256="1vbpz9papk6vvch3kb2qm6nspa4llp4mpck6ky1j8kvkhjzm1za0"; depends=[GPArotation mvtnorm plyr]; }; EFDR = derive2 { name="EFDR"; version="1.0"; sha256="1344ysvrniqn1qv2hx9b9afg9fivccfrj393xy9cqz4j395b6jx0"; depends=[copula doParallel dplyr foreach gstat Matrix sp tidyr waveslim]; }; EFS = derive2 { name="EFS"; version="1.0.3"; sha256="1q8cf8dnxpv5s3lr9145y0wjhak4rz18dzah4xfs5qr4c8nlpl54"; depends=[party pROC randomForest ROCR]; }; - EGAnet = derive2 { name="EGAnet"; version="0.5"; sha256="136hymfsamsvsc7liclzx06widcd2vxc5f4p8iqnwx39gwxa9yzk"; depends=[corpcor doParallel dplyr foreach ggpubr glasso igraph iterators lavaan Matrix mvtnorm NetworkToolbox plotly plyr qgraph semPlot]; }; + EGAnet = derive2 { name="EGAnet"; version="0.7"; sha256="1j385mds2mdl0cbshwfda2js0av8rg9npn7ibp1xy3k0d6mwi90z"; depends=[corpcor doParallel dplyr foreach ggplot2 ggpubr glasso igraph iterators lavaan Matrix matrixcalc mvtnorm NetworkToolbox plotly plyr qgraph semPlot]; }; EGRET = derive2 { name="EGRET"; version="3.0.2"; sha256="02c9cakj7szywx0r4rylbdnk63b4npqp2i5x1fhxjy0j5bn0hc2f"; depends=[dataRetrieval fields foreach survival truncnorm]; }; EGRETci = derive2 { name="EGRETci"; version="2.0.3"; sha256="1fzcndah890nfd3fg83jhp5lpwb0xfyrccabgvilkrrm4i4x675m"; depends=[binom EGRET]; }; EHR = derive2 { name="EHR"; version="0.1-3"; sha256="1y12j0sjr1zp3bzha1p31f903js674l6ifjccw0y9718sry8dbv2"; depends=[logistf]; }; @@ -1135,7 +1144,7 @@ in with self; { EMMIXskew = derive2 { name="EMMIXskew"; version="1.0.3"; sha256="05y1ivbzbsfab90925l3ahzd3b8y5kjfk3f0p2s9s3sfyxphqah7"; depends=[KernSmooth lattice mvtnorm]; }; EMMLi = derive2 { name="EMMLi"; version="0.0.3"; sha256="1b36kyzvrdljmkysggv8jyaip78pj32ms0xhj2y568hd419lkh2p"; depends=[]; }; EMMREML = derive2 { name="EMMREML"; version="3.1"; sha256="0qwj4jlfhppjxwcjldh49b6idnagazrxybaid3k2c269wvxwvddq"; depends=[Matrix]; }; - EMP = derive2 { name="EMP"; version="2.0.2"; sha256="0l9wyxmcl8b6jiykc4mim6npmz5wrsapk2wgxbfhg27dwdb847ha"; depends=[ROCR]; }; + EMP = derive2 { name="EMP"; version="2.0.5"; sha256="0piagbxk8siagmvzqv2bh12g1y0hy3c0vkxpddlmp7gm3i304rpi"; depends=[ROCR]; }; EMSC = derive2 { name="EMSC"; version="0.9.0"; sha256="13d915g7iyv724x35i9mr8msy5mhrpqhhva21vdinxbjdy6vdlr9"; depends=[pracma]; }; EMSHS = derive2 { name="EMSHS"; version="1.0.0"; sha256="1lpv3243z5765b1dihqz9hc3dpw76nwy14mmd4253sw8xpy25w41"; depends=[Rdpack]; }; EMSNM = derive2 { name="EMSNM"; version="1.0"; sha256="0rhaadzhq9jfpnwxfqcsb3yz96rqlwkm165k5n5jxzwxpg1rg2n0"; depends=[]; }; @@ -1175,8 +1184,8 @@ in with self; { Ecfun = derive2 { name="Ecfun"; version="0.2-0"; sha256="1clxwmwd4lmhh7zqspqgn13vrzg40lbqzb0a7b90qla4hk9r4zm4"; depends=[fda gdata jpeg MASS RCurl stringi TeachingDemos tis XML xml2]; }; EcoGenetics = derive2 { name="EcoGenetics"; version="1.2.1-5"; sha256="1953q374msvdw91m2nagxkwh5r9gnq5qss6l6mf34hayq3kwm8s9"; depends=[d3heatmap doParallel edgebundleR foreach ggplot2 htmlwidgets igraph jsonlite magrittr networkD3 party pheatmap plotly raster reshape2 rgdal rkt SoDA sp]; }; EcoHydRology = derive2 { name="EcoHydRology"; version="0.4.12.1"; sha256="075kgy6cxppkclk6nj5xs1f5yv9w8cpr09xwhf2101a6wswknb88"; depends=[DEoptim operators topmodel XML]; }; - EcoIndR = derive2 { name="EcoIndR"; version="1.5"; sha256="1qzh2lybfqgnh34w0izvdzz322big4p3r9bwdd9qdazqrcxp5zyf"; depends=[rgeos]; }; - EcoNetGen = derive2 { name="EcoNetGen"; version="0.2.2"; sha256="1gz3h97i8bcd3nkkrfl5wwxwjkw0z7qvj1bjksdjplchkag0nk3x"; depends=[ggplot2 igraph]; }; + EcoIndR = derive2 { name="EcoIndR"; version="1.6"; sha256="1pichrwny5hyb19919ldbgkdxp1s6vs03yw0x43ww13ldi314zbn"; depends=[rgeos]; }; + EcoNetGen = derive2 { name="EcoNetGen"; version="0.2.3"; sha256="05j8m9vzkwlsw1h69s5myhbg85vyhqdxcl9r5mdwsrk9f58wajmz"; depends=[ggplot2 igraph]; }; 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="1.1"; sha256="1aryl2sb5ak390lgnm427ilm6xv9lmsjhwdnapzc033zvqb099gj"; depends=[]; }; @@ -1193,13 +1202,14 @@ in with self; { ElastH = derive2 { name="ElastH"; version="0.3.1"; sha256="1xgmz0xirvdyjz8l31zb2j91nj0g8ffhvzp44b97473fsj06n1g6"; depends=[dlm]; }; EleChemr = derive2 { name="EleChemr"; version="1.1.0"; sha256="109dv7ayg5nm6zjd70dp8h5qqwrijikymzgb41dl8vx4pqhv43v3"; depends=[ggplot2]; }; ElemStatLearn = derive2 { name="ElemStatLearn"; version="2015.6.26.1"; sha256="09hz283vwg0sdxavqw5rp6izqjf8slvv7sraa355cklz5n27xgag"; depends=[]; }; + EloChoice = derive2 { name="EloChoice"; version="0.29.4"; sha256="1g8ivvnv16c2gniwd9xa9z89bm4rac0nrg3mcg1risgf9yk4rgm5"; depends=[psychotools Rcpp RcppArmadillo Rdpack]; }; EloOptimized = derive2 { name="EloOptimized"; version="0.3.0"; sha256="185vh8h6r5wqcbaq3glq8k3fr8jp6h3q2h2ly54agi6bi3fvbs05"; depends=[BAMMtools dplyr lubridate magrittr reshape2 rlang rlist]; }; EloRating = derive2 { name="EloRating"; version="0.46.8"; sha256="1hsqsdik1slmdjd811mkpag96iahy62l27yj2a27mnnffi188lmi"; depends=[network Rcpp RcppArmadillo Rdpack sna zoo]; }; ElstonStewart = derive2 { name="ElstonStewart"; version="1.1"; sha256="1y2g4x3fhi78c2406bk8r8c3x9zhx8ya3qlbnypdm65j0minixsn"; depends=[digest kinship2]; }; Emcdf = derive2 { name="Emcdf"; version="0.1.2"; sha256="0jb59jp1drcwipmk6yzg0cl366i8nhffa13c3x3fmhaj7ifv77vv"; depends=[lattice Rcpp]; }; EmiStatR = derive2 { name="EmiStatR"; version="1.2.2.0"; sha256="0xwmwbybiyb9688l5n98vir3rwbbjgpw5qb25p20lhlj1pqg95w1"; depends=[doParallel foreach lattice xts zoo]; }; EmissV = derive2 { name="EmissV"; version="0.665.1.0"; sha256="1xzpsr43pyvmvzbcw66cxv7qs9i8s7pg1w90l3ivx9mz7p8bfz8a"; depends=[data_table lwgeom ncdf4 raster sf sp units]; }; - EmpiricalCalibration = derive2 { name="EmpiricalCalibration"; version="1.4.0"; sha256="07q8il0hn8jz1h94nic3kxh09yz7biphakbx45xy0spyv23q01m6"; depends=[ggplot2 gridExtra]; }; + EmpiricalCalibration = derive2 { name="EmpiricalCalibration"; version="2.0.0"; sha256="0kbzkahka7030hsbvjjf3cafsnqdpfg5yh0r8agsm789dm24q3k9"; depends=[ggplot2 gridExtra]; }; EncDNA = derive2 { name="EncDNA"; version="1.0.2"; sha256="0wy2cmcvyqjhg5mqbvdzmihfv8swx7ym2n9mjdqgx0kgnc7k614y"; depends=[Biostrings]; }; EnergyOnlineCPM = derive2 { name="EnergyOnlineCPM"; version="1.0"; sha256="1a3wvclqdwcvq5inhliwjnd7xzqbjvzs8h8ncy6qlhjq6s5n7nm8"; depends=[energy MASS]; }; EngrExpt = derive2 { name="EngrExpt"; version="0.1-8"; sha256="0zclvckj2i7j4kfs58hcjcl722vl2y6dcnjz238cjfgwv279gqhp"; depends=[lattice]; }; @@ -1220,7 +1230,7 @@ in with self; { EpiContactTrace = derive2 { name="EpiContactTrace"; version="0.12.0"; sha256="1i84fslz8sdngvkv34zhzjwzrzzxx6f4s31p8f5smmf028jlpyys"; depends=[]; }; EpiCurve = derive2 { name="EpiCurve"; version="2.1-1"; sha256="0y6llpxa8xyfn9cxhq35mzfp1gc7la1708q85q4hz0l115abvk92"; depends=[dplyr ggplot2 ISOweek RColorBrewer scales timeDate]; }; 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=[]; }; + EpiEstim = derive2 { name="EpiEstim"; version="2.2-1"; sha256="1a21mskjvyz9qdvl3kkf0p15zn1nx1a49c5djp1lacrn6h7g8k9p"; depends=[coarseDataTools coda fitdistrplus ggplot2 gridExtra incidence reshape2 scales]; }; EpiILM = derive2 { name="EpiILM"; version="1.4.2"; sha256="16vml2p7c4nv0lfis661x7b9wimrni1ncpa256dh99cps9508j28"; depends=[coda]; }; EpiILMCT = derive2 { name="EpiILMCT"; version="1.1.3"; sha256="10snghwkapg6n6lhkf5v3w2g0ngkq556px65ccc4dgyndhwdsqmm"; depends=[coda igraph]; }; EpiModel = derive2 { name="EpiModel"; version="1.7.2"; sha256="0zkj17kvssn4y2rglasx2s0ks1ha6bf1lzbj809pmf2m4gvyc4gb"; depends=[ape deSolve doParallel ergm foreach ggplot2 lazyeval network networkDynamic RColorBrewer tergm]; }; @@ -1283,7 +1293,7 @@ in with self; { FDRsampsize = derive2 { name="FDRsampsize"; version="1.0"; sha256="0g8kawzyi9x5yndvh330wzqw6rvcnprwq56ngd0j6z51hvvw8qhw"; depends=[]; }; FDboost = derive2 { name="FDboost"; version="0.3-2"; sha256="1ahdq49ijj4j2yykmzbpgrjn0sm09nzmd33k317y157hnf6zyxvs"; depends=[gamboostLSS MASS Matrix mboost mgcv stabs zoo]; }; FENmlm = derive2 { name="FENmlm"; version="2.4.2"; sha256="1nqnrjij5kgn0xpm3xvz2hdlddpcnvyni58pyrlmnlyvbhcw2z0k"; depends=[Formula MASS numDeriv Rcpp]; }; - FEprovideR = derive2 { name="FEprovideR"; version="0.1.0"; sha256="07z84dqnbiiwjghsn5vml6300gw1swnap0la3pksw3dwxi131zk6"; depends=[ggplot2 Matrix poibin]; }; + FEprovideR = derive2 { name="FEprovideR"; version="1.1"; sha256="02hfdk9qhaq4y19p700w2i7qsdp4z2kyww0pr0pijfivkqks0vpi"; depends=[ggplot2 Matrix poibin]; }; FFD = derive2 { name="FFD"; version="1.0-6"; sha256="19yqb45qj54fmjkqfjbcqsx3wz6fk8inrqif9ds93xjkm6aaiqgp"; depends=[R2HTML tkrplot]; }; FFTrees = derive2 { name="FFTrees"; version="1.4.0"; sha256="0s2h81vdh8d41kwz5ja831q11wrb7ywdd7aq46x3y9sgg3aabd44"; depends=[caret circlize e1071 igraph pROC progress randomForest rpart stringr yarrr]; }; FField = derive2 { name="FField"; version="0.1.0"; sha256="05q16v2vv64qhbnf2l66dwzmvgzyaq8vxwwdabp534bw7z7zpi8q"; depends=[]; }; @@ -1300,7 +1310,7 @@ in with self; { FLAME = derive2 { name="FLAME"; version="1.0.0"; sha256="0va9mbwlnvr64hii203rmq4x3izpix0x36kpsns43yb9wdqq70hv"; depends=[dplyr gmp lattice latticeExtra reticulate rlang RPostgreSQL RSQLite]; }; FLLat = derive2 { name="FLLat"; version="1.2-1"; sha256="0306bpwp2az4x4m5sv88hlh7vs0y5isfby7lxrn2gjnk76gg6mw1"; depends=[gplots]; }; FLR = derive2 { name="FLR"; version="1.0"; sha256="0k50vi73qj7sjps0s6b2hq1cmpa4qr2vwkpd2wv2w1hhhrj8lm0n"; depends=[combinat]; }; - FLSSS = derive2 { name="FLSSS"; version="8.5.2"; sha256="0ligxax4nqhpmn3jp628f6572800lgxjqii78llvj0j927y3fapa"; depends=[Rcpp RcppParallel]; }; + FLSSS = derive2 { name="FLSSS"; version="8.5.5"; sha256="00hcfbzc6v4xyhmlqc1ypl7df2x134dbsl21l7rh3zcmp2vc9ayr"; depends=[Rcpp RcppParallel]; }; FLightR = derive2 { name="FLightR"; version="0.4.9"; sha256="0rcnkifq6mi1i5xhk6qy2gl3bry269y4isfr8phl3car0yj39lw1"; depends=[bit CircStats circular fields GeoLight ggmap ggplot2 ggsn maptools mgcv nlme raster RcppArmadillo rgdal rgeos sp truncnorm]; }; FMAdist = derive2 { name="FMAdist"; version="0.1.0"; sha256="0aa4sw93ia6cp386hrq6x448x4w0p6k198rjaqs474j25gqgxrv0"; depends=[EnvStats extraDistr fitdistrplus MASS quadprog STAR]; }; FMC = derive2 { name="FMC"; version="1.0.0"; sha256="1pfqxx7slgcmw4al7i8hy59f4han6b0b7b5az7yh1mscdnghl9bj"; depends=[minimalRSD]; }; @@ -1321,7 +1331,7 @@ in with self; { FRESA_CAD = derive2 { name="FRESA.CAD"; version="3.1.0"; sha256="1gi637fwfpwbghms96bmfqs7zirjskd9hxiw43s0765h3ypjqwx1"; depends=[Hmisc miscTools pROC Rcpp RcppArmadillo stringr]; }; FRK = derive2 { name="FRK"; version="0.2.2"; sha256="0m0ngxanyq19myzza4fb75k9vb67mv17iny847bv9qrgg2vbm5r8"; depends=[digest dplyr ggplot2 Hmisc Matrix plyr Rcpp sp spacetime sparseinv]; }; FRegSigCom = derive2 { name="FRegSigCom"; version="0.3.0"; sha256="0w0yhch75wdx6phf5h4radipgpndv5bfxva2pzzd99fkmws4sswn"; depends=[fda Matrix Rcpp RcppEigen]; }; - FSA = derive2 { name="FSA"; version="0.8.24"; sha256="0b8dz3vcfhgm35zfrw9pn4w7ja7k46wx5qqsavyns650lah0m36p"; depends=[car dplyr dunn_test epitools gplots lmtest plotrix plyr sciplot withr]; }; + FSA = derive2 { name="FSA"; version="0.8.25"; sha256="035hbw36bmyvk947lkf6f96930wla7wlyn77zrnswl2ikxriif1p"; depends=[car dplyr dunn_test epitools gplots lmtest plotrix plyr sciplot withr]; }; FSAdata = derive2 { name="FSAdata"; version="0.3.8"; sha256="0i7wkz0baxcf1dv6qvc891b4ja4x65p4qicil472k6a9gcf5d4qm"; depends=[]; }; FSInteract = derive2 { name="FSInteract"; version="0.1.2"; sha256="1aci1398aaz0nrl5jy6yh7xik355wf7pwngrsak4qsi94vdj05iy"; depends=[Matrix Rcpp]; }; FSMUMI = derive2 { name="FSMUMI"; version="1.0"; sha256="06ri1zi86cm4arjdlp2pha2bvcc8vz6irvd9n3ja074hv62wxcw4"; depends=[FuzzyR lsa]; }; @@ -1334,8 +1344,8 @@ 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.2.7"; sha256="0hvlr9cw6wfckl8rzl5qqyp0h8rv8gcnyj6x930jq7h44kj0ji7d"; depends=[ade4 ggplot2 ggrepel KernSmooth scatterplot3d xtable]; }; - FactoInvestigate = derive2 { name="FactoInvestigate"; version="1.3"; sha256="1924f5sfadgs47ja1ljwqm3slnmqqz1pwxhh9cn1rg1hi8g7db6f"; depends=[FactoMineR rmarkdown rrcov]; }; - FactoMineR = derive2 { name="FactoMineR"; version="1.41"; sha256="1h20hydav6l2b7bngqw1av4l5rrh0wk58nhailga1f4qw9lrv259"; depends=[car cluster ellipse flashClust lattice leaps MASS scatterplot3d]; }; + FactoInvestigate = derive2 { name="FactoInvestigate"; version="1.4"; sha256="1svz4w025jhy907rmg5w4c3wrwadwncb420w2dc1b3nhhysh0llv"; depends=[FactoMineR rmarkdown rrcov]; }; + FactoMineR = derive2 { name="FactoMineR"; version="1.42"; sha256="1yl16inb2m89l1czgaf0pgy9655dpr751hyx92yw6rqpd2ryznac"; depends=[car cluster ellipse flashClust lattice leaps MASS scatterplot3d]; }; FactorsR = derive2 { name="FactorsR"; version="1.4"; sha256="1nw63j9bi4x09pgdvdml0w0qxfy1dda5hkxbhd3d6f7rky1z0nyf"; depends=[]; }; Factoshiny = derive2 { name="Factoshiny"; version="1.0.7"; sha256="1s4pnikv6n767z2x8s5gqqsj64yf9ivpdb5xw0qviizf9qwg8yvi"; depends=[colourpicker FactoMineR shiny]; }; Fahrmeir = derive2 { name="Fahrmeir"; version="2016.5.31"; sha256="16fbc1zb9x9p04bl7y5nd375pha6bd3hfqqchlk1bqxrj4879y5g"; depends=[]; }; @@ -1392,6 +1402,7 @@ in with self; { FlowCAr = derive2 { name="FlowCAr"; version="1.0.0"; sha256="19pn29p99j85p8mzjnlkqjr9nbxr3vffahs53i85s1gajb9ynpk4"; depends=[enaR LIM limSolve]; }; FlowRegEnvCost = derive2 { name="FlowRegEnvCost"; version="0.1.1"; sha256="0lw4kv4z0s23jy11y53rxxh7zxa7vajxrcnjgxd74xxs64vjlj88"; depends=[zoo]; }; FlowScreen = derive2 { name="FlowScreen"; version="1.2.6"; sha256="1s9xyrvfsgrl2zxm2an5qj3rs1qx7v7j8wc83jzl28pkwa5xr351"; depends=[changepoint evir zyp]; }; + FluMoDL = derive2 { name="FluMoDL"; version="0.0.2"; sha256="193xyzc20nb1hsj172alky7h661j8m1r42x3xh1h22yzb1hb6dn4"; depends=[dlnm mvmeta tsModel]; }; 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]; }; @@ -1399,6 +1410,7 @@ in with self; { ForecastComb = derive2 { name="ForecastComb"; version="1.3.1"; sha256="07cbiv172mpkwvg6svhwgavlfy2144ir3y1l7w37wbd0ygs514id"; depends=[forecast ggplot2 Matrix mtsdi psych quadprog quantreg]; }; ForecastCombinations = derive2 { name="ForecastCombinations"; version="1.1"; sha256="07vzgm2jy992p1l9b8rsv2lbc8cbfzvql85n5ah4p4l3zjxdxgk9"; depends=[quadprog quantreg]; }; ForecastFramework = derive2 { name="ForecastFramework"; version="0.10.1"; sha256="0g9d7248zadbhr5gs0rnl2ckjj4xa08nkwlb8kfsvdnnfzihcz4p"; depends=[abind dplyr lubridate magrittr R6 reshape2 tibble]; }; + ForestFit = derive2 { name="ForestFit"; version="0.3"; sha256="02yv6f76pd9lw38yfb87nbb4z6cj9l0j67ddricfxxzlxmz6n8hv"; depends=[ars cluster]; }; ForestGapR = derive2 { name="ForestGapR"; version="0.0.2"; sha256="0xig9nal83xg312kgq6dhi7n67sa8ixlnh79x957w3n5rv9kdyf2"; depends=[igraph raster rgeos sp spatstat VGAM viridis]; }; ForestTools = derive2 { name="ForestTools"; version="0.2.0"; sha256="0q9nk9n001bnz5hd8cxj6wmaf8c7g0kwfkpa0hk6ap42666rrrah"; depends=[APfun imager raster rgeos sp]; }; FormalSeries = derive2 { name="FormalSeries"; version="1.0"; sha256="09m4ifinasww0xfprs29xsrqhxxkw9zffb3919xnkkjkwp0nax4v"; depends=[]; }; @@ -1409,7 +1421,7 @@ in with self; { FourgameteP = derive2 { name="FourgameteP"; version="0.1.0"; sha256="15yn47737768fkjjv8ykc9lw7x58pq44k90d9d4c9hp20zw5f3by"; depends=[]; }; FrF2 = derive2 { name="FrF2"; version="1.7-3"; sha256="11x9jpj0l5w7195gryimfmii84nk76ll1z6hrrzr2v9y4jcxpx4s"; 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.1.1"; sha256="0l015v99hzmiyic0klvq71ljk9f8ipr57ki7x4cjyz1gam9f84p5"; depends=[]; }; + FractalParameterEstimation = derive2 { name="FractalParameterEstimation"; version="1.1.2"; sha256="16xm2g723dm1n1h6as6yvy92sigzhj31f269g5rrzqjcd4d5m8an"; depends=[]; }; Fragman = derive2 { name="Fragman"; version="1.0.9"; sha256="03vmvmnyza4i46v1awkdjz6ccbsiq49dm0mlmwsm801rq6yfihgp"; depends=[]; }; Frames2 = derive2 { name="Frames2"; version="0.2.1"; sha256="0xbz19v5r1h15p8mf94vacw04h3kvmm88ayy4b1aqxrd925n63mw"; depends=[MASS nnet sampling]; }; FreeSortR = derive2 { name="FreeSortR"; version="1.3"; sha256="1m6ahhixbbizzn09pz71zvinrdshn3j6gmy05jdxa9d932agqk0w"; depends=[ellipse smacof vegan]; }; @@ -1460,7 +1472,7 @@ in with self; { GDELTtools = derive2 { name="GDELTtools"; version="1.2"; sha256="1rx6kjh7kmyycqapvbizcxkcfp09qvqv7k8f25v333sxkacpz6p5"; depends=[plyr TimeWarp]; }; GDINA = derive2 { name="GDINA"; version="2.6.0"; sha256="02smx1q0a5zgms6h2dnl2786jss38vim8n3vh3dbsijkvj7m4cb9"; depends=[alabama ggplot2 MASS nloptr numDeriv Rcpp RcppArmadillo Rsolnp shiny shinydashboard]; }; GEEaSPU = derive2 { name="GEEaSPU"; version="1.0.2"; sha256="02pwjqd94kranc1f69bx9rzk27kchavhvhl9fygjhrr40nwq3pbg"; depends=[gee Rcpp RcppArmadillo]; }; - GEEmediate = derive2 { name="GEEmediate"; version="1.1.1"; sha256="1akgl4j38x4qf3z9d6z7cgjd7x9f0k3lrzyrzgykqhrzmbh68z2m"; depends=[gee]; }; + GEEmediate = derive2 { name="GEEmediate"; version="1.1.3"; sha256="1xprkpjp1pkq4ci1n32d3yy80hx3r4xf2j7f6hv7dvsn4cvdp417"; depends=[gee]; }; GENEAclassify = derive2 { name="GENEAclassify"; version="1.4.17"; sha256="0v2aa9ig49vc8dz0s91bvs9jilca3pg8zxq7r2w6x195arb3ngga"; depends=[changepoint GENEAread MASS rpart signal]; }; GENEAread = derive2 { name="GENEAread"; version="2.0.6"; sha256="1idqfg1ma8sy48j8v875j29p72slfqaj8cix6l9gpwlry6lnhg4g"; depends=[bitops mmap]; }; GENLIB = derive2 { name="GENLIB"; version="1.0.6"; sha256="0xyq3ggi814vi3x5kxffhi7ygvzcfj3pg0kfi7whcjpi3pjg05h8"; depends=[bootstrap doParallel foreach kinship2 lattice Matrix quadprog Rcpp]; }; @@ -1469,6 +1481,7 @@ in with self; { GERGM = derive2 { name="GERGM"; version="0.13.0"; sha256="1h3fzkgc553bvxhcmvmlgk9sdais186h4gs1qagdihwpwn8ymbjk"; depends=[BH coda ggplot2 igraph matrixcalc plyr Rcpp RcppArmadillo RcppParallel scales slackr stringr vegan]; }; GESE = derive2 { name="GESE"; version="2.0.1"; sha256="0h3s2sbnv5wilr2mj6bnl2892p16pxrs341gg6jql1a540p669sk"; depends=[kinship2]; }; GESTr = derive2 { name="GESTr"; version="0.1"; sha256="1q12l2vcq6bcyybnknrmfbm6rpzcmxgq2vyj33xwhkmm9g2ii9k6"; depends=[gtools mclust]; }; + GET = derive2 { name="GET"; version="0.1-3"; sha256="115hrwdxv2kpfl372r1h7qjyazm50z3zx76ydhjsaj6pp5zspdw5"; depends=[caTools fda_usc ggplot2 gridExtra gstat plyr sp spatstat]; }; GEVStableGarch = derive2 { name="GEVStableGarch"; version="1.1"; sha256="1iypv0k4cbvsdyglgvf7y52sqvl5qcin627pjqwq42kisqynm8d7"; depends=[fExtremes fGarch Rsolnp skewt stabledist timeDate timeSeries]; }; GEVcdn = derive2 { name="GEVcdn"; version="1.1.6"; sha256="09lzhh16r1hsxa23jkq716yf3x9ap6fkkrz3ij2x83rvwznj8hb3"; depends=[VGAM]; }; GEint = derive2 { name="GEint"; version="0.1.5"; sha256="179gpq4qjhgx1fhyjdb80rf2ip80zhhfyn8xjgwq1a425163q1y7"; depends=[bindata geepack mvtnorm nleqslv pracma rje speedglm]; }; @@ -1480,7 +1493,7 @@ in with self; { GFORCE = derive2 { name="GFORCE"; version="0.1.4"; sha256="1x7dvzgnqfvyvp6ibdsnrn5q01ivcgkzkh0mv8nfwqg5zr78v2cz"; depends=[lpSolve MASS]; }; GGEBiplotGUI = derive2 { name="GGEBiplotGUI"; version="1.0-9"; sha256="0nd0ky3m1avy82z48g7hcysq0y0agxjxdn0g624dkm2w99avxw3j"; depends=[rgl tkrplot]; }; GGEBiplots = derive2 { name="GGEBiplots"; version="0.1.1"; sha256="1xnxaylikjd378flw3rqw36z27b2limkmyad97zhf1cbva317d1b"; depends=[gge GGEBiplotGUI ggforce ggplot2 scales]; }; - GGIR = derive2 { name="GGIR"; version="1.9-1"; sha256="1mpp9zwk5gc50i2nyif2byjmzgr4c2p752wj6q73xad55p308sb7"; depends=[data_table Rcpp]; }; + GGIR = derive2 { name="GGIR"; version="1.9-2"; sha256="1qdk0nq2ahznphi6hjr5c1r877xxgqi58bpsayzh19lnzckrcc92"; depends=[data_table Rcpp]; }; GGMM = derive2 { name="GGMM"; version="1.0.1"; sha256="1d0qxxdk7b3hzg7dimsbjabpf5rxn3azn2hy00pa1c6wya7kxyvv"; depends=[equSA huge mvtnorm]; }; GGMridge = derive2 { name="GGMridge"; version="1.1"; sha256="0zbfvvp7l836m118m8nmdvw1w7xq6d3b7qirskjsq1dkk23j41hs"; depends=[MASS mvtnorm]; }; GGMselect = derive2 { name="GGMselect"; version="0.1-12.2"; sha256="16d4nz5x3yy9lw974gdls18fnx7g1hfghzfq3wh7739c54pvd5gs"; depends=[gtools lars mvtnorm]; }; @@ -1498,20 +1511,22 @@ in with self; { GLMMRR = derive2 { name="GLMMRR"; version="0.2.0"; sha256="0s3jfh720acfmbadilq2c6gql3yifsbijpmw1jkzbsdc87pqi1db"; depends=[lattice lme4]; }; GLMMadaptive = derive2 { name="GLMMadaptive"; version="0.6-0"; sha256="0qf6rx93h9mgvzlraiy000sy9zl5jyn48yn3zi3av389dd35nr6a"; depends=[MASS nlme]; }; GLMaSPU = derive2 { name="GLMaSPU"; version="1.0"; sha256="0zx2bza5v5cfp9v7hf42s57522b6prawcwl77aa3kvjcnb0ish6g"; depends=[MASS mnormt mvtnorm Rcpp RcppArmadillo]; }; + GLMpack = derive2 { name="GLMpack"; version="0.1.0"; sha256="15bpw42y999ljdw8ka2ysrrm0y73xz37wwi3j67i01wafipq82xy"; depends=[AER censReg effects foreign lme4 lmtest MASS Matrix nnet pBrackets plm pscl sandwich]; }; GLMsData = derive2 { name="GLMsData"; version="1.0.0"; sha256="12q41zxniblzys20vjrf5skj8cbzlwb92mwk6jvnyd86lc70bsh1"; depends=[]; }; GLSE = derive2 { name="GLSE"; version="0.1.0"; sha256="1snzcz637ppz3lkg1575ln3shfidkrnynqh1d8b5rk0z0974bpm1"; depends=[gRbase igraph mvtnorm]; }; GLSME = derive2 { name="GLSME"; version="1.0.4"; sha256="1bh56dv4czl89dm9b6syfpsbds4wni03d5vamvjbp6wblhysxnpm"; depends=[corpcor mvtnorm]; }; GMAC = derive2 { name="GMAC"; version="3.0"; sha256="0c2cfpr8dik7j5br87hkvswrhqzj5vcna54gw6ffdf1rk9rz9j22"; depends=[]; }; GMCM = derive2 { name="GMCM"; version="1.3.2"; sha256="0sm08kf6ia2fi69zqv4nhnlk71v75b5sz2vd3aj0kfhgan7bl93i"; depends=[ellipse Rcpp RcppArmadillo]; }; GMDH = derive2 { name="GMDH"; version="1.6"; sha256="093glyz73246m5f2xb2xgbgi80haj4fanmr325byr99dnf4x35yn"; depends=[MASS]; }; - GMDH2 = derive2 { name="GMDH2"; version="1.4"; sha256="13vbzqxmqvp39rbxw41nqfrmk0w6w8qc9nzgfbfpc07h3gcwva41"; depends=[e1071 glmnet magrittr MASS nnet plotly randomForest xtable]; }; - GMDHreg = derive2 { name="GMDHreg"; version="0.1.0"; sha256="0z6xk2av3b124941ysx332kid3adxinyin5ly9kdfc432gbwx0iz"; depends=[]; }; + GMDH2 = derive2 { name="GMDH2"; version="1.5"; sha256="0y132zc8q4daj4856xikp4xvrqcibmn9r2shnmwpwxnfbik2ikfb"; depends=[e1071 glmnet magrittr MASS nnet plotly randomForest xtable]; }; + GMDHreg = derive2 { name="GMDHreg"; version="0.2.0"; sha256="07qk9jbav9gm3gh3ag7nz273iab5zlkn0yz31zs2hw646ik1yn14"; depends=[]; }; GMMAT = derive2 { name="GMMAT"; version="1.1.0"; sha256="0b6bw33bldnc525aka14bil7fcdjcr18hr92ln9p9afpqajzkayz"; depends=[CompQuadForm foreach Matrix Rcpp RcppArmadillo SeqArray SeqVarTools]; }; GMMBoost = derive2 { name="GMMBoost"; version="1.1.2"; sha256="01q165vkdiv4qh96lha0g2g94jpnzdclbby6q43ghh9j1yrd4qzj"; depends=[magic minqa]; }; GMSE = derive2 { name="GMSE"; version="0.4.0.11"; sha256="1by65202swxcj453q3frac02b2lwny1mm1i95vcjhkqihqkffl2z"; depends=[shiny shinydashboard shinyjs]; }; GMSimpute = derive2 { name="GMSimpute"; version="0.0.1.0"; sha256="1hmn5ss81df9j9ibgibs95j98irqzif94vq0c861mq4a65y59fcp"; depends=[ggplot2 glmnet reshape2]; }; GNAR = derive2 { name="GNAR"; version="0.3.6"; sha256="0ijl150f66hras89k0nxz7r8ws638x8rdglcia73b7wmmjmgdfid"; depends=[igraph wordcloud]; }; GNE = derive2 { name="GNE"; version="0.99-2"; sha256="16mivsa4r8d2cg5qsh5rpg2244f74zk2ln3vbys7ivjgnjpjn7z8"; depends=[alabama BB nleqslv SQUAREM]; }; + GOFShiny = derive2 { name="GOFShiny"; version="0.1.0"; sha256="04m08d9w8qqbql86c18qpnwym7agry8wspfwrnbbyp52h2pn2gxb"; depends=[rhandsontable rmarkdown shiny]; }; GOGANPA = derive2 { name="GOGANPA"; version="1.0"; sha256="1xbir21zvr5hv2y6nndzpsrpmnr7glrc7y6xgcyb856wx46ajan9"; depends=[GANPA WGCNA]; }; GORCure = derive2 { name="GORCure"; version="2.0"; sha256="1hazin0q74hf16azxa5h08kfj7g1079q77n2fn4fahpfxb8hmvwm"; depends=[ICsurv MASS pracma survival]; }; GOplot = derive2 { name="GOplot"; version="1.0.2"; sha256="1y8dv0kbzpr9za91njw0x233vx5d13vqml9hmpddcyi9s6va5nix"; depends=[ggdendro ggplot2 gridExtra RColorBrewer]; }; @@ -1543,7 +1558,7 @@ in with self; { GSAfisherCombined = derive2 { name="GSAfisherCombined"; version="1.0"; sha256="1xhq5nc3kbz3ml9qkdxm6m0c65fybabfhgqlwii2105jl0ll7qy5"; depends=[]; }; GSAgm = derive2 { name="GSAgm"; version="1.0"; sha256="18bhk67rpss6gg1ncaj0nrz0wbfxv7kvy1cxria083vi60z0vwbb"; depends=[edgeR survival]; }; GSE = derive2 { name="GSE"; version="4.2"; sha256="0vrxn6j5brhwd38zqnr6m3in3hp1xfs1mfhps9qsj20d4w8d1rf9"; depends=[cellWise ggplot2 MASS Rcpp RcppArmadillo robustbase rrcov]; }; - GSED = derive2 { name="GSED"; version="2.2"; sha256="11pzpsjzxw61spcjhbbqrdc0m48p5wnapxchksql2njas80s7ynj"; depends=[memoise rootSolve survival]; }; + GSED = derive2 { name="GSED"; version="2.3"; sha256="1mpbgdgz6c42bq8klk8b43clspbrnqs3vnrk7i5qjy7ngrd96c6i"; depends=[memoise rootSolve survival]; }; GSIF = derive2 { name="GSIF"; version="0.5-5"; sha256="104v01yifpagj7kyjfy80c4dgn9wv76py0av90vmgc55qynmvv19"; depends=[aqp dismo gstat plotKML plyr raster rgdal RSAGA scales sp]; }; GSM = derive2 { name="GSM"; version="1.3.2"; sha256="04xjs9w4gaszwzxmsr7657ry2ywa9pvpwpczpvinxi8vpj347jbb"; depends=[gtools]; }; GSMX = derive2 { name="GSMX"; version="1.3"; sha256="1n1d7rixj14ari46snsmi48qfmy00ihmzvayk3hkrp2d2d0xi2gh"; depends=[MASS]; }; @@ -1554,18 +1569,19 @@ in with self; { GUILDS = derive2 { name="GUILDS"; version="1.3"; sha256="0zl6x0vn93ybps63fqazvd93f2zwdq0rqqrp7d6n5rnamx99mm8d"; depends=[pracma Rcpp]; }; GUIProfiler = derive2 { name="GUIProfiler"; version="2.0.1"; sha256="10m4d7f2rhw6cmkrnw3jh4iqlkfphf4v7mpfwzw17laq0ncmsx5r"; depends=[graph MASS Nozzle_R1 proftools Rgraphviz rstudioapi]; }; GUIgems = derive2 { name="GUIgems"; version="0.1"; sha256="0lmx8hw0496vk437p32l933cdb4vpi94f4kz58x20jj07c20maz6"; depends=[ggplot2 igraph MASS msm plyr rpanel stringr]; }; - GUTS = derive2 { name="GUTS"; version="1.1.0"; sha256="05nm2jfz5c0shsf73jkp22bgs98hal0px4717djkyvylif8nycmg"; depends=[Rcpp]; }; + GUTS = derive2 { name="GUTS"; version="1.1.1"; sha256="05njlykhxs62k5cjrfwgbqyckbvf2jxjshg3avf6vhwwf58qyjq9"; depends=[Rcpp]; }; GUniFrac = derive2 { name="GUniFrac"; version="1.1"; sha256="1vgij7c9b0afl5wzwcn0pjdvn8gqz2jxk5q0gchd9zk1qd10a1vl"; depends=[ape matrixStats vegan]; }; GVARX = derive2 { name="GVARX"; version="1.1"; sha256="1y0v2qvrxhpjm6qi5h5safncqdm1ad2sgydrvi46jq613x99zynh"; depends=[lmtest lubridate sandwich strucchange urca vars xts]; }; GWAF = derive2 { name="GWAF"; version="2.2"; sha256="11lk1dy24y1d0biihy2aypdvlx569lw1pfjs51m54rhgpwzkw6yd"; depends=[coxme geepack lme4]; }; GWASExactHW = derive2 { name="GWASExactHW"; version="1.01"; sha256="19qmk8h7kxmn9kzw0x4xns5p3qqz27xkqq4q6zmh4jzizd0fsl78"; depends=[]; }; GWASinlps = derive2 { name="GWASinlps"; version="1.2"; sha256="036lv8f58kz6qdwaviyk1q1qsgcj9cimipq1cjrfpn8snkn7s1gh"; depends=[horseshoe mombf speedglm]; }; + GWASinspector = derive2 { name="GWASinspector"; version="1.1.2"; sha256="0qvyp8camwvml0yi3p7zx6n8xilzbgaz77qmxnrffyxbnxbpjnha"; depends=[data_table futile_logger ggplot2 gridExtra hash ini kableExtra knitr rmarkdown RSQLite]; }; GWEX = derive2 { name="GWEX"; version="1.0.1"; sha256="1bpjygx38rkicya37x6d88k34yc0ysr3pyfp4ci5px1xsic5cpmy"; depends=[abind doParallel EnvStats fGarch foreach lmomco MASS mvtnorm nleqslv Renext]; }; GWG = derive2 { name="GWG"; version="1.0"; sha256="1va0cd229dhhi1lmrkpwapcm96hrdmxilrmba02xnl7ikhisw0my"; depends=[]; }; GWLelast = derive2 { name="GWLelast"; version="1.2.2"; sha256="1nm4w5m4ca6npmpvh9nb0cnrbzlyv95nvvhgs3pqcrw4igagm4hj"; depends=[doParallel foreach geosphere glmnet sp spgwr]; }; GWRM = derive2 { name="GWRM"; version="2.1.0.3"; sha256="16ahlf1pbcpgha50a7ml2c336by50r287kihwshiazshifi5p3n3"; depends=[doParallel foreach]; }; GWSDAT = derive2 { name="GWSDAT"; version="3.0.3"; sha256="10xvnnhqjs2p1r6yzflhkfi4985ljs57k5k8r6g85y2hq46m80p8"; depends=[deldir digest geometry Kendall lattice MASS Matrix officer readxl rhandsontable sf shiny shinycssloaders shinydashboard shinyjs sm sp splancs zoo]; }; - GWmodel = derive2 { name="GWmodel"; version="2.0-9"; sha256="19zz9i0f8i03ri8wpb8vkih2qd1fsn9h3l43307w7bnl34nayydl"; depends=[maptools Rcpp RcppArmadillo robustbase sp spacetime spatialreg spdep]; }; + GWmodel = derive2 { name="GWmodel"; version="2.1-3"; sha256="1xha645sx73sy35s856qd4hd3y0n682bnrw0ahfzcr4fvzykc6iy"; depends=[FNN maptools Rcpp RcppArmadillo robustbase sp spacetime spatialreg spdep]; }; GWsignif = derive2 { name="GWsignif"; version="1.2"; sha256="0bss5s3ijnlckz44p7jj49bn2r8nwqckpzwzcv0vci915q8jfsj2"; depends=[]; }; GaDiFPT = derive2 { name="GaDiFPT"; version="1.0"; sha256="15fnj1w30h0zdj032f3js0bbb1qlyk4b54a4aclykwzicqdgalkg"; depends=[]; }; GameTheory = derive2 { name="GameTheory"; version="2.7"; sha256="0vb7sjia5s58gw9zpkzddps8knxvbrz7fbi3m6digl8bf5vwhxxw"; depends=[combinat gtools ineq kappalab lpSolveAPI]; }; @@ -1576,18 +1592,20 @@ in with self; { GeNetIt = derive2 { name="GeNetIt"; version="0.1-1"; sha256="1xjz22m4yn642m0bqa33w4m2rygpxjwg43c54lw168jck9zzgv1f"; depends=[nlme raster rgeos sp spatialEco spdep]; }; GenAlgo = derive2 { name="GenAlgo"; version="2.1.5"; sha256="0d3y9kc2njsbzdngv67d4qrdsnn7nsxph5acc09vmwxpv1cyhxiw"; depends=[ClassDiscovery MASS oompaBase]; }; GenBinomApps = derive2 { name="GenBinomApps"; version="1.0-2"; sha256="1ps1rq8cjlwh658mysdh3xbn5fihanzcwxb38xvg4031vnwv80in"; depends=[]; }; - GenEst = derive2 { name="GenEst"; version="1.2.4"; sha256="0liq9z4n48hxswa97bxskwjn6yi5k1b99zwgp2ldxm70h80srywz"; depends=[cbinom corpus DT gsl gtools htmltools lubridate matrixStats mvtnorm Rcpp shiny shinyjs sticky survival]; }; + GenEst = derive2 { name="GenEst"; version="1.3.0"; sha256="0bqnn78vjxc92gdi09qvijyc0fp5z5r3lmijaxs0zrvlp1r120j7"; depends=[cbinom corpus DT gsl gtools htmltools lubridate matrixStats mvtnorm Rcpp shiny shinyjs sticky survival]; }; 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.7"; sha256="03xqwxm7v7rnihx730a4p65dfwhjh4345r3d78y0qxxplk8d76cx"; depends=[]; }; GenTag = derive2 { name="GenTag"; version="1.0"; sha256="0yirl7n7p7w1dfbbr48v1151qyqm7p9m00vc6jq0s2d6bjdspin9"; depends=[]; }; GenWin = derive2 { name="GenWin"; version="0.1"; sha256="0jm537i4jn3azdpvd50y9p0fssfx2ym2n36d3zgnfd32gqckz3s4"; depends=[pspline]; }; + GeneBook = derive2 { name="GeneBook"; version="1.0"; sha256="1cg8zyr7rbshj3shhzkrxs910dsz4brhh51jvn2qzipzd8dbvxiv"; depends=[dplyr repmis stringr svDialogs]; }; GeneClusterNet = derive2 { name="GeneClusterNet"; version="1.0.1"; sha256="1xi4c041c4m39f9wb5fklgmhi6ng78iwzzqch5xk9hx5blq6zd4m"; depends=[G1DBN igraph MASS]; }; GeneCycle = derive2 { name="GeneCycle"; version="1.1.4"; sha256="0pivwfjz1plfhwz7k2c33k6p0pa1014d80qsrk8ig9yqqqlyhy1z"; depends=[fdrtool longitudinal MASS]; }; GeneF = derive2 { name="GeneF"; version="1.0"; sha256="0bizf47944b2zv9ayxb9rhrqx0ilz2xlvkw7x5vbg7l67y2g2l4d"; depends=[]; }; GeneNet = derive2 { name="GeneNet"; version="1.2.13"; sha256="0w52apk0nnr8nsskf26ff7ana8xiksr8wqmkjxzwhzgg7fncm61p"; depends=[corpcor fdrtool longitudinal]; }; GeneralOaxaca = derive2 { name="GeneralOaxaca"; version="1.0"; sha256="19j5c5xr6mdb6pmih94wbjas4yh0dmsqfggg8clvdxkpwk0h338v"; depends=[boot]; }; + GeneralisedCovarianceMeasure = derive2 { name="GeneralisedCovarianceMeasure"; version="0.1.0"; sha256="02s1wbsdp5ma4pnmcsdl5dwm156zx12d3n1ypzkc33lxg21ashzj"; depends=[CVST kernlab mgcv xgboost]; }; GeneralizedHyperbolic = derive2 { name="GeneralizedHyperbolic"; version="0.8-4"; sha256="01gqfvmzfslhxdnigzbl3rd55hk6r0kgd8fm9xjl0kb9vmb735lm"; depends=[DistributionUtils MASS]; }; GeneralizedUmatrix = derive2 { name="GeneralizedUmatrix"; version="1.1.5"; sha256="0a4wpn1zqw1aiygin43lrq55kb7z6macgi2hl5vng9wnx2gl9jiq"; depends=[ggplot2 Rcpp RcppArmadillo]; }; GeneticSubsetter = derive2 { name="GeneticSubsetter"; version="0.8"; sha256="0bd4snv3dwabc7mknmd2rjmffj67xq535x0bycajhd83d1jhjars"; depends=[]; }; @@ -1604,17 +1622,18 @@ in with self; { GeomComb = derive2 { name="GeomComb"; version="1.0"; sha256="05xb6m2ciszxd13yhqdkildh9nsq19ss8885ngj6ynvbchqkii7r"; depends=[forecast ForecastCombinations ggplot2 Matrix mtsdi psych]; }; GerminaR = derive2 { name="GerminaR"; version="1.3"; sha256="1q52rp0xvs2mmc4mr7dx1zq78xags5j7kdgj8h05m8qh8dfhzvqf"; depends=[agricolae assertthat dplyr DT ggplot2 gsheet gtools magrittr readxl shiny shinydashboard tibble tidyr]; }; GetBCBData = derive2 { name="GetBCBData"; version="0.5"; sha256="1i5b5sawa8ngjp1afm1grm9hbmkhd5pcwqagkamlihsrmsvcdffn"; depends=[curl dplyr furrr future jsonlite lubridate memoise purrr RCurl readr stringr]; }; - GetDFPData = derive2 { name="GetDFPData"; version="1.5.1"; sha256="1smnglqqjva8dp12paw0jvd1zz4dx362i99zsif7rxdfz6wd68fa"; depends=[curl dplyr lubridate readr reshape2 stringr tibble xlsx XML]; }; + GetDFPData = derive2 { name="GetDFPData"; version="1.5.2"; sha256="1xa1dy1lm4v2lch3qmfa990bx8r1qzch7jkpnydlnzmd0qmcbvb4"; depends=[curl dplyr lubridate readr reshape2 stringr tibble xlsx XML]; }; GetHFData = derive2 { name="GetHFData"; version="1.7"; sha256="05xmr880n6arvpn6lb51yn9qssc8594rsxp6cinshk2jh6hq4fnj"; depends=[curl dplyr lubridate RCurl readr stringr]; }; GetLattesData = derive2 { name="GetLattesData"; version="1.3"; sha256="0fqm50095lap687qnf1gxmm7syyv1k75irkqgsajijyr5adrizrp"; depends=[curl dplyr readr stringdist stringr XML]; }; GetR = derive2 { name="GetR"; version="0.1"; sha256="1b2wirhz4nhvmf863czwb8z8b42ilsyjjrg9rc4nd9b7nz50bmjg"; depends=[party]; }; - GetTDData = derive2 { name="GetTDData"; version="1.4"; sha256="0dl5wbq0w28l05jfw12mw5c2ghzvf0aq3qcc0il9373pd29mx4v9"; depends=[bizdays curl RCurl readxl stringi stringr tidyr XML]; }; + GetTDData = derive2 { name="GetTDData"; version="1.4.1"; sha256="0hm73i8rsrm58ci7hzmmgirxklcxxh1dg8l3nk8rfi9x8fnnfyhs"; depends=[bizdays curl RCurl readxl stringi stringr tidyr XML]; }; GetoptLong = derive2 { name="GetoptLong"; version="0.1.7"; sha256="1fl3w2n602ldybc5qj7qw4xmzzb804bsjkqwf6dswzj0vf0qiadr"; depends=[GlobalOptions rjson]; }; + Ghat = derive2 { name="Ghat"; version="0.1.0"; sha256="1w5agphnbngc0ldb3gbgh4b8ww956lf31bfyxw2zp56crx4akcxf"; depends=[rrBLUP]; }; GiNA = derive2 { name="GiNA"; version="1.0.1"; sha256="0his7wsgnggyv9526blxzxa1ni8hwq2ws64wkmha45nvvnm3dsiw"; depends=[doParallel EBImage foreach png]; }; GiRaF = derive2 { name="GiRaF"; version="1.0"; sha256="02356cq0g6v5m72fy5z83bw3nsb7kpc9sy7sykk97735n928z92n"; depends=[BH Rcpp RcppArmadillo]; }; GibbsACOV = derive2 { name="GibbsACOV"; version="1.1"; sha256="1ikcdsf72sn1zgk527zmxw3zjhx0yvkal6dv001cgkv202842kll"; depends=[MASS]; }; Gifi = derive2 { name="Gifi"; version="0.3-9"; sha256="0rwyj60cldf3k118cnc5px16dc5p5bfxgl0w2m1lh6rsqlmza25a"; depends=[colorspace]; }; - GillespieSSA = derive2 { name="GillespieSSA"; version="0.5-4"; sha256="0bs16g8vm9yrv74g94lj8fdfmf1rjj0f04lcnaya7gyak3jhk36q"; depends=[]; }; + GillespieSSA = derive2 { name="GillespieSSA"; version="0.6.1"; sha256="0li0jqnbl9rfj8gbspq7fv327fii53rh93ffsxpic7804rmrnbi7"; depends=[]; }; GiniDistance = derive2 { name="GiniDistance"; version="0.1.0"; sha256="0jq1dwpsvh3k25lawvzf9ij72jsspzyqsbnrphz8aqwi1dkm3851"; depends=[energy randomForest Rcpp RcppArmadillo readxl]; }; GiniWegNeg = derive2 { name="GiniWegNeg"; version="1.0.1"; sha256="1wqwjalsyp55si839cil6na3khigm0mwn6qkg0kjylq10pabfk2a"; depends=[]; }; GlobalDeviance = derive2 { name="GlobalDeviance"; version="0.4"; sha256="0s318arq2kmn8fh0rd5hd1h9wmadr9q8yw8ramsjzvdc41bxqq1a"; depends=[snowfall]; }; @@ -1622,12 +1641,12 @@ in with self; { GlobalOptions = derive2 { name="GlobalOptions"; version="0.1.0"; sha256="1wlyqz1yhmhjwslrd7q69jbd9vsbjkjfc01g60kl3cdpyr8hlyjn"; depends=[]; }; GmAMisc = derive2 { name="GmAMisc"; version="1.0.0"; sha256="14rs13y509hijg4ars3j55fm0133487alm8b9jlffbz8qiln48g4"; depends=[caTools classInt cluster coin corrplot DescTools dismo ggplot2 ggrepel gridExtra Hmisc InPosition kimisc lsr maptools plyr pROC raster RcmdrMisc rgdal rgeos rworldmap shape sp spatialEco spatstat]; }; Gmedian = derive2 { name="Gmedian"; version="1.2.4"; sha256="0lr1hwprqy9mq5qyp83qqxj8dh5sy487xkqbv2y1qdinzj62pvcn"; depends=[Rcpp RcppArmadillo robustbase RSpectra]; }; - Gmisc = derive2 { name="Gmisc"; version="1.8.1"; sha256="1pgmnn6qwcfcly7rhnnblriyazpvqa793i12xvb05hq0qij9j06f"; depends=[abind checkmate forestplot Hmisc htmlTable knitr lattice magrittr Rcpp rmarkdown stringr XML]; }; + Gmisc = derive2 { name="Gmisc"; version="1.9.0"; sha256="0072aidb9x969g276id68vaqvjddkb72l5smx1wlqss0h70y2r16"; depends=[abind checkmate forestplot Hmisc htmlTable knitr lattice magrittr Rcpp rmarkdown stringr XML]; }; GoFKernel = derive2 { name="GoFKernel"; version="2.1-1"; sha256="0xygsdmggl35fafyp431mkwalwixw2r3f32qll1pf72dfwd8y8d3"; depends=[KernSmooth]; }; GofKmt = derive2 { name="GofKmt"; version="2.0"; sha256="0018ljzlj7nkf12g0sqa8iyq3j2bnj9la3fwblx9lbdn8nxgllhn"; depends=[Rsolnp]; }; GoodmanKruskal = derive2 { name="GoodmanKruskal"; version="0.0.2"; sha256="1qwarachkhc2yvjyxfcfbgjc1x9ni5xb7f93zviv8mz3c35bhs3b"; depends=[classInt corrplot]; }; GoogleKnowledgeGraphR = derive2 { name="GoogleKnowledgeGraphR"; version="0.1.0"; sha256="1jxiq1s48skn43pydsw8s67hf70v9fhhw2drcx9vni3c3szs44qd"; depends=[curl jsonlite]; }; - GpGp = derive2 { name="GpGp"; version="0.2.0"; sha256="0v8kvi950hlrjirx1rpaix8sdgr2s68g4ps602iib59p50dxrwrr"; depends=[FNN Rcpp RcppArmadillo]; }; + GpGp = derive2 { name="GpGp"; version="0.2.1"; sha256="0sa2xfharyy21mfcxl7hzgmaq3x8iz834mbbcfkqm5qf689i08yj"; depends=[FNN Rcpp RcppArmadillo]; }; Grace = derive2 { name="Grace"; version="0.5.3"; sha256="0r41zvgdd5rqm15axqqssik6plwy7snpgw8m32labkfn3f0pp7n0"; depends=[glmnet MASS scalreg]; }; GrammR = derive2 { name="GrammR"; version="1.1.0"; sha256="1rwvgznfxp7d3rzymyljj3pn3z3ggia1bhi4nvpgd79qd4cifi2g"; depends=[ape cluster GUniFrac gWidgets gWidgetsRGtk2 MASS rgl RGtk2]; }; GraphFactor = derive2 { name="GraphFactor"; version="1.1"; sha256="1jxibd2d5b6vlq27m9ppmm96wsnkqn4pz66n9pwdl8wg2v85npw5"; depends=[igraph]; }; @@ -1651,7 +1670,7 @@ in with self; { GuessCompx = derive2 { name="GuessCompx"; version="1.0.3"; sha256="1xbkh1wh2z0n964w8lwi7q4rr7mls0awf5k7n5jjklhq4b6gswic"; depends=[boot dplyr ggplot2 lubridate reshape2]; }; GxM = derive2 { name="GxM"; version="1.1"; sha256="02rv8qb46ylk22iqn9cgh63vkyrg9a8nr1d0d3j5hqhi0wyhc41r"; depends=[minqa nlme Rcpp]; }; HAC = derive2 { name="HAC"; version="1.0-5"; sha256="0dc79qjhyydq0k4d8wvg970hs56i9yhxjrh5ky9a178ya61vw208"; depends=[copula numDeriv]; }; - HACSim = derive2 { name="HACSim"; version="1.0.2"; sha256="0y38fzg91wxf6klw28zfcxv6fibriamszx7q8iyv0yz03yc40sab"; depends=[ape pegas Rcpp RcppArmadillo]; }; + HACSim = derive2 { name="HACSim"; version="1.0.3"; sha256="0d6r08phibs510w218mws7g8yd5igrgqhgfhxwsg8dib1x7b85zz"; depends=[ape pegas Rcpp RcppArmadillo]; }; HAP_ROR = derive2 { name="HAP.ROR"; version="1.0"; sha256="1id9amz1cc2l2vnpp0ikbhf8ghbgzqd1b9dfivnyglg7996c3gbg"; depends=[ape hash]; }; HAPim = derive2 { name="HAPim"; version="1.3"; sha256="03qy0pxazv3gdq3fck7171ixilb9zi1dwnvc4v7d726g0lvn80pg"; depends=[]; }; HARModel = derive2 { name="HARModel"; version="0.2"; sha256="18vjzv6nrvaxv758hakpd9y58byqibd9i7sr6kr6z5lshii8fklv"; depends=[Rcpp RcppArmadillo sandwich xts zoo]; }; @@ -1716,22 +1735,21 @@ in with self; { HTSCluster = derive2 { name="HTSCluster"; version="2.0.8"; sha256="0wnbfh6hdx8692jilgmv8sys1zm6fqc6mim7vvjhyqlmpm8gm0kg"; depends=[capushe edgeR plotrix]; }; HTSSIP = derive2 { name="HTSSIP"; version="1.4.0"; sha256="04wfwbi57rxjd69inagvj3qricshwia16k6d2r4fgg9wmikgx4yv"; depends=[ape coenocliner DESeq2 dplyr ggplot2 igraph lazyeval magrittr phyloseq plyr stringr tidyr vegan]; }; HUM = derive2 { name="HUM"; version="1.0"; sha256="1bq74l88jvscmq9ihv5wn06w2wng073ybvqb2bdx2dmiqlpv6jw2"; depends=[gtools Rcpp rgl]; }; - HURDAT = derive2 { name="HURDAT"; version="0.2.1"; sha256="0v2ilxf7fq6zxpcb4vgi9jhjfps0v57q09z57hwk7x0sdmfsd3ka"; depends=[dplyr lubridate magrittr purrr readr stringr tibble tidyr]; }; + HURDAT = derive2 { name="HURDAT"; version="0.2.3"; sha256="1pcr0dlmhcblsgdyb79n377523x347d4gbzia247cpv52y4kbk0q"; depends=[dplyr purrr readr rlang rvest tidyr xml2]; }; 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.9"; sha256="1ri5dxq4qm12y1pi6pjydiz23220hffj6qa5235154m9sjz0jwx3"; depends=[]; }; HYRISK = derive2 { name="HYRISK"; version="1.2"; sha256="1ngwwzv1pavmscpca3ryzfxzd9rppsh0sm7k4sp2kzc9c0bix4xp"; depends=[kerdiest pbapply reliaR rgenoud sets triangle]; }; + HaDeX = derive2 { name="HaDeX"; version="0.1"; sha256="1k1qhgf5f9ssb9fxykzdmy8rwk8vjc04aj4g6qr1af7231gan6mg"; depends=[data_table dplyr DT ggplot2 gsubfn latex2exp readr readxl reshape2 shiny stringr tidyr]; }; HadoopStreaming = derive2 { name="HadoopStreaming"; version="0.2"; sha256="1l9msaizjvnsj1jrpghj4g057qifdgg6vbqhfxhn1fiqdqi2056q"; depends=[getopt]; }; HandTill2001 = derive2 { name="HandTill2001"; version="0.2-12"; sha256="1rijjv27zwdznznvwlb5hahixmfxayr6vs11p1mzwqma8qhsn5ak"; depends=[]; }; - HapEstXXR = derive2 { name="HapEstXXR"; version="0.1-8"; sha256="00p8pziy8q6vki7brpd57c7ckc9zw41c90h47yp9vb3ndanfqavp"; depends=[survival]; }; Hapi = derive2 { name="Hapi"; version="0.0.3"; sha256="0jqjhfq38k161kqff5cx0vxpsmjm2y5ca7049mvqiwqwvi4fp08m"; depends=[ggplot2 HMM]; }; Haplin = derive2 { name="Haplin"; version="7.1.0"; sha256="0xj2816v4vilvb4cizsw1qb2zfi63bgfhqqakcjvkcp4b8hn5cw2"; depends=[ff ffbase MASS mgcv snow SuppDists]; }; HaploSim = derive2 { name="HaploSim"; version="1.8.4"; sha256="0794f76hc9qvjmay7c61cmzycqafljs0g0hliq9xfrw4f23gq3sa"; depends=[]; }; HardyWeinberg = derive2 { name="HardyWeinberg"; version="1.6.3"; sha256="1irz44q6nf95h37av868f47aakwv3jgwgw217xfsfw0afkm7s25f"; depends=[mice Rcpp Rsolnp]; }; HarmonicRegression = derive2 { name="HarmonicRegression"; version="1.0"; sha256="0inz3l610wl0ibqjyrhfbmwmcfzcmcfhixai4lpkbfsyx93z2i4d"; depends=[]; }; Harvest_Tree = derive2 { name="Harvest.Tree"; version="1.1"; sha256="021zmppy7p2iakaxirfjdb5jzakg1ijma9d25ly2ni0nx0p1mh6z"; depends=[rpart]; }; - HellCor = derive2 { name="HellCor"; version="1.1"; sha256="16gch956386lsk83ns5ij4d2bd5mghdyv36s7sw1kdpn39pszlx7"; depends=[energy]; }; HelpersMG = derive2 { name="HelpersMG"; version="3.6"; sha256="1wlx74akpcf5ny4qjd12kb4rlgz38s6b5pj8744vcl852xbfizll"; depends=[coda lme4]; }; HeritSeq = derive2 { name="HeritSeq"; version="1.0.1"; sha256="0l1saxwj99xwkzcy43v0k9sicqwpw9gc8ywxpablagcddfj05pi3"; depends=[cplm DESeq2 lme4 MASS pbapply SummarizedExperiment tweedie]; }; HextractoR = derive2 { name="HextractoR"; version="1.3"; sha256="09x1zjpkm091yr7by83ksddka8ldczb0dg09yr1gb6j68rhlbigp"; depends=[doParallel foreach seqinr]; }; @@ -1769,7 +1787,7 @@ in with self; { IAT = derive2 { name="IAT"; version="0.3"; sha256="110rn2q09gspfd4msyh30dllxdxdraffkr18h1nm72brzhmx9cfi"; depends=[dplyr ggplot2 lazyeval]; }; IATScore = derive2 { name="IATScore"; version="0.1.1"; sha256="0sg4apj1sp0xc311cbkvflhv9kw1jxvjhdr0xjw79s662mnhkhgz"; depends=[]; }; IATanalytics = derive2 { name="IATanalytics"; version="0.1.1"; sha256="10g9iscfjmlxrkzls9320h9azpc5fnhh6276p7zn8sxqgp1nvnz9"; depends=[]; }; - IATscores = derive2 { name="IATscores"; version="0.2.1"; sha256="1nm07wlrnjx36wr3jbv2faayh1vrlfid124b27w9v0x0dk145i82"; depends=[dplyr qgraph reshape2 stringr]; }; + IATscores = derive2 { name="IATscores"; version="0.2.3"; sha256="03pakvryg64y7w9q7v97yykqwv7w93hl6h1ry652fjgrk5z3c43k"; depends=[dplyr qgraph reshape2 stringr]; }; IAbin = derive2 { name="IAbin"; version="1.0"; sha256="1cpj2mx72n4v0yd8jbbnhj2w5d0sc8pw7rc8ahnn1hfa38pwwsyx"; depends=[]; }; IBCF_MTME = derive2 { name="IBCF.MTME"; version="1.6-0"; sha256="1nlfsfdw8lfr3n2717i6kn1hafwr6hmqzfpg249amlrfjn0pghji"; depends=[dplyr lsa tidyr]; }; IBDLabels = derive2 { name="IBDLabels"; version="1.1"; sha256="1m9fd058yjxva6hin7i72i2nl285wfm0jkdn5xcng27yqlijyrm9"; depends=[]; }; @@ -1778,6 +1796,7 @@ in with self; { IBrokers = derive2 { name="IBrokers"; version="0.9-12"; sha256="0mhh4kgwrncrcysvnvah6xc7fhx5ywjzn258cs9xj9kzns0jblk6"; depends=[xts zoo]; }; IC2 = derive2 { name="IC2"; version="1.0-1"; sha256="03jjb62msxjxdg9l3zd1ns0d2w37hkxy5pnjgaywxw3vfk4zwfj9"; depends=[]; }; ICAFF = derive2 { name="ICAFF"; version="1.0.1"; sha256="0zazx4nv81s75appg10aayks04mx6m5n9yf5hqrbxh3yj68vzxfy"; depends=[]; }; + ICAMS = derive2 { name="ICAMS"; version="2.0.8"; sha256="1mi2kxgcakw2899b52rwlmqasiyqy858rffz81xyfmw5qdlka22c"; depends=[Biostrings BSgenome data_table dplyr GenomeInfoDb GenomicRanges IRanges RColorBrewer stringi]; }; ICAOD = derive2 { name="ICAOD"; version="0.9.9"; sha256="04s51rxhr4axxr1rnhnq87lcn9mjj8g18xr35awnmc4sjg2aavaf"; depends=[cubature mnormt mvQuad nloptr Rcpp RcppEigen sn]; }; ICBayes = derive2 { name="ICBayes"; version="1.1"; sha256="1bmxba3bv9szzxvjf1blwxwdhw87h7s04cfn63c1gqpnpwsmr03y"; depends=[coda HI survival]; }; ICC = derive2 { name="ICC"; version="2.3.0"; sha256="0y8zh9715cp9bglxpygqwgigrarq37sj845lk1xl0ydwinl0a6kk"; depends=[]; }; @@ -1817,6 +1836,7 @@ in with self; { IIS = derive2 { name="IIS"; version="1.0"; sha256="01h7nncxn1drnqf1h7snw0pvkgkn8dxq53k2sqcw3kdjlk5mj2l6"; depends=[asbio BSDA Hmisc NSM3 Rfit]; }; ILS = derive2 { name="ILS"; version="0.2"; sha256="0lj3ripkaq6jn00lpxjihjhm8g1gbkppmb1y9kkrymphg80k1by7"; depends=[depthTools fda_usc lattice MASS multcomp]; }; IM = derive2 { name="IM"; version="1.0"; sha256="1f1vr5zfqnanc5xmmlfkjkvxwbyyysi3mcvkg95p8r687a7zl0cx"; depends=[bmp jpeg png]; }; + IMAGE = derive2 { name="IMAGE"; version="1.0"; sha256="0xgrja7qhklcmbm0zz5xg94gw5kl05nk3v77l7vxq2d5sk0435g3"; depends=[doParallel foreach Matrix Rcpp RcppArmadillo]; }; IMFData = derive2 { name="IMFData"; version="0.2.0"; sha256="1mlxpsbyvh1zi8ivdblbd58zfv5hflnknbasz5z8xk9911czrn6p"; depends=[httr jsonlite plyr]; }; IMIFA = derive2 { name="IMIFA"; version="2.1.0"; sha256="11qcazhvym4k2g983ml2h12x4iqsa6bfzgxdazrcv4af9hps0ahz"; depends=[matrixStats mclust mvnfast Rfast slam viridis]; }; IMIS = derive2 { name="IMIS"; version="0.1"; sha256="09zb48vdj0i3vf8vxrs07xwb9ji27vp2fyvmg6jfq631licsryc2"; depends=[mvtnorm]; }; @@ -1828,6 +1848,7 @@ in with self; { IMak = derive2 { name="IMak"; version="1.2.2"; sha256="1g2h0c3n81hkj6zl2wc9xnjjwpv56ghp6gzcv2znc1nhs8fswxsb"; depends=[]; }; IMmailgun = derive2 { name="IMmailgun"; version="0.1.2"; sha256="09acmi6xj186fb8nhj8q0nxmkp2p32a1l95glzvz84gax4xakhz8"; depends=[httr]; }; INCATome = derive2 { name="INCATome"; version="1.0"; sha256="1gbmcirs49ydmk5rg2vl5gdy39dfx9psw5mijibzjszcfjar3kqs"; depends=[genefilter limma multtest RankProd siggenes]; }; + INDperform = derive2 { name="INDperform"; version="0.2.1"; sha256="02zqrb9hnfvwxni2477fjdx3ii0a0wbm1layskmwlzsvvkc60ngn"; depends=[cowplot dplyr ggplot2 htmlwidgets jsonlite lazyeval magrittr mgcv nlme purrr RColorBrewer rhandsontable rlang shiny stringr tibble tidyr vegan]; }; INLABMA = derive2 { name="INLABMA"; version="0.1-11"; sha256="0wzyb3c7zpksqz198kigi4rpblvk0rjamngmyabw5xdpizxdg6zi"; depends=[Matrix sp spdep]; }; INSPIRE = derive2 { name="INSPIRE"; version="1.5"; sha256="0938l50yxnb5q628mp874ayx9ybvcjddis20y1hzm5cmlsg0hqhg"; depends=[missMDA]; }; IOHanalyzer = derive2 { name="IOHanalyzer"; version="0.1.1"; sha256="0imjmhvasfshb3z4cpcjrvmwdc668i73bagl7iww7vhfn3y7mk4n"; depends=[bsplus colorRamps colorspace colourpicker data_table dplyr DT ggplot2 magrittr markdown plotly RColorBrewer Rcpp reshape2 shiny shinydashboard shinyjs withr]; }; @@ -1846,7 +1867,7 @@ in with self; { IROmiss = derive2 { name="IROmiss"; version="1.0.1"; sha256="01l08s1g7h8cki372daa61pw3wac3pbv5d4yqnphg5p8ihsmrc5d"; depends=[equSA huge mvtnorm ncvreg]; }; IRTShiny = derive2 { name="IRTShiny"; version="1.2"; sha256="094ax94y6k5z4vlxfla2w19f57q0z32nwwd5npjbgmnkhvfhhl9v"; depends=[beeswarm CTT ltm psych shiny shinyAce]; }; IRdisplay = derive2 { name="IRdisplay"; version="0.7.0"; sha256="12chk53nf4zckgc4yl7gbvd7m5dvli52inp5b3f0zvcjvfncksli"; depends=[repr]; }; - IRkernel = derive2 { name="IRkernel"; version="1.0.1"; sha256="1gij59b068qp7sbn9d0b9ghmnhfks15a9anj7bp26acv0yvdsg3s"; depends=[crayon digest evaluate IRdisplay jsonlite pbdZMQ repr uuid]; }; + IRkernel = derive2 { name="IRkernel"; version="1.0.2"; sha256="040qig675zaxsf81ranmvk293amrswi5098k69wyq0vgqyin6vwp"; depends=[crayon digest evaluate IRdisplay jsonlite pbdZMQ repr uuid]; }; ISAT = derive2 { name="ISAT"; version="1.0.5"; sha256="0xlq568spfz527jxbqamrn1j87hnasg0kp2bcyjycaghmhsc6zmg"; depends=[gtools stringr]; }; ISBF = derive2 { name="ISBF"; version="0.2.1"; sha256="12mk4d0m5rk4m5bskkkng5j6a9dzh8l1d74wh8lnamq7kf9ai9if"; depends=[]; }; ISCO08ConveRsions = derive2 { name="ISCO08ConveRsions"; version="0.1.0"; sha256="0jqg03rxr3k01y29b7gq89jk2jd2qrshmq3338j8w6531r7y12lg"; depends=[]; }; @@ -1881,7 +1902,7 @@ in with self; { IndepTest = derive2 { name="IndepTest"; version="0.2.0"; sha256="017jasqsxm5m13rhfy9gxvd8nfib5k5y5c8520p3hcffqrxr683p"; depends=[FNN mvtnorm Rdpack]; }; IndependenceTests = derive2 { name="IndependenceTests"; version="0.2"; sha256="04qfh2mg9xkfnvp6k7w1ip4rb663p3pzww9lyprcjvr3hcac7gqa"; depends=[xtable]; }; IndexConstruction = derive2 { name="IndexConstruction"; version="0.1-1"; sha256="16swmbkb6shxl0vxby4pi246ji7qqb849nzqr4pbdg4gdg1a36f5"; depends=[fGarch KernSmooth lubridate RcppBDT xts zoo]; }; - IndexNumR = derive2 { name="IndexNumR"; version="0.1.1"; sha256="0979v4wc3w9jxvwzpdrn8snrnicw9i41r9r9rpmkqbfrzc0xv6l3"; depends=[]; }; + IndexNumR = derive2 { name="IndexNumR"; version="0.1.2"; sha256="0dip7v4z36k3fhl8szrbl11gcqy1rr7kgmcsajpdwd16jixj1d27"; depends=[]; }; IndianTaxCalc = derive2 { name="IndianTaxCalc"; version="1.0.2"; sha256="1fxw884wj9n8drk2xz3rgr4f7b4fckh5firrf5gdz6d1nk9hdvc1"; depends=[]; }; InfDim = derive2 { name="InfDim"; version="1.0"; sha256="0rh3ch0m015xjkxy08vf9pc6q7azjc6sgicd2j6cwh611pqq39wq"; depends=[]; }; InferenceSMR = derive2 { name="InferenceSMR"; version="1.0"; sha256="13d3v8kyk6br33659jgql6j1nqmnd8zszqrwfw2x3khkiqzgdmhk"; depends=[survival]; }; @@ -1957,13 +1978,15 @@ in with self; { Johnson = derive2 { name="Johnson"; version="1.4"; sha256="12ajcfz5mwxvimv8nq683a2x3590gz0gnyviviyzf5x066a4q0lj"; depends=[]; }; JointAI = derive2 { name="JointAI"; version="0.5.2"; sha256="1g0vrjb3qma90qfalh51zw4cnyjb6yw3zhrcyzh4nvivz6cpp12j"; depends=[coda doParallel foreach MASS mcmcse rjags rlang]; }; JointModel = derive2 { name="JointModel"; version="1.0"; sha256="1zgs5c7saqyqxvxmhw5sxy5w67abq344aid6igw1da05bfy2az6h"; depends=[lme4 statmod survival]; }; - JointNets = derive2 { name="JointNets"; version="1.0.0"; sha256="1kvpx1xmpw1pns8x9wk4s27vf8wq6bq3r5bv1w9kbdd7130bpspz"; depends=[brainR igraph lpSolve MASS misc3d oro_nifti pcaPP rgl shiny]; }; + JointNets = derive2 { name="JointNets"; version="2.0.1"; sha256="18n9dsy0w0nh7dznp6gw6g5fhhjhf5y589nb49hri0721kq1h3rb"; depends=[brainR igraph JGL lpSolve MASS misc3d oro_nifti pcaPP rgl shiny]; }; Julia = derive2 { name="Julia"; version="1.1"; sha256="0i1n150d89pkds7qyr0xycz6h07zikb2y07d5fcpaqs4446a8prg"; depends=[]; }; JuliaCall = derive2 { name="JuliaCall"; version="0.16.6"; sha256="17vwv2x8gzd92j1wrj36z05ljqz79pjpxsrjsbcf07mfcij0bkac"; depends=[knitr Rcpp]; }; JumpTest = derive2 { name="JumpTest"; version="1.1"; sha256="0y375m5477nq0ybnjmfnd8hi45d8jmdnprqvw5f70llpd7bcghh0"; depends=[MASS Rcpp RcppEigen]; }; JuniperKernel = derive2 { name="JuniperKernel"; version="1.4.1.0"; sha256="1zghlfwh4wsjjp7ldp5y86ffyzc27ccl5j9lcwlp1di9slaqjign"; depends=[data_table gdtools jsonlite pbdZMQ Rcpp repr]; }; KANT = derive2 { name="KANT"; version="2.0"; sha256="169j72pmdkcj6hv8qgmc02aps0ppvvl1vnr1hzrb1gsf7zj7bs3y"; depends=[affy Biobase]; }; KATforDCEMRI = derive2 { name="KATforDCEMRI"; version="1.0"; sha256="1dq45psg8sisxzbi1iv7n45lk1ibarl3f7xf7icd6kv1jkc2f8za"; depends=[locfit matlab R_matlab]; }; + KCSKNNShiny = derive2 { name="KCSKNNShiny"; version="0.1.0"; sha256="13gzqf3g7vj8cc0xm5902q7lad2way8d0ri1fs01dnv97wmwbxvn"; depends=[caret dplyr FNN rhandsontable shiny]; }; + KCSNBShiny = derive2 { name="KCSNBShiny"; version="0.1.0"; sha256="1lv5r9qyvr3dnvcs00jyam0whv64qmv5vphhijlar1xa1g1llwqr"; depends=[caret dplyr e1071 rhandsontable shiny]; }; KDViz = derive2 { name="KDViz"; version="1.3.1"; sha256="1if4lkq9kvncqw56j7m9kh4piph091zkivvnhxzxj72zq661q5br"; depends=[htmlwidgets igraph mpa networkD3 rvest stringr tm xml2]; }; KENDL = derive2 { name="KENDL"; version="1.1"; sha256="05vsh3x0li964a485q3n19c7fahcprvg1bnrvffagkxf8w1iz153"; depends=[]; }; KERE = derive2 { name="KERE"; version="1.0.0"; sha256="1b16cb3ihcsp9jffmd45sd7ia4pibikmj62ad344wmq22q4fpliy"; depends=[]; }; @@ -1984,7 +2007,7 @@ in with self; { KSD = derive2 { name="KSD"; version="1.0.0"; sha256="0wqmbr51yv7f87pnhph2nrj9y2d5jql2agizcaq6lax23lj6xfb7"; depends=[pryr]; }; KSEAapp = derive2 { name="KSEAapp"; version="0.99.0"; sha256="1gfgpa2d32y6bzvf4ww70sm7niq34sqmyrhi0phlqxshqq9xviqc"; depends=[gplots]; }; KSPM = derive2 { name="KSPM"; version="0.1.2"; sha256="1vgd7m0p65asj1v5b77zh6rv9vfbmxdc274mdya002nm9n8xn3gz"; depends=[CompQuadForm DEoptim expm]; }; - KScorrect = derive2 { name="KScorrect"; version="1.2.4"; sha256="16qdmvgx3y170i495vmph2bhnc3j1z5232jibr3yzxl9i887kk0f"; depends=[MASS mclust]; }; + KScorrect = derive2 { name="KScorrect"; version="1.4.0"; sha256="1khvwc610yp3fd4fn0wcgqpzxg9g7sicjjmwvfcahs8qxn3m5vfa"; depends=[doParallel foreach iterators MASS mclust]; }; KSgeneral = derive2 { name="KSgeneral"; version="0.1.1"; sha256="1ldk3fvwbr6hw7x3ydgzixgc41a0fbbic699zjlnpj5x4mjg1qby"; depends=[dgof MASS Rcpp]; }; KappaGUI = derive2 { name="KappaGUI"; version="2.0.2"; sha256="0vklny804xpd9r60j4a01j2gak8jizwjw0abf7yvbcalv3zbpb3k"; depends=[irr shiny]; }; KappaV = derive2 { name="KappaV"; version="0.3"; sha256="13mmfb8ijpgvzfj20andqb662950lp9g25k5b26r5ba65p7nhva7"; depends=[maptools PresenceAbsence rgeos sp]; }; @@ -1993,7 +2016,7 @@ in with self; { Kendall = derive2 { name="Kendall"; version="2.2"; sha256="0z2yr3x2nvdm81w2imb61hxwcbmg14kfb2bxgh3wmkmv3wfjwkwn"; depends=[boot]; }; KernSmooth = derive2 { name="KernSmooth"; version="2.23-15"; sha256="1xhha8kw10jv8pv8b61hb5in9qiw3r2a9kdji3qlm991s4zd4wlb"; depends=[]; }; KernelKnn = derive2 { name="KernelKnn"; version="1.0.9"; sha256="1y9s3y9r51rq8nz33glf767wjjclmj988rxw9r7rc9bw01dxkd7f"; depends=[Rcpp RcppArmadillo]; }; - Kernelheaping = derive2 { name="Kernelheaping"; version="2.2.0"; sha256="06vb8zpdf5brjsfiyd1s3gmhlfprpkw7fmjr594p4lw354lvhb4m"; depends=[fastmatch ks magrittr MASS mvtnorm plyr sp sparr]; }; + Kernelheaping = derive2 { name="Kernelheaping"; version="2.2.1"; sha256="1mc3jzgmg8gyxs6kk474yz911abqzigxwjwjrmhipc40rrdmmr2z"; depends=[fastmatch ks magrittr MASS mvtnorm plyr sp sparr]; }; KnapsackSampling = derive2 { name="KnapsackSampling"; version="0.1.0"; sha256="17yzmd11k1n5iy54vbcvpzvkm8ypbl6n1kfi931wwrrcq9y7hg22"; depends=[lpSolve]; }; Knoema = derive2 { name="Knoema"; version="0.1.16"; sha256="0v6w8rrw8nd4l1by5w9xd4hbxp55cma89kljha47ykvmnflsrjsc"; depends=[base64enc digest httr jsonlite lubridate xts zoo]; }; KnowBR = derive2 { name="KnowBR"; version="2.0"; sha256="0i934gff8ldg0lm5cfcf3ip7abnparaaviq8avs7cbnacs6nw8i1"; depends=[fossil mgcv plotrix sp vegan]; }; @@ -2005,7 +2028,7 @@ in with self; { KrigInv = derive2 { name="KrigInv"; version="1.4.1"; sha256="0x12xff7lgr1v2243shfz9a8r02qs56p7i0b8j2s6bmrzj1abrwb"; depends=[anMC DiceKriging mvtnorm pbivnorm randtoolbox rgenoud]; }; L0Learn = derive2 { name="L0Learn"; version="1.1.0"; sha256="1lz919d096s98c5lddyqnf8k8q5008a9p38i4nw2227ygi0gz8gk"; depends=[ggplot2 Matrix Rcpp RcppArmadillo reshape2]; }; L1pack = derive2 { name="L1pack"; version="0.38.19"; sha256="09n1045lsx1ap47mhzcqghmwwhj24kvpjjr3ysprj058jp5g7ri0"; depends=[]; }; - LAGOSNE = derive2 { name="LAGOSNE"; version="1.2.0"; sha256="01d6460nph55id8392sraksnrwpnkpgfwzwvafpjzm5hjcb6b7rz"; depends=[curl dplyr lazyeval magrittr memoise progress purrr rappdirs rlang sf stringr tibble tidyr]; }; + LAGOSNE = derive2 { name="LAGOSNE"; version="2.0.1"; sha256="1lay0zb24k5ms4nfr62pgpriy7nfafnkdjjrd7xxznsi7dqrav0y"; depends=[curl dplyr lazyeval magrittr memoise progress purrr rappdirs rlang sf stringr tibble tidyr]; }; LAM = derive2 { name="LAM"; version="0.4-17"; sha256="1isvhmrrpaamahwkxxsgyq6gbzcvfsk2s4ccjavnab4p79j0x782"; depends=[CDM Rcpp RcppArmadillo sirt]; }; LANDD = derive2 { name="LANDD"; version="1.1.0"; sha256="13szkww9nw8zywfrqd8mwgj9csgragm0bx8ia52rcpakpc3hv3hx"; depends=[BH doParallel fdrtool foreach GGally ggplot2 GOSemSim GOstats igraph intergraph Matrix modeest mvtnorm pROC Rcpp]; }; LARF = derive2 { name="LARF"; version="1.4"; sha256="1sqib7smgjacn07ishwls1nlbvcb6fpp1vhrjwf9g4xf9jk30i8h"; depends=[Formula]; }; @@ -2017,17 +2040,19 @@ in with self; { LCFdata = derive2 { name="LCFdata"; version="2.0"; sha256="1x3vbr6hdviqvd6dxn1kb449g0q5zkfmjsmr5nxd2g82p69lv3xm"; depends=[]; }; LCMCR = derive2 { name="LCMCR"; version="0.4.3"; sha256="1pzavzlr3fml4chrh0fmj8688a3xa153w5gp404nx3qld5sizqrm"; depends=[]; }; LCox = derive2 { name="LCox"; version="0.1.0"; sha256="1cqkqmi6bkd41xxwqqzpdiwdv8m5nrqz3f6cajnnbmgfcjawmrzq"; depends=[fdapace survival]; }; + LDATS = derive2 { name="LDATS"; version="0.2.4"; sha256="1glzg2v8fmbmx9rv4smsy3fcswg8kdhh3g21m1lzld50nlvg2w1f"; depends=[coda digest dplyr extraDistr here lubridate magrittr memoise mvtnorm nnet progress reshape topicmodels viridis]; }; 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]; }; LDRTools = derive2 { name="LDRTools"; version="0.2-1"; sha256="05srfyplsypi3whfa71lx7pnad23irpf0p7rxmrpv28jgdmrz6wf"; depends=[]; }; LDcorSV = derive2 { name="LDcorSV"; version="1.3.2"; sha256="0lvk3xz400yd3w0cjdfi6hir1ym1mffd504vycwgck5fkzljpcvx"; depends=[]; }; - LDheatmap = derive2 { name="LDheatmap"; version="0.99-5"; sha256="0il3g3n3bzv74lz7dlhyiwc2x2417v6yhx2g47pahxdzqa09kf4s"; depends=[genetics snpStats]; }; + LDheatmap = derive2 { name="LDheatmap"; version="0.99-7"; sha256="1r0j8bihi5z1x0sgaf7dwzpsw9i0nc1vylvipvc0cia2ka1lr9dc"; depends=[genetics Rcpp snpStats]; }; + LDlinkR = derive2 { name="LDlinkR"; version="1.0.0"; sha256="1ihwx67k83jn9fdhdkh991qypd84jrqygpiz8g9gnzhi2lzg8y5m"; depends=[httr]; }; LDtests = derive2 { name="LDtests"; version="1.0"; sha256="1jwqr7zlp9hv7vw8xp80xvrwbdv796wjgr914v393wfa07j5wbd1"; depends=[]; }; LEANR = derive2 { name="LEANR"; version="1.4.9"; sha256="053xy13ys5hibafdnbkwqdk36hw7dhanp4frfacpfpn5f9nfh95r"; depends=[foreach igraph]; }; LEAP = derive2 { name="LEAP"; version="0.2"; sha256="1yrhanxvr7krvllqzv17qkc4wvmd7mgl57am8sn53773dbfipfc4"; depends=[]; }; LEAPFrOG = derive2 { name="LEAPFrOG"; version="1.0.7"; sha256="0z9ahkk4qzc45h1r806frv9cd84vvshvn5mr84gx7qdxljfkfq6h"; depends=[alabama MASS]; }; - LEGIT = derive2 { name="LEGIT"; version="1.2.3"; sha256="0plix2s2xmc1zhcman39hw6c22a80wdn35c5x3bj3lj1ix8bzsii"; depends=[boot doSNOW foreach formula_tools Hmisc iterators pROC snow]; }; + LEGIT = derive2 { name="LEGIT"; version="1.3"; sha256="053ibvayfb9h54a3fcwbfciyx7nzy7sjr551bwv0wfchna8hcnmd"; depends=[boot doSNOW foreach formula_tools glmnet Hmisc iterators pROC RColorBrewer snow]; }; LFDR_MLE = derive2 { name="LFDR.MLE"; version="1.0"; sha256="11vy6gg2x98s1y8a5ns9vcd61gw8ax1lhn4lvicdjbd1lg18nm83"; depends=[]; }; LFDREmpiricalBayes = derive2 { name="LFDREmpiricalBayes"; version="1.0"; sha256="1imw3djmbpdyplv9dmdzzirp9imk88j0kcxcyfh8yr9ywgd77x6b"; depends=[matrixStats R6]; }; LGEWIS = derive2 { name="LGEWIS"; version="1.1"; sha256="1i52vp0ghjzmyh4r8h6jpyij7x4skw99xvw017b56m8fg64zy70r"; depends=[CompQuadForm geeM mvtnorm SKAT]; }; @@ -2040,7 +2065,7 @@ in with self; { LLM = derive2 { name="LLM"; version="1.0.0"; sha256="0x4488mg8q4nhyjhqlzkwmh51frkkjn0gir22rk8rfzg4r6d18d6"; depends=[partykit RWeka stringr]; }; LLSR = derive2 { name="LLSR"; version="0.0.2.19"; sha256="19flvf15sn3fd21fymcg7ag1psl265m0i7siw1fqb6j6fvsn0y8v"; depends=[crayon digest dplyr ggplot2 minpack_lm nleqslv rootSolve svDialogs svglite XLConnect]; }; LMERConvenienceFunctions = derive2 { name="LMERConvenienceFunctions"; version="2.10"; sha256="08jz0i7sv7gn3bqckphbmnx0kc6yjnfvi06iyf7pcdzjaybxhj06"; depends=[fields LCFdata lme4 Matrix mgcv rgl]; }; - LMest = derive2 { name="LMest"; version="2.4.5"; sha256="1m9plqfdm2mwjvkn5zxpkrdwiy5dqlspvq6h7i3mck1rrm1j255l"; depends=[MASS mix mmm MultiLCIRT mvtnorm]; }; + LMest = derive2 { name="LMest"; version="2.5.1"; sha256="09xvl1sx891q9mhyl7sx0zwxzlsl3p22pxlh8y8pbvr2wnb7frr7"; depends=[Formula MASS mix mmm MultiLCIRT mvtnorm]; }; LMfilteR = derive2 { name="LMfilteR"; version="0.1.2"; sha256="10agjrljnqw689nn9af9ihhb9sq2gmsx7l3zfmrizkavjjk67mcd"; depends=[MASS]; }; LN0SCIs = derive2 { name="LN0SCIs"; version="0.1.5"; sha256="09zr6lrvv7lw9qp3vz4n2dv0v3q7wq06wwvwpb2pm0r335bnrf89"; depends=[]; }; LNIRT = derive2 { name="LNIRT"; version="0.4.0"; sha256="0g2yqpsxz2fsvgvgn60yv2k8mv63anf6g2zzd9njarc524n874r8"; depends=[MASS]; }; @@ -2098,12 +2123,12 @@ in with self; { LeArEst = derive2 { name="LeArEst"; version="1.0.0"; sha256="0kga9n0ia2zljyw4xa9n572zmxpwql8xd3ys4p9jp02h432pfkpp"; depends=[conicfit doParallel foreach jpeg opencpu]; }; LeLogicielR = derive2 { name="LeLogicielR"; version="1.2.1"; sha256="0jd280ial4wfj5j6sbxgl2cbxabycsgmh2zsad7v7hcwbhhdd09i"; depends=[gdata IndependenceTests RColorBrewer xtable]; }; LeMaRns = derive2 { name="LeMaRns"; version="0.1.0"; sha256="1spbzgkda3qhls6m9bj24vdhc6xg7x55ip4a6lq1ql8zcy2wggfs"; depends=[abind Rcpp RcppArmadillo]; }; - LeafArea = derive2 { name="LeafArea"; version="0.1.7"; sha256="0pn6hh9ipr609pi49ls8wxnx7v8q1wyp84i22zzwxyzwaap5nmj2"; depends=[]; }; + LeafArea = derive2 { name="LeafArea"; version="0.1.8"; sha256="0a464bcanq6jfm5j6692h61pipy28vm7m89y5i0hrhz7lzpy9x5z"; depends=[]; }; LearnBayes = derive2 { name="LearnBayes"; version="2.15.1"; sha256="0ch54v2zz2yyyk0lvn5rfikdmyz1qh9j1wk3585wl8v58mc0h4cv"; depends=[]; }; LearnGeom = derive2 { name="LearnGeom"; version="1.4"; sha256="0qalhy4g47ik8cq2m1zajhv79rla8g72dmcwhnizwn6afhm6fnpm"; depends=[]; }; LearningRlab = derive2 { name="LearningRlab"; version="1.3"; sha256="14q8pm51yrfpny2wg5l0x02zibh7qn11zkg51igadq3r6256rfd1"; depends=[crayon magick]; }; LendingClub = derive2 { name="LendingClub"; version="2.0.0"; sha256="13qh5p4ksvgd1pmc4mdp8p44ra34fvp3s5p5vhlkpclkv5d4mxq2"; depends=[dplyr httr jsonlite plyr readr]; }; - LexisNexisTools = derive2 { name="LexisNexisTools"; version="0.2.2"; sha256="10424n1sfaj21x8mlsc35m2p2zgdn7pg75qsx495l4qqjci6g2pl"; depends=[data_table pbapply quanteda reshape2 scales stringdist stringi tibble]; }; + LexisNexisTools = derive2 { name="LexisNexisTools"; version="0.2.3"; sha256="02dm2lh402gazgqs7f5gdjalrpvdxri3bryidpga2s36i9bn6y9a"; depends=[data_table pbapply quanteda stringdist stringi tibble]; }; LexisPlotR = derive2 { name="LexisPlotR"; version="0.3"; sha256="1qdgs6p11j0ign27bbnn32g65sw42982ijrig5cwqsdvxpdabjl8"; depends=[ggplot2]; }; LiblineaR = derive2 { name="LiblineaR"; version="2.10-8"; sha256="17ykazac7iv02bxl8xg948vhbdr32icdm1v4bk31zmslp4xsk08g"; depends=[]; }; LiblineaR_ACF = derive2 { name="LiblineaR.ACF"; version="1.94-2"; sha256="1ldkb63yhm1ki8i585wp5byx6y0kvclwy3ncacgcdqqk0p41cyi6"; depends=[]; }; @@ -2111,7 +2136,7 @@ in with self; { 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]; }; - LilRhino = derive2 { name="LilRhino"; version="0.1.0"; sha256="0bnlhgkqfv3v3567ylf22k51wjndqy4bb5pjphvlhiia51xp3lfd"; depends=[beepr dplyr e1071 FNN ggplot2 keras reshape2]; }; + LilRhino = derive2 { name="LilRhino"; version="1.1.0"; sha256="0pfahvn1wl310w897qhv3ynlfx5mgp237al47piqkdqmxmgma7dz"; depends=[beepr data_table dplyr e1071 fastmatch FNN forcats ggplot2 keras readr SnowballC textclean tidyr tm]; }; LinCal = derive2 { name="LinCal"; version="1.0"; sha256="1xr9jnna20hh78dh9wjg70jm8fhaxvdwql894kdp0y5h4pchkdph"; depends=[]; }; LinRegInteractive = derive2 { name="LinRegInteractive"; version="0.3-1"; sha256="0w7s3i6i2wnydh88l8lnzrh6w5zqkcwvms91iizis0mwd9af2jdl"; depends=[rpanel xtable]; }; LindenmayeR = derive2 { name="LindenmayeR"; version="0.1.13"; sha256="01wnvmxdb91ai21h3plgsmy6ds7564s5wq2xyr905ma4a2d8afn5"; depends=[stringr]; }; @@ -2130,7 +2155,7 @@ in with self; { LocalControlStrategy = derive2 { name="LocalControlStrategy"; version="1.3.2"; sha256="0cs2dz1p6kpc9ghihnkzjknxwd904c376ryyabkf6lkqzc2p91sq"; depends=[cluster lattice]; }; Lock5Data = derive2 { name="Lock5Data"; version="2.8"; sha256="17awskq78h23z2dy96d7hziljhnkx5phpd48q7cppxidyvzfywim"; depends=[]; }; Lock5withR = derive2 { name="Lock5withR"; version="1.2.2"; sha256="10x3i11pb4cig4pgfmw9984na5zjbg7d41y6crakiimf53ihx0c2"; depends=[]; }; - LogConcDEAD = derive2 { name="LogConcDEAD"; version="1.6-1"; sha256="1hy7fnahncpsgqxfy352lxk298i69w7drlspsgdvpzdbghca3y3i"; depends=[MASS mclust mvtnorm rgl tkrplot]; }; + LogConcDEAD = derive2 { name="LogConcDEAD"; version="1.6-3"; sha256="0gplkprvldw2dq43kvij215lv9x9xdnp47smn8m1r93nk4pxy5mr"; depends=[MASS mclust mvtnorm tkrplot]; }; LogicReg = derive2 { name="LogicReg"; version="1.5.12"; sha256="074kyqkgnn04z5r3kq25cjbrr9rvkymmsjmy5fwjdkwvaww6dsys"; depends=[survival]; }; LogisticDx = derive2 { name="LogisticDx"; version="0.2"; sha256="0ciygvynnyajpn1glxy6mwj9vbl7iv8a8dfsi6wxjxp2rac68rig"; depends=[aod data_table pROC RColorBrewer rms speedglm statmod]; }; LogitNet = derive2 { name="LogitNet"; version="0.1-1"; sha256="08xi5rpbqkc1b3qj24blv3l0r68wcqbsbjcqxiypm75f3c2irc4i"; depends=[]; }; @@ -2141,7 +2166,7 @@ in with self; { LowRankQP = derive2 { name="LowRankQP"; version="1.0.3"; sha256="1a46rk0fhpnrlfzmydy7zjswrm6hf056qxgf5p10naq6025whf8x"; depends=[]; }; LowWAFOMNX = derive2 { name="LowWAFOMNX"; version="1.1.1"; sha256="0f75qsv6pisgvk39yagzfxscnyfsgh63rmhp4gpybpl0pqmjp48x"; depends=[Rcpp RSQLite]; }; LowWAFOMSobol = derive2 { name="LowWAFOMSobol"; version="1.1.1"; sha256="1ym3i2m1am356di9lcp5nfmxq0np3c4bwsv6bbmf7hg02j7dhwi4"; depends=[Rcpp RSQLite]; }; - Luminescence = derive2 { name="Luminescence"; version="0.9.0.110"; sha256="02abgnvvvb2cd3wwammks8blr7fcl4a8z31q6y7szsjkzgdn8y4d"; depends=[bbmle data_table DEoptim httr magrittr matrixStats minpack_lm plotrix raster Rcpp RcppArmadillo readxl shape XML zoo]; }; + Luminescence = derive2 { name="Luminescence"; version="0.9.3"; sha256="06rhqzli17j4lv87aiqwf43m14gy5c45jh9wzkn4kzqwwh1mzb5a"; depends=[bbmle data_table DEoptim httr magrittr matrixStats minpack_lm plotrix raster Rcpp RcppArmadillo readxl shape XML zoo]; }; M2SMF = derive2 { name="M2SMF"; version="1.0"; sha256="0hf5ckpridi70yv15h0771q1grhqr9c592r87hgba7yh55dqqcq1"; depends=[dplyr MASS]; }; M3 = derive2 { name="M3"; version="0.3"; sha256="1l40alk166lshckqp72k5zmsgm7s5mgyzxlp11l64mgncjwkw2r3"; depends=[mapdata maps ncdf4 rgdal]; }; MADPop = derive2 { name="MADPop"; version="1.1.2"; sha256="0hwnkjrc3w9x3gha0y70fidfc587b6gfdhzwzdzrfvxrhsdy05yd"; depends=[BH Rcpp RcppEigen rstan StanHeaders]; }; @@ -2172,11 +2197,12 @@ in with self; { MAd = derive2 { name="MAd"; version="0.8-2.1"; sha256="096vdhfsp7bd3zvv6ydai6p230r16jx8zlqc4hlhnzma8rqypm35"; depends=[]; }; MBA = derive2 { name="MBA"; version="0.0-9"; sha256="06kmrdkhwwvr3kd5w8ws6r528hhpvbhixyj98lv36kkwlx14x06g"; depends=[BH]; }; MBC = derive2 { name="MBC"; version="0.10-4"; sha256="1fp06xx9jpz5mcxs0yppzzhch9w9c1qbsdbb60r4izrxnrhggpf7"; depends=[energy Matrix]; }; - MBCbook = derive2 { name="MBCbook"; version="0.1"; sha256="0rfjabcv7594kn6cmg5bjxx1zx5v8zwsayxsajc34kb7jvj9fbrs"; depends=[MASS mclust mvtnorm Rmixmod]; }; + MBCbook = derive2 { name="MBCbook"; version="0.1.1"; sha256="0jmvgyzrahnxfkwdn86k3ffk0zfbbd34ya4zmlnsmp2m9xds7lgn"; depends=[MASS mclust mvtnorm Rmixmod]; }; MBCluster_Seq = derive2 { name="MBCluster.Seq"; version="1.0"; sha256="0xbi2r0g0gzsy05qrq1ljr5f5s3glwxj204vk2f1lgwdx3fd116m"; depends=[]; }; MBESS = derive2 { name="MBESS"; version="4.6.0"; sha256="1fc2zcjfk9k107bl3fs3wf8fxxrcpwyhiz7j1iv3w6zqf2l4fb88"; depends=[boot gsl lavaan MASS mnormt nlme OpenMx sem semTools]; }; MBHdesign = derive2 { name="MBHdesign"; version="1.0.79"; sha256="1qz0igm8h3ij8yc9bg3vr3mkmf99h1kyxscdhkfphc66zaazhyw1"; depends=[class geometry mgcv mvtnorm randtoolbox]; }; MBI = derive2 { name="MBI"; version="1.0"; sha256="1lb0sjwa6x360n9a9pagz6yhxh37gxq1fk0f5c3i2sd56ny9jpns"; depends=[]; }; + MBNMAdose = derive2 { name="MBNMAdose"; version="0.2.3"; sha256="1iw0wfyvdmks4diwwj75hqvdkmwnjb3zfw30rgnmr3nmxc3fa0b6"; depends=[checkmate dplyr magrittr R2jags Rdpack reshape2 rjags scales]; }; MBSGS = derive2 { name="MBSGS"; version="1.1.0"; sha256="1h5vhmpgrqza12j7ivhwgd5wyb7kkb8mjbxl5w756vyid8g03flz"; depends=[MASS MCMCpack mgcv mnormt truncnorm]; }; MBSP = derive2 { name="MBSP"; version="1.0"; sha256="0mds6jfqgmnm4saqqqqqfcg8zh4qsvd2503g3ij1sn70f0aakwaj"; depends=[coda GIGrvg MASS Matrix MCMCpack]; }; MBmca = derive2 { name="MBmca"; version="0.0.3-5"; sha256="0p7ddpsy4hwkfwyyszidi33qpdg4xllny7g9x24gk782p7kjfgq9"; depends=[chipPCR robustbase]; }; @@ -2185,7 +2211,7 @@ in with self; { MCDA = derive2 { name="MCDA"; version="0.0.20"; sha256="1pzp68dirby5ddwz37kjh9dnmwsbdfi37gfr8pgmngqzgbr9x6dd"; depends=[combinat glpkAPI RColorBrewer Rglpk]; }; MCDM = derive2 { name="MCDM"; version="1.2"; sha256="0r27y9mqvfnv1m0yi2xdyjr4y1s43d5yav960kz2xa732hrrxw01"; depends=[RankAggreg]; }; MCI = derive2 { name="MCI"; version="1.3.3"; sha256="1wn8lcr5sq3697nsmly6syb9jv7p99ks0fy933ff5rx54x3rf9hz"; depends=[]; }; - MCI2 = derive2 { name="MCI2"; version="1.1.1"; sha256="1d8grg2a3c0nyl9wqxfsi0nq5qb5qbaspr5p2v791mhnbnfzkyhf"; depends=[MCI osrm REAT reshape tmaptools]; }; + MCI2 = derive2 { name="MCI2"; version="1.1.2"; sha256="1vxzfab8yn18icarsdvz8ky7frspxax22sb8c0ki91y1mj9m9mgj"; depends=[MCI osrm REAT reshape tmaptools]; }; MCL = derive2 { name="MCL"; version="1.0"; sha256="1w36h4vhd525h57pz6ik3abbsrvxnkcqypl2aj1ijb6wm7nfp4ri"; depends=[expm]; }; 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.3"; sha256="0b9n793spljmsb58jp41vnl9c753xqaw1g4wbi4ax348cvi09jk8"; depends=[coda ggplot2 MCMCglmm]; }; @@ -2215,7 +2241,6 @@ in with self; { MEMSS = derive2 { name="MEMSS"; version="0.9-3"; sha256="0fq85jrajfwavq2fvsw2x9hknc57wc253zw2vw970f04khfbragd"; depends=[lme4]; }; MEPDF = derive2 { name="MEPDF"; version="3.0"; sha256="15hbp7g5dsdpvi239jm6jn11fn371ir6la31g0flqkilq6sr1sqd"; depends=[gtools mvtnorm plyr pracma]; }; MESS = derive2 { name="MESS"; version="0.5.5"; sha256="13kln67ca9d5dnimg0mqbnl6bni52r04xjhrw1vyzlhvn0x684kg"; depends=[geeM geepack glmnet kinship2 MASS Matrix mvtnorm Rcpp RcppArmadillo]; }; - MEclustnet = derive2 { name="MEclustnet"; version="1.2.1"; sha256="1pznisvvgshqbixyj8jya35yhmmpxxa1ivh48c9iafgapwc4yn4s"; depends=[e1071 ellipse latentnet MASS mclust mvtnorm nnet vegan]; }; MEtest = derive2 { name="MEtest"; version="1.0"; sha256="0hiv676lwwis1mmnw51vq4iwhbrwx0dvd6bmbv7hmxd48bykrcvg"; depends=[statmod]; }; MF = derive2 { name="MF"; version="4.3.2"; sha256="1arnhyqf1cjvngygcpqk2g4d52949rhkjmclbaskyxcrvp62qln0"; depends=[]; }; MFAg = derive2 { name="MFAg"; version="1.4"; sha256="092zbl2pxbsvfyf3qssbid14194p0ax2zrw0gzpyqwzdpx0brrlb"; depends=[]; }; @@ -2224,6 +2249,7 @@ in with self; { MFKnockoffs = derive2 { name="MFKnockoffs"; version="0.9.1"; sha256="1bcdqfzmllp3dri1phy365wgc9c37wlag65pzljn4p3mf43w10nq"; depends=[corpcor glmnet gtools Matrix Rdsdp RSpectra]; }; MFPCA = derive2 { name="MFPCA"; version="1.3-2"; sha256="1p467zc8lvdcl8n0mf6aazm39flbn62ykwc6c6brkxy46cdvc5jv"; depends=[abind foreach funData irlba Matrix mgcv plyr]; }; MFT = derive2 { name="MFT"; version="2.0"; sha256="0n1xws3dw0650037qyqgp600p8cf098qa5hkbncdfdbl0w34qamy"; depends=[]; }; + MGDrivE = derive2 { name="MGDrivE"; version="1.0.0"; sha256="1wjrc8mb0bh2b66g7qsqhz1w8pp53z4amaq7nv68y2j8i2lm39l9"; depends=[data_table R6 Rcpp Rdpack]; }; MGL = derive2 { name="MGL"; version="1.1"; sha256="03q453swnangxyc4nvjhzw2zpcy5vp1wpilap5rwymnf0c0xi4j7"; depends=[]; }; MGLM = derive2 { name="MGLM"; version="0.2.0"; sha256="0yyqm53lvp59zy8lkffw9x3zhqrnh29j5v3yyzk6qrgj2slnc7nk"; depends=[]; }; MGRASTer = derive2 { name="MGRASTer"; version="0.9"; sha256="0jmf2900r56v60981sabflkhid3yrqd9xd7crb56vgfl1qkva9zp"; depends=[]; }; @@ -2244,7 +2270,7 @@ in with self; { 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="1.4"; sha256="187m07h6i11v2zr6jn1qj69nwrbldrw8w8cnh2anihqc4a6yx513"; depends=[ggplot2 limma RColorBrewer robustbase scales]; }; + MKmisc = derive2 { name="MKmisc"; version="1.5"; sha256="1b8fxhgszyj75ii9mlh84gh8bc5ljf5f8ap1i7jaall9q5m0hfhd"; depends=[ggplot2 limma RColorBrewer robustbase scales]; }; ML_MSBD = derive2 { name="ML.MSBD"; version="1.1.1"; sha256="1j110kz2k5hyk3la771yx41k6c2pam2k5hzzx42fm5n127aq3q56"; depends=[ape]; }; MLCIRTwithin = derive2 { name="MLCIRTwithin"; version="2.1"; sha256="07fhbhfnlmllxxdpdqiaz6d72y4pj3vrz6lw5rnlb2m7vknx51ik"; depends=[limSolve MASS MultiLCIRT]; }; MLCM = derive2 { name="MLCM"; version="0.4.2"; sha256="14sd9ybwyilympnbyaqmwdrbip4vyn1p93rh9mlxls3bmk6nc4hv"; depends=[]; }; @@ -2296,7 +2322,7 @@ in with self; { MPSEM = derive2 { name="MPSEM"; version="0.3-6"; sha256="0kw3aixhl5j8nq4lcx65l80v4lihvpa4qd12n2jrc96lnm6mw00b"; depends=[ape MASS]; }; MPTinR = derive2 { name="MPTinR"; version="1.11.0"; sha256="1pflypcysc43yp4rh1lxnf7f0qklc6rl4y1mvj6ydwv5nlz52mbh"; depends=[Brobdingnag numDeriv Rcpp RcppEigen]; }; MPTmultiverse = derive2 { name="MPTmultiverse"; version="0.2-0"; sha256="0bhxzg5q3slq5x281xnyqwlgazkddlcaw4z6k7nc419v5ym75cqz"; depends=[coda dplyr ggplot2 limSolve magrittr MPTinR purrr readr reshape2 rlang runjags tibble tidyr TreeBUGS]; }; - MPV = derive2 { name="MPV"; version="1.53"; sha256="14qnvcqqscd9hwn2mxf5dclv3ncj7w6vc3blxaml3rflriha6rls"; depends=[]; }; + MPV = derive2 { name="MPV"; version="1.55"; sha256="127m19q5dq38x2k29rkgvvfidazbmzsarzf9m2sjpx6ay8j8hvpl"; depends=[KernSmooth]; }; MPkn = derive2 { name="MPkn"; version="0.1.0"; sha256="0nvd6sv1wypcmphm0wcymbibcxrqzx3c9s9b191p1pmxyz607vxv"; depends=[]; }; MPsychoR = derive2 { name="MPsychoR"; version="0.10-7"; sha256="10nphm5dzxha4xb7a21b0nxbqy55fg8k748qax7nq3rj4nfjaml7"; depends=[]; }; MRCE = derive2 { name="MRCE"; version="2.1"; sha256="12q7mqn2qkgv992df71k1xmli61khhbfm7lw0n7z2l7qqldpiw1n"; depends=[QUIC]; }; @@ -2313,7 +2339,7 @@ in with self; { MRsurv = derive2 { name="MRsurv"; version="0.2"; sha256="148myzk6r8whkpv1yv59dmdlr2n8vdwmaww165aw696xfjxwq550"; depends=[mvtnorm survival]; }; MRwarping = derive2 { name="MRwarping"; version="1.0"; sha256="13bcs7rlm4irx7yzdnib558w9014a4chh9xwc010m6pxvxv36qnv"; depends=[boa SemiPar]; }; MSCMT = derive2 { name="MSCMT"; version="1.3.3"; sha256="1962lc6p5cy8pkbshzbl3jnd2pqnk9afs4lmp4qb7fqkmb4xpka3"; depends=[ggplot2 lpSolve lpSolveAPI Rdpack Rglpk]; }; - MSEtool = derive2 { name="MSEtool"; version="1.2.0"; sha256="0r3cnn5cnivd776cvljk4wqrj8778k5ff3rkadywxv4qimrs74xm"; depends=[abind coda corpcor DLMtool gplots MASS mvtnorm pryr RcppEigen reshape2 rmarkdown snowfall TMB]; }; + MSEtool = derive2 { name="MSEtool"; version="1.2.1"; sha256="1y1hncpa6qbd2dbcrkm9kacxmnw38g75bknxgq0dqygg07hcaabw"; depends=[abind coda corpcor DLMtool gplots MASS mvtnorm pryr RcppEigen reshape2 rmarkdown snowfall TMB]; }; MSG = derive2 { name="MSG"; version="0.3"; sha256="181kzkbw69bs3vir6dzgq7jzp8xcpg1p4isfb660vgnd1flb03ix"; depends=[RColorBrewer]; }; MSGARCH = derive2 { name="MSGARCH"; version="2.3"; sha256="0dax3cx0dzmg086vhymnm5x5s7ljdnxx1k52xnnvrm6pprhdgaqn"; depends=[coda expm fanplot MASS numDeriv Rcpp RcppArmadillo zoo]; }; MSGLasso = derive2 { name="MSGLasso"; version="2.1"; sha256="1k17vnvzr647pwfbdxrpqcsp34iygq86wf0ns4rq8cj6q5mik1bv"; depends=[]; }; @@ -2322,7 +2348,7 @@ in with self; { MSPRT = derive2 { name="MSPRT"; version="2.0"; sha256="16j66r8b4lh9x6wfblq2xxydvbzfajiixmq7144vv1rfmbs8if8m"; depends=[doParallel foreach ggplot2 iterators nleqslv]; }; MSQC = derive2 { name="MSQC"; version="1.0.2"; sha256="11wcy04cpjlnc71s2svs4lm1cp718dz1p4a1603x6zwpbf22bygn"; depends=[rgl]; }; MST = derive2 { name="MST"; version="2.1"; sha256="16mnsn2an02k4jrqb6yj0n1i563zny5v10ngfq1y28fqaw6h8yyq"; depends=[Formula MASS partykit survival]; }; - MSbox = derive2 { name="MSbox"; version="1.2.0"; sha256="04s6xvv4f6p9fsj5kkvy3169imh9h6p4j14acwffxqyfmhay48y1"; depends=[stringr xml2]; }; + MSbox = derive2 { name="MSbox"; version="1.2.1"; sha256="0lmvpzsw13w18mzi5z85yzify3xsh5sx356ndggfzyl5d5wk7s8g"; depends=[stringr xml2]; }; MScombine = derive2 { name="MScombine"; version="1.4"; sha256="0s3gbf3s5mf00d5mkbqhd9wwnyps7qb4r3zbal8j8nsaspql9nd3"; depends=[plyr]; }; MSwM = derive2 { name="MSwM"; version="1.4"; sha256="1zhfar02s7hm4gjs1flkh9a4526d98hik8bqrksy75758baiqg7l"; depends=[nlme]; }; MTA = derive2 { name="MTA"; version="0.1.2"; sha256="1149xjq6ybjv6llzlq67j5xc6dspb4mvd72n62nlbq3zz80x7f84"; depends=[igraph rgeos sp]; }; @@ -2340,15 +2366,16 @@ in with self; { MVNBayesian = derive2 { name="MVNBayesian"; version="0.0.8-11"; sha256="1iaxyp480v91887cn4w3l74907wvbzs3ay4cjgzd8xk2dp47w8bg"; depends=[mvtnorm plyr]; }; MVR = derive2 { name="MVR"; version="1.33.0"; sha256="1ygz47a2p5r5axql5zsxvsn25pcqyxz6mpw50zfmzrcqdrfa3bg8"; depends=[statmod]; }; MVT = derive2 { name="MVT"; version="0.3"; sha256="0vinlv3d5daf8q7pd9xgs51nxz2njgdba5750vygmv883srlzi9d"; depends=[]; }; - MVar = derive2 { name="MVar"; version="2.0.6"; sha256="0lygisyglckkz7a1spya92q9h74snri66r1cxymxv75li3i9pmdv"; depends=[MASS]; }; - MVar_pt = derive2 { name="MVar.pt"; version="2.0.6"; sha256="0z5zqncch4h0kijw5qvn73nyp8jwr7mwxma7jn5mbr98l067lr0w"; depends=[MASS]; }; + MVTests = derive2 { name="MVTests"; version="1.1"; sha256="13q9bfzbcf2gz5mhp5rjja5d0k0m78f0253ziwrlg5ncyf2d8q0c"; depends=[matrixcalc]; }; + MVar = derive2 { name="MVar"; version="2.0.7"; sha256="025k78ahia9mv983kr8p4gbn675b59zxl7ywv13kbvn4jcpakiy8"; depends=[MASS]; }; + MVar_pt = derive2 { name="MVar.pt"; version="2.0.7"; sha256="1aif7la0mfsyh2wksvhwvakkrgj9irzg3c84psbad58v9yabjrla"; depends=[MASS]; }; MVisAGe = derive2 { name="MVisAGe"; version="0.2.1"; sha256="1plrzzj7cr2hxk1npadvjnk7sanhilh99l5vrkjjh3l6li2ym09b"; depends=[]; }; MWLasso = derive2 { name="MWLasso"; version="1.3.1"; sha256="11lyk46lmjcd60q0mixi41b8ybjgyp1xi18g3ag4450xyhw3r17s"; depends=[]; }; MWRidge = derive2 { name="MWRidge"; version="1.0.0"; sha256="17kvs9npr1ff24z3pv9x2qnfwyy6w3hc7hm60ynzbjlk2rr11xr9"; depends=[glmnet]; }; MXM = derive2 { name="MXM"; version="1.4.4"; sha256="1dmq8ws1dqd294lrhd60dh1avkj58n9dha5ag4igwgjw31mphsr9"; depends=[bigmemory coxme doParallel dplyr energy foreach geepack knitr lme4 MASS nnet ordinal quantreg relations Rfast Rfast2 survival visNetwork]; }; MaXact = derive2 { name="MaXact"; version="0.2.1"; sha256="1n7af7kg54jbr09qk2a8gb9cjh25cnxzj2snscpn8sr8cmcrij0i"; depends=[mnormt]; }; MachineLearning = derive2 { name="MachineLearning"; version="0.1.3"; sha256="0yvrsqzvx8ss614ixa9mwkg2ig3hmfixm78fi8c3wmpc2frvsqrk"; depends=[arules crayon dplyr formula_tools FSelectorRcpp ggplot2 magrittr NbClust rpart rpart_plot]; }; - MachineShop = derive2 { name="MachineShop"; version="1.4.0"; sha256="14kzkc2rsj63ni5404p10b87kvgv6cng9my7fyn8s4ydv3prpydn"; depends=[abind foreach ggplot2 kernlab magrittr party polspline recipes rlang rsample Rsolnp survival tibble]; }; + MachineShop = derive2 { name="MachineShop"; version="1.5.0"; sha256="1injyl578zd5qs13h8bwzavb4gzam896d7g9304ck6rh2lbci4hj"; depends=[abind foreach ggplot2 kernlab magrittr party polspline recipes rlang rsample Rsolnp survival tibble]; }; 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]; }; Mangrove = derive2 { name="Mangrove"; version="1.21"; sha256="1qf3fjzf0sb6fqbfdbxwbw6wah3gg2qran4mgg13hcmk4n3j0hxp"; depends=[]; }; @@ -2356,19 +2383,20 @@ in with self; { ManlyMix = derive2 { name="ManlyMix"; version="0.1.14"; sha256="0zpcc74965n435d4fah41r9nz0kjyn46hkjl1s0kvlllqj6n69wg"; depends=[]; }; ManyTests = derive2 { name="ManyTests"; version="1.2"; sha256="1mi7wvnkcd95126f1h8vl8skn397yd2zqvcswprqar54p161wgyi"; depends=[]; }; Map2NCBI = derive2 { name="Map2NCBI"; version="1.3"; sha256="04fhnghakygpwrmhrwqr6g0r62zsxl0czy5bn3xl5iqzaswcd4i1"; depends=[rentrez]; }; - MapGAM = derive2 { name="MapGAM"; version="1.2-4"; sha256="13663vnxhjsamjxr7kwkbh52hfxj4hb5bc8iii8nk2yw9rcwrzwm"; depends=[colorspace gam maptools sp survival]; }; + MapGAM = derive2 { name="MapGAM"; version="1.2-5"; sha256="0ardqsa7smx0syh1l591bm6a1rb7kvcyw3rlb3hkfk8rk4k60qmr"; depends=[colorspace gam maptools sp survival]; }; MareyMap = derive2 { name="MareyMap"; version="1.3.4"; sha256="1wap0syzgd0w3xla2x4bcasn8zzlj63r5yyf9r479nvifjxdqxzz"; depends=[tkrplot]; }; MargCond = derive2 { name="MargCond"; version="1.0.0"; sha256="07qh1lgy8ds11cwlb4rxkl6aiph91zq29sy27b8wwxalycdgjrg8"; depends=[gee lme4 MASS Matrix]; }; MarginalMediation = derive2 { name="MarginalMediation"; version="0.7.0"; sha256="0jwp8rzv0ghir8k7dfmfrq4rvcqf7xww6va16p3jj2nk3r9hiq0x"; depends=[betareg boot cli crayon furniture magrittr purrr rstudioapi stringr tibble]; }; - MarketMatching = derive2 { name="MarketMatching"; version="1.1.1"; sha256="1rdrw4p48lfgl4mzyxvz8f4dgpsc2gszl2c1m9a6vi3k0z4z4qkv"; depends=[bsts CausalImpact data_table doParallel dplyr dtw foreach ggplot2 iterators reshape2 scales zoo]; }; + MarketMatching = derive2 { name="MarketMatching"; version="1.1.2"; sha256="0i3wccclrl7lixny24jif0xvmf6lgmwsgqxc6h5c3mv405cp0h1r"; depends=[bsts CausalImpact data_table doParallel dplyr dtw foreach ggplot2 iterators reshape2 scales zoo]; }; MarkowitzR = derive2 { name="MarkowitzR"; version="1.0.1"; sha256="1dz5ig16yz5n8i1dqrbg5xjigryznk61br80fj20prq4qhsdsqi6"; depends=[gtools matrixcalc sandwich]; }; MaskJointDensity = derive2 { name="MaskJointDensity"; version="1.0"; sha256="0nxhsz57cw96in0sg5xg7sicv920kcnxr2rikn39y2qk4vrw6r78"; depends=[ks MASS np plyr]; }; Massign = derive2 { name="Massign"; version="1.1.0"; sha256="09i32lsrx40rxrnb9alfipfrkipy4mza5nr4gcpn2a5h86ak9290"; depends=[]; }; MasterBayes = derive2 { name="MasterBayes"; version="2.55"; sha256="14532l41x5k3z2qg0vklafqyzmn45qny9hlrrgriykajv3xjf2lz"; depends=[coda genetics gtools kinship2]; }; MatManlyMix = derive2 { name="MatManlyMix"; version="1.1.1"; sha256="1d2vd5b9lirdybjclxh0nn4mghq64qjj4l8vnj95cni5pfa18a2c"; depends=[]; }; - MatTransMix = derive2 { name="MatTransMix"; version="0.1.2"; sha256="13jg0rl9y7ifkn2zcsd95sgbf0azmlx83dbh3syv9xdij9n28l83"; depends=[]; }; + MatSkew = derive2 { name="MatSkew"; version="0.1.5"; sha256="019v2b1r0bvw84xs50smjb3jdz7gd2adz5d84xd8zq43lnml96d1"; depends=[]; }; + MatTransMix = derive2 { name="MatTransMix"; version="0.1.5"; sha256="0c4kmlzrscrlbvbsqvkmfr9v95hy4hkwk52vnkanh3gqjmpy2rjk"; depends=[]; }; MatchIt = derive2 { name="MatchIt"; version="3.0.2"; sha256="1pp91pw2sy9hik4sgn4gcsp40hb01n9pfccrwdcffwji5fd1aavq"; depends=[MASS Matching]; }; - MatchIt_mice = derive2 { name="MatchIt.mice"; version="2.0.1"; sha256="1lw1p0kzz3a9y5hr9mrk9cjvdr63aa1sl7wqy8s1s07krvv14nrj"; depends=[MatchIt mice]; }; + MatchIt_mice = derive2 { name="MatchIt.mice"; version="2.0.2"; sha256="0wfd77fimadray59llyfkmilm6fmqd3w0asp8d6krfbisx8bdapc"; depends=[MatchIt mice]; }; MatchLinReg = derive2 { name="MatchLinReg"; version="0.7.0"; sha256="015s3xdaj56prq8lsdry3ibjkrb6gg0fwgzjh496gdx5axvpbk8g"; depends=[Hmisc Matching]; }; Matching = derive2 { name="Matching"; version="4.9-6"; sha256="1p36id8cds865b44jdbk6c3fnadvhh203qx6d3g54bi4s7bww3cf"; depends=[MASS]; }; Matrix = derive2 { name="Matrix"; version="1.2-17"; sha256="1k1zf92ycqr7fz44w7bp1p354ww7jg0wm23ybb8dzmbg37qfchyv"; depends=[lattice]; }; @@ -2381,7 +2409,7 @@ in with self; { MaxPro = derive2 { name="MaxPro"; version="4.1-2"; sha256="19a2wp93kx1wkbzd5bvljbm1rr96gr14w4fb0ppbgr2y2a4g8i1v"; depends=[nloptr]; }; MaxSkew = derive2 { name="MaxSkew"; version="1.1"; sha256="0x5x0jpvhp189jnmgh6d1h3ya0dicj5qfcrgr2fhp1v8jjhl125m"; depends=[]; }; MaxentVariableSelection = derive2 { name="MaxentVariableSelection"; version="1.0-3"; sha256="1cmxfdkm5k85b4ivlfy5521hkfj0gq2pb1qlxxklh0fprw87kp9c"; depends=[ggplot2 raster]; }; - MazamaCoreUtils = derive2 { name="MazamaCoreUtils"; version="0.1.3"; sha256="1s4hjj7kn2zbyf7b59ywmbs494spz19s9bbxdzkv7bx684lwqvqw"; depends=[dplyr futile_logger lubridate stringr]; }; + MazamaCoreUtils = derive2 { name="MazamaCoreUtils"; version="0.2.0"; sha256="0rgrz42cv4m5cl8nfldgsnkipvmz0jn3dpv812gx7swyqbizp9hw"; depends=[dplyr futile_logger lubridate magrittr stringr]; }; MazamaSpatialUtils = derive2 { name="MazamaSpatialUtils"; version="0.6.1"; sha256="14sklx6ja5s1pv8pnqf7s2xvp83x7ddnzc9hzfp3qvdzyyfvwicw"; depends=[countrycode dplyr geojsonio lubridate rgdal rgeos rlang rmapshaper rvest shiny sp stringr xml2]; }; MazamaWebUtils = derive2 { name="MazamaWebUtils"; version="0.1.7"; sha256="16k6wxwjkdwzx1cqcxpxwaj7i63khly90gyiyfw13di43h8cvsd1"; depends=[dplyr futile_logger lubridate mime stringr webutils]; }; McSpatial = derive2 { name="McSpatial"; version="2.0"; sha256="18nmdzhszqcb5z9g8r9whxgsa0w3g7fk7852sgbahzyw750k95n4"; depends=[lattice locfit maptools quantreg RANN SparseM]; }; @@ -2389,11 +2417,12 @@ in with self; { MeTo = derive2 { name="MeTo"; version="0.1.0"; sha256="14hdyh3p3q8yb9w2li2y9pc356jnymsn6n2750zdsrh52b751lpm"; depends=[lubridate]; }; MedDietCalc = derive2 { name="MedDietCalc"; version="0.1.1"; sha256="11q1yn6l697qa33wqik9y9lji39r6pph109yxkkprg9p80c187xy"; depends=[]; }; MedOr = derive2 { name="MedOr"; version="0.1"; sha256="1rwc14s16lnzgb78ac2017hv9pss7zw7nw3y7vrvq1qx4fgiw6f8"; depends=[]; }; - MedSurvey = derive2 { name="MedSurvey"; version="1.1.1.0"; sha256="0ccah3ajk2m5b1hva3za95bd9g2k800x7rl76if92gnfdx0b5qcp"; depends=[lavaan Matrix survey]; }; + MedSurvey = derive2 { name="MedSurvey"; version="1.1.1.1.0"; sha256="0acrrj138sf8qivfh0rrflaw76sl6swf4lviwiap2z5i18f3dd17"; depends=[lavaan Matrix survey]; }; MediaK = derive2 { name="MediaK"; version="1.0"; sha256="19cmxl2wksw9kvjsfn1m4nkr5gpcx6bk0sqrabj1n0dla1l32v2a"; depends=[Rcpp RcppEigen]; }; Mediana = derive2 { name="Mediana"; version="1.0.8"; sha256="0j1ikc2iaxl70134v0gijj2i2g0xgjafvn8rc108r9fhm8rpw564"; depends=[doParallel doRNG foreach MASS mvtnorm survival]; }; Mega2R = derive2 { name="Mega2R"; version="1.0.5"; sha256="18fhkghlx4rkafyx0jpxxyjq20xv6y6sfjyz7m68fi73akjz2rw7"; depends=[AnnotationDbi DBI famSKATRC gdsfmt GenomeInfoDb kinship2 pedgene Rcpp RSQLite SKAT]; }; MendelianRandomization = derive2 { name="MendelianRandomization"; version="0.4.1"; sha256="01irc5qnw7gsvnpifki05ksh7ys8znk0wvhqrzk1bv5294rnq6r1"; depends=[ggplot2 iterpc knitr Matrix plotly rjson rmarkdown robustbase]; }; + Mercator = derive2 { name="Mercator"; version="0.8.8"; sha256="1ahbdfxqy7s27qizr50z70k577lzcadwn0af9j126n1cr24qha7i"; depends=[cluster dendextend igraph Polychrome Rtsne Thresher]; }; 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="3.2.2"; sha256="15fd2d0yysibi2x43qv6b8i1pa18l7z4n0zpmrqhsmvqkgy8sla0"; depends=[astroFns lubridate plotrix pracma]; }; @@ -2404,8 +2433,8 @@ in with self; { MetaAnalyser = derive2 { name="MetaAnalyser"; version="0.2.1"; sha256="0k58325nb7svihhpga7kdbryr9bi5470qsb8aa5llpiggs8j7sfz"; depends=[DT ggvis rstudioapi shiny]; }; MetaComp = derive2 { name="MetaComp"; version="1.1.2"; sha256="1yb115qdmf5rxmjl4y7qr0i6668n46scs4yjpfq9bmy3w9i4ji1x"; depends=[Cairo data_table dplyr ggplot2 plyr reshape2]; }; MetaCycle = derive2 { name="MetaCycle"; version="1.2.0"; sha256="1lh1msrcz70p5jixz5j83pqa3cid21y7m1zvlk872k16awmif00k"; depends=[gnm]; }; - MetaIntegrator = derive2 { name="MetaIntegrator"; version="2.0.0"; sha256="1hsv1ci0a4gjwbfs1h0lxw5sczpk7hl5ws5016zry26cyvf75gzl"; depends=[AnnotationDbi Biobase boot COCONUT data_table DBI dplyr DT GEOmetadb GEOquery ggplot2 ggpubr gplots HGNChelper magrittr manhattanly Metrics multtest pheatmap plyr pracma preprocessCore readr reshape2 rmarkdown rmeta Rmisc RMySQL ROCR RSQLite snplist stringr zoo]; }; - MetaLandSim = derive2 { name="MetaLandSim"; version="1.0.5"; sha256="0098flarh91mvc2ry6903fwxbk2r4193mmh6m7mldisfg9w6igfw"; depends=[coda e1071 fgui googleVis igraph knitr maptools minpack_lm raster rgeos rgrass7 sp spatstat zipfR]; }; + MetaIntegrator = derive2 { name="MetaIntegrator"; version="2.1.1"; sha256="11jblzqid9xyigj916filclk8ih15g04r58msb7lwlh9srn4hjw4"; depends=[AnnotationDbi Biobase BiocManager boot COCONUT data_table DBI dplyr DT GEOmetadb GEOquery ggplot2 ggpubr gplots HGNChelper httpuv magrittr manhattanly Metrics multtest pheatmap plotly plyr pracma preprocessCore readr reshape2 rmarkdown rmeta Rmisc RMySQL ROCR RSQLite stringr zoo]; }; + MetaLandSim = derive2 { name="MetaLandSim"; version="1.0.6"; sha256="1m7i1y9jmhwa3h3xbqqlskgr216x50jb4wx8n3ynh16hw54n07xi"; depends=[coda e1071 fgui googleVis igraph knitr maptools minpack_lm raster rgeos rgrass7 sp spatstat zipfR]; }; MetaLonDA = derive2 { name="MetaLonDA"; version="1.1.5"; sha256="0i9m9j8i9z9qxiaqbjik93ynnjx1xi1n8b6ndx4h2k46n5mg4pi7"; depends=[DESeq2 doParallel edgeR ggplot2 gss metagenomeSeq plyr pracma zoo]; }; 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]; }; @@ -2427,6 +2456,7 @@ in with self; { Methplot = derive2 { name="Methplot"; version="1.0"; sha256="0aaqss9zfn55qi45jffxkksnkw510npjnkygafx49vl77bkagqh5"; depends=[ggplot2 reshape]; }; MethylCapSig = derive2 { name="MethylCapSig"; version="1.0.1"; sha256="16ch9aldr6a9jn42h387n7qvnzs0yx28f2yj6xq0kp476q7rf4ql"; depends=[geepack]; }; Metrics = derive2 { name="Metrics"; version="0.1.4"; sha256="0fh8qbjlwzagh272lgwr4bxcqcjb1qpz53mgs8rzlvncax6nk5bk"; depends=[]; }; + MetricsWeighted = derive2 { name="MetricsWeighted"; version="0.1.0"; sha256="0c6l5rvrdcrm8fy3rnggfbilw15j29zxin0hhrvg91dx2y024mll"; depends=[]; }; MfUSampler = derive2 { name="MfUSampler"; version="1.0.4"; sha256="0i5siq1jacxbfvakb97qnj3h7pk471rrx8ckwm0d8nl3j586s36y"; depends=[ars coda HI]; }; MiDA = derive2 { name="MiDA"; version="0.1.2"; sha256="144gxsxqljzskxsw5k0y69ix0pxlfvyyznxkjpf2ng4l47pg11z5"; depends=[caret gbm genefilter limma preprocessCore pROC SQN]; }; MiRAnorm = derive2 { name="MiRAnorm"; version="1.0.0"; sha256="154wv0j82xyc4y5cd2czh0q8kzhgrk6qsn0ahc1zn3fnrzc9fgz0"; depends=[ArgumentCheck cluster dendextend ggplot2 MASS npmv plyr reshape2]; }; @@ -2439,6 +2469,7 @@ in with self; { MicroMacroMultilevel = derive2 { name="MicroMacroMultilevel"; version="0.4.0"; sha256="1q5cyqr4hdl1wp2isk6p4p084i83kg6hd406wdp1nj9lv5i0xvgw"; depends=[]; }; MicroStrategyR = derive2 { name="MicroStrategyR"; version="1.0-1"; sha256="0a6bk0wnwx8zy9081n7wb12lidgckrhn350r0q5m6aa82l6l8ihi"; depends=[gWidgetsRGtk2]; }; MigClim = derive2 { name="MigClim"; version="1.6"; sha256="171pnalidyw0v2fcjdc3kyrq5kg035kwj5xl8zwgn3hlanpaljvp"; depends=[raster SDMTools]; }; + MinBAR = derive2 { name="MinBAR"; version="1.1.0"; sha256="03hzv6a56w0d6di3jp3w3fgckwxkqb1cy3xiwcvzyg5lzm4z9p2x"; depends=[dismo ecospat geosphere lattice latticeExtra maxnet raster rgdal sp]; }; MindOnStats = derive2 { name="MindOnStats"; version="0.11"; sha256="13995v4n0hfb53w02jk81pl7nazkvqwwv87y1sr99jr9ppzc08mz"; depends=[]; }; Miney = derive2 { name="Miney"; version="0.1"; sha256="0sgln0653rgglinr8rns5s2az0lgyp9slmynyhhhs265grkhrfj0"; depends=[]; }; Minirand = derive2 { name="Minirand"; version="0.1.0"; sha256="0iahhshqxpkxhpchb4hiv7d9rir2d3zxazs2nz7ymzdlhnn41xi1"; depends=[]; }; @@ -2449,6 +2480,7 @@ in with self; { MixAll = derive2 { name="MixAll"; version="1.4.2"; sha256="1m3jkavamx1c2zzalh9j8psk69jmbh4lyl0sxn4x30whv0km5mvp"; depends=[Rcpp rtkore]; }; MixGHD = derive2 { name="MixGHD"; version="2.3.2"; sha256="1fqimvfm25f2wkfxxpnbsnzjkpfz2fyi1rgpgg7fgj2rdf56mmhp"; depends=[Bessel cluster e1071 ghyp MASS mixture mvtnorm numDeriv]; }; MixMAP = derive2 { name="MixMAP"; version="1.3.4"; sha256="0gxghym5ghbyxf589hda2fhv5l3x5jvm6i40x5xdwx4hadcn8k9a"; depends=[lme4]; }; + MixMatrix = derive2 { name="MixMatrix"; version="0.2.2"; sha256="0gpqggw0fskd37lr0vjpf0y6gv711w6invfwj09rzggxlq6vx2fh"; depends=[CholWishart Rcpp RcppArmadillo]; }; MixRF = derive2 { name="MixRF"; version="1.0"; sha256="1av1wx7wmfc3z8a4bc6g3i3b807nc28n3s2rs3yh0rcwq1pfl0ir"; depends=[doParallel foreach lme4 randomForest]; }; MixSAL = derive2 { name="MixSAL"; version="1.0"; sha256="15dymyzfs3bwskaf6xndj291g6nhw7k1q93y1cba55a6fdjh5qz9"; depends=[MASS]; }; MixSIAR = derive2 { name="MixSIAR"; version="3.1.10"; sha256="0kc0apzl6aq9qjgrnnad78k71g91hzc1d7f3j0s1kpwzax2q6l2l"; depends=[bayesplot coda ggmcmc ggplot2 lattice loo MASS MCMCpack R2jags RColorBrewer reshape reshape2 rjags]; }; @@ -2462,7 +2494,7 @@ in with self; { MixtureRegLTIC = derive2 { name="MixtureRegLTIC"; version="1.0.0"; sha256="052gyk4gqv49fa2rxbxnib29f1vjxiw4q8llkfhsv8kw5pw38699"; depends=[]; }; MlBayesOpt = derive2 { name="MlBayesOpt"; version="0.3.4"; sha256="063jc7x2ra0maln39a2w9jjzycac6rkqb96wjnmk36x7vb6z4xy1"; depends=[data_table dplyr e1071 foreach Matrix ranger rBayesianOptimization rlang xgboost]; }; MmgraphR = derive2 { name="MmgraphR"; version="0.3-1"; sha256="0nfv2cax2v2zhsbprwykngq5n6i5qcf8189rci9d48d5k9qm4a5r"; depends=[colorspace march msm TraMineR]; }; - MoEClust = derive2 { name="MoEClust"; version="1.2.2"; sha256="0sdcpjdpaj614a55kcsjwgn990fa7zl8rg2s7h297yan7cg4l2sc"; depends=[lattice matrixStats mclust mvnfast nnet vcd]; }; + MoEClust = derive2 { name="MoEClust"; version="1.2.3"; sha256="1bkknlp49bcx4s2lpdqwpqn5f5rr90lah0zkvmkih309rayirjr3"; depends=[lattice matrixStats mclust mvnfast nnet vcd]; }; MoLE = derive2 { name="MoLE"; version="1.0.1"; sha256="0bq19vwqjn5hl4mw5imkydbp39gal992vnh2dwrq8bb8cmj3qh91"; depends=[]; }; MobileTrigger = derive2 { name="MobileTrigger"; version="0.0.31"; sha256="1zbnxdxh6gr4sgpi10i0pnd85f7i842105jgjswacziqamby6mcy"; depends=[caret ggplot2 kableExtra knitr mailR plyr XML yaml]; }; Modalclust = derive2 { name="Modalclust"; version="0.7"; sha256="0ymzdxp6rh6baih1xm6kj8l8jxjclvnmq0gfp38cl8lpskspb26x"; depends=[class mvtnorm zoo]; }; @@ -2471,7 +2503,7 @@ in with self; { ModelMetrics = derive2 { name="ModelMetrics"; version="1.2.2"; sha256="158ddbw2snlyzd2q6mdaif5i67kq4qfvadylwjxgv1w2cmszrmk6"; depends=[data_table Rcpp]; }; Modelcharts = derive2 { name="Modelcharts"; version="0.1.0"; sha256="1jy78kyyh4r13px2d5bm7fra5bkcpimzfji0hmydspkfi3qla37x"; depends=[dplyr plotly]; }; Modeler = derive2 { name="Modeler"; version="3.4.5"; sha256="15gbg5568qj81wp6yy31amb2b7wl1wvlmgpmdp29lvz1p33jx2y1"; depends=[class ClassComparison ClassDiscovery e1071 neuralnet nnet oompaBase randomForest rpart TailRank]; }; - MomTrunc = derive2 { name="MomTrunc"; version="2.37"; sha256="19y73fv58sxdrqmgffk9mwmq2xd35y8yrvbwv0dlpf8qm8gmz80f"; depends=[matrixcalc mvtnorm]; }; + MomTrunc = derive2 { name="MomTrunc"; version="3.19"; sha256="137ya4z16w8nxh2qds0bki59h81a87rsmwi50mp82qxr76zv5s5d"; depends=[mvtnorm]; }; Momocs = derive2 { name="Momocs"; version="1.2.9"; sha256="13pgn31hv529z33mi020w8wm8ya7hyi5yfsp45a78wdhinqas9mm"; depends=[ape dplyr geometry geomorph ggplot2 jpeg magrittr MASS progress RColorBrewer rgeos 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]; }; @@ -2490,6 +2522,7 @@ in with self; { MortalityTables = derive2 { name="MortalityTables"; version="1.0"; sha256="07pbjgc4qvznw1rfvmz6ndg0gzj0k61iajwn51ijpb7hscwi8937"; depends=[ggplot2 scales]; }; MotilityLab = derive2 { name="MotilityLab"; version="0.2-5"; sha256="080j548sp1c4yqqd7p7zgr70j1xyrw3fgjj1f521sgh84x5h2hbc"; depends=[ellipse]; }; MplusAutomation = derive2 { name="MplusAutomation"; version="0.7-3"; sha256="0sidvznbknc4pdk4w6izpizap2yvbzxbjnmnrxmwj45ypm9pjpqc"; depends=[boot coda data_table digest ggplot2 gsubfn lattice pander plyr rlang texreg xtable]; }; + MplusTrees = derive2 { name="MplusTrees"; version="0.0.1"; sha256="1jmxaxpzccnn5qpc138z7mr89s0ia9kc8wrsa1n6c2d3x4jzmms9"; depends=[MplusAutomation nlme rpart rpart_plot]; }; Mqrcm = derive2 { name="Mqrcm"; version="1.0"; sha256="1z8zyjvjz1izaal5y6dnlm86pvydab45d9qnhcnibi2l9r1ladkc"; depends=[Hmisc pch]; }; MsdeParEst = derive2 { name="MsdeParEst"; version="1.7"; sha256="1zhi1jr30sl7jpsw37lc3akfzixlhm9k2hjkha1pjy5fmd5lddlx"; depends=[MASS moments mvtnorm sde]; }; MtreeRing = derive2 { name="MtreeRing"; version="1.3.1"; sha256="0kavghk4453ifx4fphzc9z4hpdd2fd85wzpihpkb51234di6lgc8"; depends=[bmp dplR dplyr imager jpeg magick magrittr measuRing png shiny shinydashboard shinyWidgets spatstat tiff]; }; @@ -2555,6 +2588,7 @@ in with self; { NHLData = derive2 { name="NHLData"; version="1.0.0"; sha256="0dfqalccbkmqrn3h1z6s78l818c8sqn7d6yc8mg872ygmszryci7"; depends=[]; }; NHMSAR = derive2 { name="NHMSAR"; version="1.12"; sha256="034cjzbwyf5jkj24wf9s6dij7g416psd2iz7fjrg34q9ax2kzyyl"; depends=[glasso lars ncvreg ucminf]; }; NHPoisson = derive2 { name="NHPoisson"; version="3.2"; sha256="0k6m6ampp7g95d0jm5msvrgc12rqirpanb1ykbdf1ii027pqpwsn"; depends=[car]; }; + NHSRdatasets = derive2 { name="NHSRdatasets"; version="0.1.1"; sha256="0i75dlb0z8i3kp4b7h5fy8ykmnv4ciih1maj21hl7a7l47s095if"; depends=[]; }; NIPTeR = derive2 { name="NIPTeR"; version="1.0.2"; sha256="0ll6amqyw33a93xiccihidrnbaqlx1q7kqcd4wks7cvqawd8pgv1"; depends=[Rsamtools S4Vectors sets]; }; NIRStat = derive2 { name="NIRStat"; version="1.0"; sha256="1hi8201zslp1f7m3jci8q03y3f1zlcck2x3i793l7lsyl7qbzd1z"; depends=[ggplot2 gridExtra mgcv]; }; NISTnls = derive2 { name="NISTnls"; version="0.9-13"; sha256="03a1c8a5dr5l5x4wbclnsh3vmx3dy7migfdzdx7d7p3s7hj3ibif"; depends=[]; }; @@ -2569,8 +2603,9 @@ in with self; { NMFN = derive2 { name="NMFN"; version="2.0"; sha256="0n5fxqwyvy4c1lr0glilcz1nmwqdc9krkqgqh3nlyv23djby9np5"; depends=[]; }; NMI = derive2 { name="NMI"; version="2.0"; sha256="1rxphy9rhy9zhdiz48dvl9m26x6k681lnyn39lqxs0a6jhrxg7y3"; depends=[]; }; NMOF = derive2 { name="NMOF"; version="1.6-0"; sha256="0m97xi1bpq1gw18fn512blh0li6xv2yfipf2c3aj7bwaq91wv12l"; depends=[]; }; + NNLM = derive2 { name="NNLM"; version="0.4.3"; sha256="0p7p26070w2j57z5i89pmpgd470yh2z0rrfzpalzdngc8mzp2rkj"; depends=[Rcpp RcppArmadillo RcppProgress]; }; NNMIS = derive2 { name="NNMIS"; version="1.0.1"; sha256="1w2i4xlx249p589yqdgbx1ra406ycxw729vbk1lqadbn71m6blaz"; depends=[survival]; }; - NNS = derive2 { name="NNS"; version="0.4.2"; sha256="0ah5ry1qk0hy6i77g5d7gskldrgbvl52ihq212wwa2r8nc95bm3l"; depends=[data_table doParallel rgl stringr]; }; + NNS = derive2 { name="NNS"; version="0.4.3"; sha256="163kizr1ck4m0fvxwdlja2f1lc7347jgmnrxq89qyjx477gjpir0"; depends=[data_table doParallel rgl stringr]; }; NNTbiomarker = derive2 { name="NNTbiomarker"; version="0.29.11"; sha256="0sqlf7vzhpmq2g98c2qlrcqn3ba4ycfxbczgcjiqqhqsvgkpacc1"; depends=[magrittr mvbutils shiny stringr xtable]; }; NORMA = derive2 { name="NORMA"; version="0.1"; sha256="193q6dwn8v7k8xq0amjpvb3v6mn7c6agqa487gvjj78dy1qz720a"; depends=[rootSolve]; }; NORMT3 = derive2 { name="NORMT3"; version="1.0-3"; sha256="041s0qwmksy3c7j45n4hhqhq3rv2hncm2fi5srjpwf9fcj5wxypg"; depends=[]; }; @@ -2586,6 +2621,7 @@ in with self; { NPMLEcmprsk = derive2 { name="NPMLEcmprsk"; version="3.0"; sha256="0nm88fsxgrfk0j0lmir57bhxy4p8ah503gpj6jdlvjqw862jigiq"; depends=[]; }; NPMOD = derive2 { name="NPMOD"; version="0.1.0"; sha256="1m3rfgyxdbyr0m5vznav5qk70ch45wz3dc8wccxjcxrcfkn8i18k"; depends=[BSDA clinfun gWidgets nortest pspearman readxl rlang RVAideMemoire]; }; NPMVCP = derive2 { name="NPMVCP"; version="1.1"; sha256="13jpm46abwziq8859jhl6hg1znk3ws1q7g4vlr2jyri3qa6h22dd"; depends=[]; }; + NPP = derive2 { name="NPP"; version="0.1.0"; sha256="0pwspgwrwdjsdsny8qvhdnqcsxh5fsg33chlla75562hr2jaxqkb"; depends=[]; }; NPS = derive2 { name="NPS"; version="1.1"; sha256="02idja149a2sj97sks4lhsaflpifyxi6n0rjlcq9993f84szfgsi"; depends=[]; }; NPflow = derive2 { name="NPflow"; version="0.13.1"; sha256="0sq47frh665m8mibif1w3i2z5pb577v1ngdjirbya0a9chpmwc3s"; depends=[ellipse fastcluster ggplot2 gplots pheatmap Rcpp RcppArmadillo reshape2 truncnorm]; }; NPsimex = derive2 { name="NPsimex"; version="0.2-1"; sha256="1k9i1f5ckvzdns8f5qnm2zq7qs3wsgzsnfwdz21zmhmi6d0pwchm"; depends=[]; }; @@ -2609,6 +2645,7 @@ in with self; { NetData = derive2 { name="NetData"; version="0.3"; sha256="1jf05zwy0c6gmm7kvxlwvai61bz4wpsw7cl0h4i21ipzn1rqxmqj"; depends=[]; }; NetIndices = derive2 { name="NetIndices"; version="1.4.4"; sha256="0ydivbri8l8zkxi18ghj9h66915scyhca8i9mcyq4b06mjfigss8"; depends=[MASS]; }; NetLogoR = derive2 { name="NetLogoR"; version="0.3.5"; sha256="0nwzpn4qdw5idx9r69nh7bhn8hphjiysqyx721jl0qchp8ssbg51"; depends=[abind car CircStats data_table Hmisc matrixStats plyr quickPlot raster rgeos sp SpaDES_tools]; }; + NetMix = derive2 { name="NetMix"; version="0.1.4"; sha256="0sl5wrb86fvrjrq1qj3w2c7qg052y07wai53w0az2rfs1slf0af9"; depends=[clue gtools igraph lda Matrix Rcpp RSpectra]; }; NetOrigin = derive2 { name="NetOrigin"; version="1.0-3"; sha256="162dhyx7z1nd3z14lfvm3dz0qwwvrc3n17zswbnwcfj6g1b1p2f1"; depends=[colorspace Hmisc igraph]; }; NetPreProc = derive2 { name="NetPreProc"; version="1.1"; sha256="0r51dqymf2nqm86py4zwdlf7qf120j0bg9r6a9c0gsyyijh4z40p"; depends=[graph]; }; NetRep = derive2 { name="NetRep"; version="1.2.1"; sha256="0adlnq22nslp8ildbrf0z26783kzgz4cyn45a981qyjbw4c42hin"; depends=[abind BH foreach RColorBrewer Rcpp RcppArmadillo RhpcBLASctl statmod]; }; @@ -2623,10 +2660,10 @@ in with self; { NetworkSim = derive2 { name="NetworkSim"; version="0.1.0"; sha256="1gvhzlmq46p99wald4pjnv9wxxqdympjkh3bzi98qa7qi84lny7y"; depends=[igraph incgraph]; }; NetworkToolbox = derive2 { name="NetworkToolbox"; version="1.2.3"; sha256="0ldhrp3r9aqsqblvg249bi2ndgj66x53dm0zm941a6nf7kh6j3zl"; depends=[corrplot doParallel fdrtool foreach igraph MASS Matrix ppcor psych pwr qgraph R_matlab]; }; NeuralNetTools = derive2 { name="NeuralNetTools"; version="1.5.2"; sha256="0d73rbp8v0k0j8dp4yigan7krhglx6qfbadvyg7nsj67xc00vbfd"; depends=[ggplot2 nnet reshape2 scales tidyr]; }; - NeuralSens = derive2 { name="NeuralSens"; version="0.0.3"; sha256="1nz1gd76wvyz924lh8iq4dfhq6ysyp36s5gvp3wp25v3p0h93iiw"; depends=[caret fastDummies ggplot2 gridExtra NeuralNetTools reshape2 stringr]; }; + NeuralSens = derive2 { name="NeuralSens"; version="0.0.5"; sha256="1lbl2p9cc35dk0vlcna72nilbv63gv0v96cgwdn9w2hny1bff3za"; depends=[caret fastDummies ggplot2 gridExtra NeuralNetTools reshape2 stringr]; }; Newdistns = derive2 { name="Newdistns"; version="2.1"; sha256="1b5njkzj8b0wrvvfv904di0933k9d320gadmfm5zl6pzdp34bh1i"; depends=[AdequacyModel]; }; + NewmanOmics = derive2 { name="NewmanOmics"; version="1.0.2"; sha256="16lysb690n8jck6c82b8akrd88v77fj5hyi0hhqsz2kz5vj0vify"; depends=[oompaBase]; }; NightDay = derive2 { name="NightDay"; version="1.0.1.1"; sha256="1gwwxk428gkvci4dhfb3zikvidalpqkl0q2r6qpm58c12j14jk1h"; depends=[maps]; }; - Nippon = derive2 { name="Nippon"; version="0.7.1"; sha256="1nw0kaqw5my2bx7i82q4j2qlsmc95kgjnbm9r9np3swhq6wizrmq"; depends=[stringr]; }; NipponMap = derive2 { name="NipponMap"; version="0.2"; sha256="0jk3zz05vhximbbm15h7ngb0ffxp5w8zhisifipkdgvg1hpi7pb7"; depends=[sf tibble]; }; NitrogenUptake2016 = derive2 { name="NitrogenUptake2016"; version="0.2.3"; sha256="13mh63z3x8yqd31v5a4d10bhzk4y67ac38flwk2msv7qcx37sny6"; depends=[car MASS zoo]; }; NlcOptim = derive2 { name="NlcOptim"; version="0.6"; sha256="121njnbfww6qijbc9x6prw35glyzm18di01qvvjn62z4kgq4f7vi"; depends=[MASS quadprog]; }; @@ -2636,6 +2673,7 @@ in with self; { NoiseFiltersR = derive2 { name="NoiseFiltersR"; version="0.1.0"; sha256="0y90si8f5hsi273g10hw700r72la30hwqlwg59gaq76wqlkm8j0p"; depends=[caret e1071 kknn MASS nnet randomForest rJava rpart RWeka]; }; NominalLogisticBiplot = derive2 { name="NominalLogisticBiplot"; version="0.2"; sha256="0m9442d9i78x57gdwyl3ckwp1m6j27cam774zkb358dw5nmwxbmz"; depends=[gmodels MASS mirt]; }; NonCompart = derive2 { name="NonCompart"; version="0.4.4"; sha256="0m62jwp572z7gn4rykyr47b6cfi4sy9hxxghhlkjdclkxw7bjxx9"; depends=[]; }; + NonNorMvtDist = derive2 { name="NonNorMvtDist"; version="1.0.1"; sha256="135scrxwm52fg4drxfr8dgwp2jrgdgbi3fq13i4cka3i99bpx4lm"; depends=[cubature]; }; NonProbEst = derive2 { name="NonProbEst"; version="0.1.0"; sha256="0h21w26d22ffcx384b0fb1cm8fcwh4ijp18a691q7vqzcxq0f101"; depends=[caret e1071 sampling]; }; NonpModelCheck = derive2 { name="NonpModelCheck"; version="3.0"; sha256="13qk2wbgpdf763q5xg29p2hxwqpml23pcgxrzmx12vnapnqfh71k"; depends=[dr]; }; Nonpareil = derive2 { name="Nonpareil"; version="3.3.4"; sha256="1hhshcggfv92ll5zqh8hd3pldp07n0684yh1252z2jv2vbl87v3z"; depends=[]; }; @@ -2693,8 +2731,8 @@ in with self; { OjaNP = derive2 { name="OjaNP"; version="0.9-12"; sha256="170hn5gx48n0i16cd5rwzs5inb4hsvqb7zwixxsg7pami6ild0vs"; depends=[ICS ICSNP Rcpp]; }; OligoSpecificitySystem = derive2 { name="OligoSpecificitySystem"; version="1.3"; sha256="17mspf1ph2ybv046zckykfdcbrsiz40hrs6ib5mpwkfnrvsp1w7l"; depends=[tkrplot]; }; OmicKriging = derive2 { name="OmicKriging"; version="1.4.0"; sha256="08frr38yf5d0l3zwkbq9465xrbyzsn8sx9icqc3yvfnxrkhrpzig"; depends=[doParallel foreach irlba ROCR]; }; - OmicsPLS = derive2 { name="OmicsPLS"; version="1.1.0"; sha256="16q226y8wshjdry538w6zk116rip97hr5bfjyz8g960gy40pjn6j"; depends=[ggplot2]; }; - Omisc = derive2 { name="Omisc"; version="0.1.1"; sha256="1azlxim71hw4lx2srrxcvxxrijwhv6yhs70230ssgvwxcmlmdhz1"; depends=[copula MASS psych]; }; + OmicsPLS = derive2 { name="OmicsPLS"; version="1.2.0"; sha256="108rp76g4cy7zaxv9q979rlv4pn9kb5i3f3iz29cdvxm55a55khv"; depends=[ggplot2 magrittr tibble]; }; + Omisc = derive2 { name="Omisc"; version="0.1.2"; sha256="0ww83srfc7vr1gw2aaa5bahs6lvm11j4057hn06pclz1wb6fnbyw"; depends=[copula MASS psych]; }; OmnibusFisher = derive2 { name="OmnibusFisher"; version="1.0"; sha256="0x3q04g45nixgsrl4biqqi6bk4kx79spq5whm3n4ppr0nkv8dw4h"; depends=[CompQuadForm stringr survey]; }; OnAge = derive2 { name="OnAge"; version="1.0.1"; sha256="1zby5sf92c185b5m19jv4ndgbv6mz107nc47zn1d6bijrypzpc20"; depends=[]; }; Oncotree = derive2 { name="Oncotree"; version="0.3.3"; sha256="147rc9ci66lxbb91ys2ig40sgmldi15p604yysrd4ccbxpbk2zwf"; depends=[boot]; }; @@ -2718,7 +2756,7 @@ in with self; { OptM = derive2 { name="OptM"; version="0.1.3"; sha256="1dykfhnkrqz2axzzggpzaiknd52rx8zj4nk3nv2rvh74f9hv8px7"; depends=[boot SiZer]; }; OptSig = derive2 { name="OptSig"; version="1.0"; sha256="1jmnxwci4rzlwgnq4zxhkii9j7ch1bymx44hk3qv7ws24k7g87nn"; depends=[pwr]; }; OptimClassifier = derive2 { name="OptimClassifier"; version="0.1.4"; sha256="0f1szin0isji60gvb0zi240gri6fc4y1s71n96dn5wacdx5b8mhb"; depends=[clisymbols crayon dplyr e1071 ggplot2 lme4 lmtest MASS nnet nortest rpart]; }; - OptimaRegion = derive2 { name="OptimaRegion"; version="0.2"; sha256="0xhl7jp2429007jzx305ggfwyx0vh2vxw7l2a7f3c0prklhyqpqc"; depends=[boot DepthProc fields nloptr rsm spam]; }; + OptimaRegion = derive2 { name="OptimaRegion"; version="1.1"; sha256="1bikc12a5v3q7f26r14pdfmnxpyqzxa94a10mx5g954km3a329ly"; depends=[boot DepthProc fields geometry magrittr mclust nloptr Rdpack Rdsdp rsm spam stringr]; }; OptimalCutpoints = derive2 { name="OptimalCutpoints"; version="1.1-4"; sha256="0n2vmzkc733yzs155zdj2n8ng74x9hy4m91fl7fac8d4gnrnc8yg"; depends=[]; }; OptimalDesign = derive2 { name="OptimalDesign"; version="0.2"; sha256="1gpcasdbcgqqr1l6f63q4jqva28rpz0cbgs1f4l3bizldd9kf4kh"; depends=[]; }; OptimalTiming = derive2 { name="OptimalTiming"; version="0.1.0"; sha256="1mchb7wdk1v56la30ivi40aq6zma64lrdb94d64d0s7x67m8315w"; depends=[mstate survival]; }; @@ -2743,6 +2781,7 @@ in with self; { PAC = derive2 { name="PAC"; version="1.1.1"; sha256="07f83i43nxf1s2c26kkpcv4iyq517w20y1l7yg41wnmbfi9xlk7s"; depends=[dplyr ggplot2 ggrepel igraph infotheo parmigene Rcpp Rtsne]; }; PACBO = derive2 { name="PACBO"; version="0.1.0"; sha256="1v3j5bgvf0wh8s4d2yyz0fkc3acdwjlicwnbh1r241b1742x79cb"; depends=[mnormt]; }; PACLasso = derive2 { name="PACLasso"; version="1.0.0"; sha256="1qzzymhfsjy8mk0r0xpd5h4wrx4wk8gq3vi6fnawkq5xkrg26rld"; depends=[lars limSolve MASS penalized quadprog]; }; + PACVr = derive2 { name="PACVr"; version="0.8.1"; sha256="03ap3m4c6jbzc311aksnrwrfd8h65gskka9jpmnx4wnvcrkalapj"; depends=[BiocGenerics genbankr optparse RCircos]; }; PAFit = derive2 { name="PAFit"; version="1.0.1.2"; sha256="10nwl2wbpka63qc66gk9n6m1rvpf5kx9dwl948n9l6wr488klial"; depends=[igraph knitr magicaxis mapproj MASS network networkDynamic plyr RColorBrewer Rcpp VGAM]; }; PAGI = derive2 { name="PAGI"; version="1.0"; sha256="01j1dz5ihqslpwp9yidmhw86l112l7rfkswmf03vss872mpvyp3f"; depends=[igraph]; }; PAGWAS = derive2 { name="PAGWAS"; version="2.0"; sha256="0bz47ivd32kx1amgqllqbxyyvj773q7wasgk924hmibabiixa8nx"; depends=[foreach lars mnormt]; }; @@ -2756,7 +2795,7 @@ in with self; { PATHChange = derive2 { name="PATHChange"; version="1.0"; sha256="1pmxhaych01cywx9bb5z0p5lbxcma7x6nlprivpx3gnpg7m9srpg"; depends=[rlist stringr VennDiagram]; }; PAWL = derive2 { name="PAWL"; version="0.5"; sha256="1sx4g4qycba2j1fm0bvhz3hk6ghhdc37rz5zi1njqxrpmbnkqg04"; depends=[foreach ggplot2 mvtnorm reshape]; }; PAmeasures = derive2 { name="PAmeasures"; version="0.1.0"; sha256="0c2pkms06lijly9clxp6zkasqy4zjicdwnvbqwvhp45yavwmkkkj"; depends=[survival]; }; - PAutilities = derive2 { name="PAutilities"; version="0.1.2"; sha256="15m6qyj9w65dcdvbfi65llzsqqky890fh5b194clw505zyf6ma46"; depends=[AGread dplyr ggplot2 lazyeval magrittr matchingMarkets rlang]; }; + PAutilities = derive2 { name="PAutilities"; version="0.2.0"; sha256="06q77mr2g448n3avps9bsy16yacahqhxvrbp3yyv2qxqsnjxvf7m"; depends=[dplyr ggplot2 lazyeval lubridate magrittr matchingMarkets rlang]; }; PBD = derive2 { name="PBD"; version="1.4"; sha256="1n8gq8ms6gszr469hblipbgalc5m7gfiknpsbqywxml62sr4wbsb"; depends=[ade4 ape DDD deSolve phytools]; }; PBIBD = derive2 { name="PBIBD"; version="1.3"; sha256="0zh73bsiwmsqw1vhs2dazndsf0894kfv3vfv88wr4fnh7njysz6r"; depends=[]; }; PBImisc = derive2 { name="PBImisc"; version="1.0"; sha256="18gjp66q6l0w6vsgm6d5sjgpa906z1gyyp6yf58lq5vyg1bnfmcl"; depends=[lme4 Matrix]; }; @@ -2791,7 +2830,7 @@ in with self; { PDShiny = derive2 { name="PDShiny"; version="0.1.0"; sha256="0s09sywvy83dj06rkxzyi06wfymwnfpgf3lpgjbb8ps8q3byd4vs"; depends=[shiny]; }; PEGroupTesting = derive2 { name="PEGroupTesting"; version="1.0"; sha256="1z863ard0cc2g8ibxnmxhiqhvs53r6b8gpnavnfchm9432ifcbwi"; depends=[]; }; PEIP = derive2 { name="PEIP"; version="2.2-1"; sha256="0bzynmd7azs33994dlsabxp29lncs1v2njp6iy5l62rwrnxj9y0a"; depends=[bvls fields geigen Matrix pracma RSEIS]; }; - PELVIS = derive2 { name="PELVIS"; version="1.2.1"; sha256="12r3cylcahz6rzrwy580wr06yc60p9x0b7vzn0v16pbv3r3ssw0d"; depends=[DT MASS shiny]; }; + PELVIS = derive2 { name="PELVIS"; version="2.0.0"; sha256="0n5ndnwxsixx5lipsq33i8f7wc78sb9a4b9bbblb72v5nmmq305p"; depends=[DT MASS shiny]; }; PEMM = derive2 { name="PEMM"; version="1.0"; sha256="18dd9hsbdrnhrrff7gpdqrw2jv44j8lg0v3lkcdpbd4pppcaq84h"; depends=[]; }; PET = derive2 { name="PET"; version="0.5.1"; sha256="1gdq7ai8hgl9h53b72j7sfk09l7yr2b84pdy9bl1z3x8zxbsp8br"; depends=[adimpro]; }; PGEE = derive2 { name="PGEE"; version="1.5"; sha256="1qcxbqnbpplnfjy83nm9fj9y4abzgbxnsggzx7ix3vb9qs18cdwh"; depends=[MASS mvtnorm]; }; @@ -2807,14 +2846,14 @@ in with self; { PIPS = derive2 { name="PIPS"; version="1.0.1"; sha256="1c5v3s6xys9p1q32k6mpsffhi9gwsq951rh12hs76dmak862yspc"; depends=[]; }; PK = derive2 { name="PK"; version="1.3-4"; sha256="1zkjq64p34gzbsbmbdqphssnplzz65wpl486qf4yhawnb4wnkj1v"; depends=[]; }; PKI = derive2 { name="PKI"; version="0.1-5.1"; sha256="1xs3jxbczhkxnp7cyw2yh1jcwha92y9pdsbka1ligbla70bnvxyj"; depends=[base64enc]; }; - PKNCA = derive2 { name="PKNCA"; version="0.8.5"; sha256="0lklg2w1rcas70rj72q390n6lkxq557731a90b7plh2g32xsp32k"; depends=[digest dplyr lattice nlme plyr rlang tidyr]; }; + PKNCA = derive2 { name="PKNCA"; version="0.9.1"; sha256="0b9ar6d487b7klvavv6c10q9a8q6ads8bv9x3pb5359jxbfilm3q"; depends=[digest dplyr nlme rlang tidyr]; }; PKPDmisc = derive2 { name="PKPDmisc"; version="2.1.1"; sha256="1p47zdhilprzcwarfmisq7g7znr73wgxns43mn3d7w5sv671mygv"; depends=[BH data_table dplyr ggplot2 lazyeval magrittr purrr Rcpp readr rlang stringr tibble]; }; PKPDmodels = derive2 { name="PKPDmodels"; version="0.3.2"; sha256="1h893civ77ahbgjnc6kq3l7rszmqmx9dlxwavldigpq3r79vd86k"; depends=[]; }; PKconverter = derive2 { name="PKconverter"; version="1.3"; sha256="1ddhj1qwdwr6g89q55l9njm1ms1wr80d56klz50ai9xvb91qzn89"; depends=[shiny shinydashboard shinythemes]; }; PKgraph = derive2 { name="PKgraph"; version="1.7"; sha256="0g36cdv5cblqx69j48irxjc5nlw2cl3p714mlsblnd3362z1brwn"; depends=[cairoDevice ggplot2 gWidgetsRGtk2 lattice proto rggobi RGtk2]; }; PKreport = derive2 { name="PKreport"; version="1.5"; sha256="16hss9migbxpnw5f9gcw1nlvb81iyji00ylx5wd6kdwhz0ids9wj"; depends=[ggplot2 lattice]; }; PLIS = derive2 { name="PLIS"; version="1.1"; sha256="0b81s7677wglqvv1b5lx8k2iaks09kz0wrl07245a7j2pk9nxv7p"; depends=[]; }; - PLMIX = derive2 { name="PLMIX"; version="2.0.1"; sha256="1m1v745v5gd5npxl5cz3dqm2839wyl5j8qx6d66nnqbqj6ywg15v"; depends=[abind foreach gtools label_switching MCMCpack rcdd Rcpp]; }; + PLMIX = derive2 { name="PLMIX"; version="2.1.0"; sha256="1z89s4f22d1z6caqamksj17g0w9qlx10n2grg05hg1dpmhv1mf7b"; depends=[abind coda foreach ggmcmc ggplot2 gridExtra gtools label_switching MCMCpack PlackettLuce pmr prefmod radarchart rankdist rcdd Rcpp reshape2 StatRank]; }; PLNmodels = derive2 { name="PLNmodels"; version="0.9.2"; sha256="0xrn1bkzj1bvbfgs0k7jkb8d10k3sh9r9s0lbwx0dgdbhny5gl6p"; depends=[biomformat corrplot dplyr ggplot2 glassoFast gridExtra igraph magrittr MASS Matrix nloptr phyloseq R6 Rcpp RcppArmadillo tidyr]; }; PLRModels = derive2 { name="PLRModels"; version="1.1"; sha256="0dwnzfw7a1cxz9s00kxf19jmjsc8cy6cc9q2mjqf8z7690wrg7hb"; depends=[]; }; PLSbiplot1 = derive2 { name="PLSbiplot1"; version="0.1"; sha256="1l8d1k913ic0qwxvrrd447p5ni3mzc6v9lv45b7vqrpzkxdci6gy"; depends=[]; }; @@ -2844,7 +2883,7 @@ in with self; { PPtreeViz = derive2 { name="PPtreeViz"; version="2.0.3"; sha256="1x5rcls49jz19y3h98n2k4kypm8mv8p586clhdj62bvp2nl8wg3x"; depends=[ggplot2 gridExtra partykit Rcpp RcppArmadillo]; }; PQLseq = derive2 { name="PQLseq"; version="1.1"; sha256="1h8baf0apxvimarr2qwlh6pdzv88ib1dzw927swsyimjg44wjbfc"; depends=[doParallel foreach Matrix Rcpp RcppArmadillo]; }; PREPShiny = derive2 { name="PREPShiny"; version="0.1.0"; sha256="0zsg07y6nhp2lma3pdz8xd981y3mh8k21il5jv0inma1d1xr4g3f"; depends=[dplyr psycho rmarkdown shiny]; }; - PRIMME = derive2 { name="PRIMME"; version="2.2-0"; sha256="1iwwh871v87fz6j6q9nvfiq8x8nz2v87n52l80a15d5rvvxv2rbi"; depends=[Matrix Rcpp]; }; + PRIMME = derive2 { name="PRIMME"; version="3.0-0"; sha256="1wvwdsaqg5rqx93svvhjvi64x6vxbr0a8za0a7cixy0vdg14vli4"; depends=[Matrix Rcpp]; }; PRIMsrc = derive2 { name="PRIMsrc"; version="0.8.2"; sha256="04g1saf511xs26m1iv9xfsmfs15fdfaxh5qlbay2mcb198270pd8"; depends=[glmnet Hmisc quantreg superpc survival]; }; PRISM_forecast = derive2 { name="PRISM.forecast"; version="0.1.6"; sha256="0w0fjbaafq90ac35h70z8g95q1i812v0ivkif4lx8l3q7rhjrvb5"; depends=[glmnet xts zoo]; }; PRISMA = derive2 { name="PRISMA"; version="0.2-7"; sha256="0sk2d07m8rhipa0kdbaf8ngryda6f1ihp5akpnyw2llajf0x8as5"; depends=[ggplot2 gplots Matrix]; }; @@ -2857,7 +2896,7 @@ in with self; { PROscorer = derive2 { name="PROscorer"; version="0.0.1"; sha256="0mgj0mi0vzdk0agimsx4k9i4bss0j5lqiayzhldr1hrqrx2a4f3d"; depends=[PROscorerTools]; }; PROscorerTools = derive2 { name="PROscorerTools"; version="0.0.1"; sha256="1vliffkfqdn5l96bncfgayv19i20kmawlxi8q853wamj6npdpv5r"; depends=[]; }; PRROC = derive2 { name="PRROC"; version="1.3.1"; sha256="1m28h8pcd78049lz2qixhkcr9h5b3jik3maqzfbvq9y58z71i4a7"; depends=[]; }; - PRSim = derive2 { name="PRSim"; version="1.0"; sha256="14rap5s38xmx8hgqr71q7r4g5kz098qwwv8m0b3pgfxa6ghnsgjx"; depends=[homtest]; }; + PRSim = derive2 { name="PRSim"; version="1.1"; sha256="0h4gncdnd48p7z1x3ja9gyi5mhmcbcr5fj8xqvlqfslvsdmsak1g"; depends=[goftest homtest]; }; PReMiuM = derive2 { name="PReMiuM"; version="3.2.2"; sha256="1mw5arjg9jyiyvrlcxm1sxdn989jkjfhldncdjyzkp4qhns6cjjs"; depends=[ald BH cluster data_table gamlss_dist ggplot2 plotrix Rcpp RcppEigen rgdal spdep]; }; PResiduals = derive2 { name="PResiduals"; version="0.2-6"; sha256="11r0zn626s701hprjy634a7d3v3sq6lmlzpamv02609fg8wjhy9h"; depends=[Formula MASS rms SparseM]; }; PSAgraphics = derive2 { name="PSAgraphics"; version="2.1.1"; sha256="05c0k94dxddyrhsnhnd4jcv6fxbbv9vdkss2hvlf3m3xc6jbwvh9"; depends=[rpart]; }; @@ -2878,7 +2917,7 @@ in with self; { PVR = derive2 { name="PVR"; version="0.3"; sha256="0pcnazkiwmicr3k6k70r8skqk0pd46fcqhhxghawxjs4slgnygkj"; depends=[ape MASS splancs]; }; PWD = derive2 { name="PWD"; version="1.0"; sha256="0ksr3biaqd4p5a4lv28i4cwk1fn9822ndq2161mgvc1c344p06fj"; depends=[Rcpp RcppArmadillo]; }; PWEALL = derive2 { name="PWEALL"; version="1.3.0"; sha256="0nb0v6wvj9ay90qcbrr9drg2g84fb7a9m78pzb69wp8789i8ixhk"; depends=[survival]; }; - PWFSLSmoke = derive2 { name="PWFSLSmoke"; version="1.2.4"; sha256="088bw991f76l9pmzbfrlbasccvdrms8vw0ik8p5zhgibl57dpqs6"; depends=[cluster dplyr dygraphs geosphere ggmap httr jsonlite leaflet lubridate magrittr mapproj maps maptools MazamaCoreUtils MazamaSpatialUtils openair png purrr raster RColorBrewer readr reshape2 rgdal RgoogleMaps rlang sp stringr tibble tidyr xts]; }; + PWFSLSmoke = derive2 { name="PWFSLSmoke"; version="1.2.100"; sha256="0fqzr5gng5miyslkxjkq0gmy1mi37bcjg8pb9vhs7dxa15dm332j"; depends=[cluster curl dplyr dygraphs geosphere ggmap glue httr jsonlite leaflet lubridate magrittr mapproj maps maptools MazamaCoreUtils MazamaSpatialUtils openair png purrr raster RColorBrewer readr reshape2 rgdal RgoogleMaps rlang sf slippymath sp stringr tibble tidyr xts]; }; 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.3.2"; sha256="01nzf7as848i3vpwgdm450x3f5lapfh2vgd59sy6qr80c19nfjl9"; depends=[graph gtools TSP]; }; @@ -2898,7 +2937,7 @@ in with self; { PanJen = derive2 { name="PanJen"; version="1.6"; sha256="18cl9rls98v286kk6lyxxws3w59zpzgmqi5250gdgcf71xy2lhvm"; depends=[mgcv]; }; PanelCount = derive2 { name="PanelCount"; version="1.0.9"; sha256="1b6c83qypjc3ylvhh24xm4pjk8w34s24v0i9ddlmg92f1518hlkj"; depends=[Rcpp RcppArmadillo statmod]; }; Paneldata = derive2 { name="Paneldata"; version="1.0"; sha256="00hk340x5d4mnpl3k0hy1nypgj55as2j7y2pgzfk3fpn3zls5zib"; depends=[]; }; - ParBayesianOptimization = derive2 { name="ParBayesianOptimization"; version="0.1.1"; sha256="12s02gvb2ilra8xca3yqb6pzy0pizvnq08kp05gj0xkdas4rb5z9"; depends=[data_table dbscan foreach GauPro lhs]; }; + ParBayesianOptimization = derive2 { name="ParBayesianOptimization"; version="0.1.2"; sha256="07kbx156n0i59q65zrfbnhaimyzh4kkp5gs57lknzinvjqqblwdd"; depends=[data_table dbscan foreach GauPro lhs]; }; ParDNAcopy = derive2 { name="ParDNAcopy"; version="2.0"; sha256="017xwznhfibi8kp0ifww02c0qcq0vxs06rjww4kcp2bvdmld8kc4"; depends=[DNAcopy]; }; ParallelLogger = derive2 { name="ParallelLogger"; version="1.1.0"; sha256="007linzn60bjs8nh1j1jzb292naxajjpkjwmhjc992h8himxfky4"; depends=[jsonlite snow XML]; }; ParallelPC = derive2 { name="ParallelPC"; version="1.2"; sha256="07y7xb16865khxkvwsk1yglzyy7ja4aj2wpkipaz48i77c3x8bi2"; depends=[]; }; @@ -2915,7 +2954,7 @@ in with self; { Peacock_test = derive2 { name="Peacock.test"; version="1.0"; sha256="0ypvwywipyh8lm8xkazsfjgjpvvyi2g8kid63qff11372p33m6xs"; depends=[]; }; PeakError = derive2 { name="PeakError"; version="2017.06.19"; sha256="1d4v7s478zjz42dm6ps4nnqqyyqv84dgmzn1bp1a4qwnfv9vmfg7"; depends=[]; }; PeakSegDP = derive2 { name="PeakSegDP"; version="2017.08.15"; sha256="1ndf4d4ikcyqi0k51kil2jw777z4c1m4pda3dahrjmjyz0jhrhkw"; depends=[]; }; - PeakSegDisk = derive2 { name="PeakSegDisk"; version="2018.11.28"; sha256="153305pfih4yz33hj15ffnwyx3mhr67f6v68rxdkwdqzchy4jgv9"; depends=[data_table]; }; + PeakSegDisk = derive2 { name="PeakSegDisk"; version="2019.7.29"; sha256="0vcmz57cvyjn69nxzz5ai8xpjj92f3b9cynll5pv76v4k3sms5ld"; depends=[data_table]; }; PeakSegJoint = derive2 { name="PeakSegJoint"; version="2018.10.3"; sha256="0f0dw6swhhf301j4ci3rs8cmzd39dcjlb0kqxpdh7f00gp3qn7da"; depends=[PeakError penaltyLearning]; }; PeakSegOptimal = derive2 { name="PeakSegOptimal"; version="2018.05.25"; sha256="0j39jzy4r0h787vs3klgbpcmb096ds3hzhvv5w3xs53kl0qkypj4"; depends=[penaltyLearning]; }; PearsonDS = derive2 { name="PearsonDS"; version="1.1"; sha256="0rqh9ji0bah3n1c6fcg7krgqs65qla9p3xrnc4jr7va6ph104im9"; depends=[]; }; @@ -2975,7 +3014,7 @@ in with self; { PoissonSeq = derive2 { name="PoissonSeq"; version="1.1.2"; sha256="1hhx0gv06cp6hm6h36mqy411qn9x15y45crpzbyf8crfs85c6gbg"; depends=[combinat]; }; PolyPatEx = derive2 { name="PolyPatEx"; version="0.9.2"; sha256="1z1hwvsw7b6cz5xfy35a5ldrzb3fhp3swiyz56v1zqblpsaz8n9g"; depends=[gtools]; }; PolyTrend = derive2 { name="PolyTrend"; version="1.2"; sha256="17n6phkzgaqrlzs8x1l5smnij1gxfklr0zj9pqfy5n8xqnpwssm5"; depends=[]; }; - Polychrome = derive2 { name="Polychrome"; version="1.2.2"; sha256="0pw5ph77dwqdf5s2cjsplichj75p1ncla4sb8k731r9mcx9pb98c"; depends=[colorspace scatterplot3d]; }; + Polychrome = derive2 { name="Polychrome"; version="1.2.3"; sha256="1frh21813ffgax487bcyc6a3z0j9jb27dq5djsbpi7ali38il738"; depends=[colorspace scatterplot3d]; }; PolynomF = derive2 { name="PolynomF"; version="2.0-2"; sha256="06gkyhacc609s7si604rh4yyqdafc4mqy15wcz90qrwbrhr18gcm"; depends=[Rcpp]; }; Pomic = derive2 { name="Pomic"; version="1.0.4"; sha256="0xy5fgimbgqqac3n7akhwyvnrvd9fpvx9h8nk4spxrxc8x0km1w7"; depends=[]; }; PooledMeanGroup = derive2 { name="PooledMeanGroup"; version="1.0"; sha256="0i9s7qskjnji3mf6clsi69rnni57v8cysgr9gh3hvxjzlf1sq8y7"; depends=[]; }; @@ -3000,7 +3039,7 @@ in with self; { PreKnitPostHTMLRender = derive2 { name="PreKnitPostHTMLRender"; version="0.1.0"; sha256="1749cd734f4bf0n4068s2m617k6as8h9bwp44mm3la2xy3vjf5g1"; depends=[knitr rmarkdown XML]; }; PreProcess = derive2 { name="PreProcess"; version="3.1.7"; sha256="1fxzkmrj76mc94xdj7a0nq450021i1jxkigmh5jhrmamkp5581jf"; depends=[oompaBase]; }; PreciseSums = derive2 { name="PreciseSums"; version="0.3"; sha256="02w0pa9dd196sg6zg9w2fp4b0k6wibbw9rbvasr3aphh98kbd6ch"; depends=[]; }; - PredPsych = derive2 { name="PredPsych"; version="0.3"; sha256="0bqc2vl32z9wzby7ncrab742cajy4w5kq7wv2gh2jjqdnv9nkia7"; depends=[caret e1071 ggplot2 MASS mclust party plyr randomForest rpart statmod]; }; + PredPsych = derive2 { name="PredPsych"; version="0.4"; sha256="00h4p1szqzh4a2kjvlriyinh330cfwxsrvs6fi089mr207q890vj"; depends=[caret e1071 ggplot2 MASS mclust party plyr randomForest rpart statmod]; }; PredictABEL = derive2 { name="PredictABEL"; version="1.2-2"; sha256="08c7j2in1wlas6nmy44s08cq86h5fizqbhsnq312dllqdzmb2h9s"; depends=[epitools Hmisc PBSmodelling ROCR]; }; PredictionR = derive2 { name="PredictionR"; version="1.0-11"; sha256="1dljdbya93dirx715yqs4vz7hbbcwpgrsvyfgikkm2fj28nnn6k9"; depends=[fitdistrplus]; }; PredictiveRegression = derive2 { name="PredictiveRegression"; version="0.1-4"; sha256="15vkisj3q4hinc3d537s8inhj3wk62q67qhy050xmp9j563ainmd"; depends=[]; }; @@ -3010,7 +3049,7 @@ in with self; { PriorGen = derive2 { name="PriorGen"; version="1.1.2"; sha256="0qvdqqdy7wdwwcq95mkgfyf7xf6xlpwdfs3gq299yyv2ba57flnm"; depends=[rootSolve]; }; PrivateLR = derive2 { name="PrivateLR"; version="1.2-22"; sha256="0d142fa3wk7yadvs8jszajs6hq9m03p0j6h5r4pbw7j0d1l72hgc"; depends=[]; }; ProDenICA = derive2 { name="ProDenICA"; version="1.0"; sha256="04gnsnd0xzw3bfbssdp06bar0lk305ry2c97pmwxgiz3ay88dfsj"; depends=[gam]; }; - ProFit = derive2 { name="ProFit"; version="1.2.7"; sha256="0mbxlrfm7sdamrwyv587mrp86r82pk73fp8iq63dpwwv3nmdq00r"; depends=[celestial cubature FITSio LaplacesDemon magicaxis RColorBrewer]; }; + ProFit = derive2 { name="ProFit"; version="1.3.2"; sha256="0knmlja0bclzl6v58kdmx5a649m2gyvm6497gbziqnj7vn28l3wg"; depends=[celestial checkmate cubature FITSio LaplacesDemon magicaxis RColorBrewer]; }; ProFound = derive2 { name="ProFound"; version="1.3.4"; sha256="1kn9kj0vq18jxiavdzx4l4kgyfwjnflfbyqfdihrdfrkz4xz4w3c"; depends=[celestial data_table doParallel FITSio foreach magicaxis RColorBrewer Rcpp]; }; ProPublicaR = derive2 { name="ProPublicaR"; version="0.9.2"; sha256="17fghv7w4wm4q9nd6l4pl5ibk5i4zgdhlp5pvbzvymhvby0q06sw"; depends=[config dplyr httr lubridate stringr]; }; ProTrackR = derive2 { name="ProTrackR"; version="0.3.6"; sha256="1lhk3lrspiqcw2ckss52gdjk1f6ph8m7dlb05qxcx8mycq0xd3z9"; depends=[audio lattice signal tuneR XML]; }; @@ -3073,7 +3112,7 @@ in with self; { QUIC = derive2 { name="QUIC"; version="1.1"; sha256="021bp9xbaih60qmss015ycblbv6d1dvb1z89y93zpqqnc2qhpv3c"; depends=[]; }; QVM = derive2 { name="QVM"; version="0.1.1"; sha256="0dnr4h4084n505vrxfrx3czrkqdbna8s4fxpwr5czfilbfbxhpar"; depends=[gWidgets IMPACT ltm multilevel mvtnorm nlme pander psych]; }; QZ = derive2 { name="QZ"; version="0.1-7"; sha256="1xkqp2z18fv4z0m5wc9cjd44zk3vk1wpl2lw09x8j10p65n717fm"; depends=[Matrix]; }; - Qtools = derive2 { name="Qtools"; version="1.3"; sha256="1vbjydacgczjlsf8b8id25n3k0cq74i43nsvax22k8hbvj4g0b94"; depends=[boot MASS mice quantreg]; }; + Qtools = derive2 { name="Qtools"; version="1.4.1"; sha256="0mv0pq4ryaijlz31r7w0qwqw4g8lr1pl9pf2319w2h4p86xp3g8m"; depends=[boot glmx MASS Matrix mice np numDeriv quantreg Rcpp RcppArmadillo]; }; QuACN = derive2 { name="QuACN"; version="1.8.0"; sha256="1597blp8gqc5djvbgpfzi8wamvy0x50wh5amxj9cy99qa0jlglxi"; depends=[combinat graph igraph RBGL]; }; QuClu = derive2 { name="QuClu"; version="0.1.0"; sha256="0a2malh9vz5jcjgdx4d98k0c61vz3ip8ynqh5i85x8hzcby11qgj"; depends=[]; }; QualInt = derive2 { name="QualInt"; version="1.0.0"; sha256="1ms96m3nz54848gm9kdcydnk5kn2i8p1rgl2dwn7cqcqblfvsr4j"; depends=[ggplot2 survival]; }; @@ -3100,6 +3139,7 @@ in with self; { R_utils = derive2 { name="R.utils"; version="2.9.0"; sha256="1w4zn2db15bggfnh64fbyi2z2sj47rcd4xn53b28dsnkamdcramj"; depends=[R_methodsS3 R_oo]; }; R0 = derive2 { name="R0"; version="1.2-6"; sha256="1yvcgchxlj7hkgqkw6g8pxnracxkld1grgykkcr6wbhminbylqv8"; depends=[MASS]; }; R1magic = derive2 { name="R1magic"; version="0.3.2"; sha256="1xfldr5y7pfdi6qljjvckknsv2wi9rnzwmqxkpgnyc96md2fvwjr"; depends=[]; }; + R2BEAT = derive2 { name="R2BEAT"; version="1.0.0"; sha256="13srg9bkgb3v79bs6ribywbpkkw0idghj87hfwj2k9jmf6d8dz5a"; depends=[]; }; R2BayesX = derive2 { name="R2BayesX"; version="1.1-1"; sha256="1ff8cscl839ykp7l34sscc8zqp516mh64igk7dfv9n02l40w8ypf"; depends=[BayesXsrc colorspace mgcv]; }; R2DGC = derive2 { name="R2DGC"; version="1.0.3"; sha256="0f84fmpf3m2s2p6bllvjs8rgnhwjy54adblv02dq8gakwvb4j2aw"; depends=[]; }; R2DT = derive2 { name="R2DT"; version="0.1"; sha256="0zydrdx6xdlacq6s01jwv4rv6ydmbwmiif40rilp8h76bim0kdbr"; depends=[data_table devFunc plyr]; }; @@ -3132,8 +3172,9 @@ in with self; { RAP = derive2 { name="RAP"; version="1.1"; sha256="18dclijs72p6gxawpg8hk7n512ah4by5jfg2jnrp8mz79ajmdgir"; depends=[]; }; RAPIDR = derive2 { name="RAPIDR"; version="0.1.1"; sha256="14cnw4jjs5anb55zlg1yj6qc9yr51rsamigq2q7h8ypj2ggnna1d"; depends=[Biostrings data_table GenomicAlignments GenomicRanges PropCIs Rsamtools]; }; RAPTOR = derive2 { name="RAPTOR"; version="1.0.0"; sha256="1i3p3qa56ghcwh69vv3gnxnw13cbd99ms654j2bqr7g9qb7nl8vj"; depends=[mgcv]; }; - RATest = derive2 { name="RATest"; version="0.1.4"; sha256="1r5r10nkdcwrk13hfpv5b7apb0zq6hwxwg22i6smig447s4gk5h3"; depends=[ggplot2 gridExtra quantreg]; }; + RATest = derive2 { name="RATest"; version="0.1.6"; sha256="1xbsdl302ybgcx58rvsz0c1055j7jr01a6zyaq34sq2rdy18vwrs"; depends=[ggplot2 gridExtra quantreg]; }; RAdwords = derive2 { name="RAdwords"; version="0.1.18"; sha256="1c3m2j2cf1s51p783rdng5ns913bv7rbjc1vpmrmsxg2kf5f6qyq"; depends=[RCurl rjson]; }; + RAhrefs = derive2 { name="RAhrefs"; version="0.1.4"; sha256="0yd7jbv2x711dnhbvwjjg7qhg8h8bh5564amsv9bkqw661i042m3"; depends=[assertthat httr jsonlite testthat]; }; RApiDatetime = derive2 { name="RApiDatetime"; version="0.0.4"; sha256="0z08xwdn3vzwmprx5yh2xip5bqk13zrd47lwnsa2yin2phz6yry1"; depends=[]; }; RApiSerialize = derive2 { name="RApiSerialize"; version="0.1.0"; sha256="0gm2j8kh40imhncwwx1sx9kmraaxcxycvgwls53lcyy2ap344k9j"; depends=[]; }; RAppArmor = derive2 { name="RAppArmor"; version="3.2"; sha256="0apw4l7z0jwa7bs7scfysv2amk2rxi7knw9x9j7vqlrgj0i059gm"; depends=[unix]; }; @@ -3165,7 +3206,7 @@ in with self; { RCriteo = derive2 { name="RCriteo"; version="1.0.2"; sha256="1vyhnblw9zr5h6c25lf76p9vn95k8vr0hpq1sjkccdwl9yvsyhfy"; depends=[httr plyr RCurl XML]; }; RCrypto = derive2 { name="RCrypto"; version="0.1.0"; sha256="1lw7hq5ks36fixk0g3gcy4nw21ygwc14jq840hnhyds4glywfpvm"; depends=[dplyr httr jsonlite]; }; RCurl = derive2 { name="RCurl"; version="1.95-4.12"; sha256="1x2z708y89fjphhzs76lycs5rmh5i411wallmhyq4h6zmzppjdrr"; depends=[bitops]; }; - RCzechia = derive2 { name="RCzechia"; version="1.4.0"; sha256="199igyynmgzfx4czffa6y8mv8radzhpxjd1z7spg3xaia8jz30ky"; depends=[curl httr jsonlite lwgeom magrittr sf]; }; + RCzechia = derive2 { name="RCzechia"; version="1.4.1"; sha256="0dbira0qw64dpichfshb84f0fwd3nki5fcmdxcqcbnl20fp8qnsn"; depends=[curl httr jsonlite lwgeom magrittr sf]; }; RDFTensor = derive2 { name="RDFTensor"; version="1.1"; sha256="1xbar13snwyls6rva91bs0632zplfc2qcqlwf7h07r8798m3234s"; depends=[Matrix pracma]; }; RDIDQ = derive2 { name="RDIDQ"; version="1.0"; sha256="09gincmxv20srh4h82ld1ifwncaibic9b30i56zhy0w35353pxm2"; depends=[]; }; RDML = derive2 { name="RDML"; version="1.0"; sha256="13ly1p42njbcygwvkyii8sjqbsywjy5w5g1kd7m8kswi5dsk3qqv"; depends=[checkmate data_table lubridate pipeR R6 readxl rlist stringr xml2]; }; @@ -3238,18 +3279,20 @@ in with self; { RImpact = derive2 { name="RImpact"; version="1.0"; sha256="010bdq6r2fv4rs78kl1ixnw1di39v90ckh8bblzi0wv4adlbaza4"; depends=[]; }; RInSp = derive2 { name="RInSp"; version="1.2.3"; sha256="1nm29q2gysway4r7rdjr08m0w8lh2m9akhjh7swgjwrg4f15kfmy"; depends=[]; }; RInside = derive2 { name="RInside"; version="0.2.15"; sha256="0azhialpdkfm5yzgazq2mfynm8ndyg9d9b569jmg6qa9b2iqf78y"; depends=[Rcpp]; }; - RItools = derive2 { name="RItools"; version="0.1-16.1"; sha256="1s3nv9fwr235czc744sisrkhlz2l4k4vwxb165gl12yar52qb6sm"; depends=[abind SparseM survival svd xtable]; }; + RItools = derive2 { name="RItools"; version="0.1-17"; sha256="1shcvkgsyjk9jmpf7icj1zjlvmqa11scmymc8cycnffax604frbm"; depends=[abind SparseM survival svd xtable]; }; RJDBC = derive2 { name="RJDBC"; version="0.2-7.1"; sha256="1d36js3kwlghsjxfhv7rl8nvg210hxwrx8sdxrxb0inwlqsash25"; depends=[DBI rJava]; }; RJDemetra = derive2 { name="RJDemetra"; version="0.1.3"; sha256="1j5wxia9j2847rkca3y09lv6b5qs8m3nvvks492kwv1d5vdjlxxv"; depends=[rJava]; }; RJSDMX = derive2 { name="RJSDMX"; version="2.1-0"; sha256="1z1fhm6as9m35v11n5npv3mlaaal7w5c04g4yl2p26ljsmssfbsh"; depends=[rJava zoo]; }; RJSONIO = derive2 { name="RJSONIO"; version="1.3-1.2"; sha256="0zid1573iv25zsa93ni9r6zhbli9ymc84yvlcxnkg1j1q3vih3jm"; depends=[]; }; RJSplot = derive2 { name="RJSplot"; version="2.5"; sha256="0p2zqbq29pfjl703wqqjzgmif7yfzz7l8rzarjf5axkdy7w7fcyl"; depends=[]; }; RJaCGH = derive2 { name="RJaCGH"; version="2.0.4"; sha256="1a8nd0w73dvxpamzi2addwr6q3rxhnnpa1girnlwbd1j1dll0bz6"; depends=[]; }; + RJafroc = derive2 { name="RJafroc"; version="1.2.0"; sha256="19d6k8294g9w3i2d8mivd4p1sczhq9rc26mhz7ywz0x5fxqcpx77"; depends=[bbmle binom dplyr ggplot2 mvtnorm numDeriv openxlsx Rcpp stringr]; }; RKEA = derive2 { name="RKEA"; version="0.0-6"; sha256="1dncplg83b4zznh1zh90wr8jv5259cy93imrry86c5kqdijmhrrp"; depends=[rJava RKEAjars tm]; }; RKEAjars = derive2 { name="RKEAjars"; version="5.0-3"; sha256="0sm7dkdprmqh319jc43ra7qbk4qq0b2kdj9zs9mjcjz58gcrkl7s"; depends=[rJava]; }; - RKEEL = derive2 { name="RKEEL"; version="1.2.7"; sha256="13i753gadi9511kpfv8zb0zsgj43cy5pd47yw29nsz1jdzaafgsa"; depends=[arules doParallel foreach gdata Matrix pmml R6 rJava RKEELdata RKEELjars XML]; }; + RKEEL = derive2 { name="RKEEL"; version="1.3.1"; sha256="0k13j460jalmjdicrm7rqxb1b25cx1h4c276xbiybmhrmzmjlv5y"; depends=[arules doParallel foreach gdata Matrix pmml R6 rJava RKEELdata RKEELjars XML]; }; RKEELdata = derive2 { name="RKEELdata"; version="1.0.5"; sha256="1swzqw6j006ya48ahg6n1g8faxhqiv9v5q1zrnihpzj6868lf7y3"; depends=[]; }; RKEELjars = derive2 { name="RKEELjars"; version="1.0.19"; sha256="1a879b0xq5jk7r2pf4n41nm0c4himl4yqw083xh2ha4qdhab5kq0"; depends=[downloader]; }; + RKHSMetaMod = derive2 { name="RKHSMetaMod"; version="1.1"; sha256="1h8gqqfmlrzyj4n997yn13vqpaw2kwzl45gscy3fdhskzmyg0ss3"; depends=[Rcpp RcppEigen RcppGSL]; }; RKUM = derive2 { name="RKUM"; version="0.1.1"; sha256="1w0v6l61dm7xixnyywsc7xziixz7k9r1ja26zcy77nry5kn6v60q"; depends=[]; }; RKlout = derive2 { name="RKlout"; version="1.0"; sha256="17mx099393b1m9dl3l5xjcpzmb9n3cpjghb90m9nidccxkhacmqf"; depends=[RCurl]; }; RLRsim = derive2 { name="RLRsim"; version="3.1-3"; sha256="1r0xqay3jfg435dh9fqc6yy73wjffp658da194rx63vpfhshgz8w"; depends=[lme4 mgcv nlme Rcpp]; }; @@ -3262,7 +3305,6 @@ in with self; { RM2 = derive2 { name="RM2"; version="0.0"; sha256="1v57nhwg8jrpv4zi22fhrphw0p0haynq13pg9k992sb0c72dx70a"; depends=[msm]; }; RM2006 = derive2 { name="RM2006"; version="0.1.0"; sha256="1qjvdh89jql1fl6ia76g766y1igkshlv0slqmpi0y3bn40413snb"; depends=[]; }; RMAWGEN = derive2 { name="RMAWGEN"; version="1.3.3"; sha256="0spc0vszbxfpfp3kqdj0gnb90nvn50qwalq3mw8151b8h1swmf3l"; depends=[chron date vars]; }; - RMCriteria = derive2 { name="RMCriteria"; version="0.2.0"; sha256="1bdlvb86zqjjpfd6ixjzf9c7r8h6nmzwf646274c76a59523izxk"; depends=[dplyr ggnetwork ggplot2 gridExtra linprog lpSolve network pastecs Rcpp RcppEigen RcppNumerical]; }; RMKL = derive2 { name="RMKL"; version="1.0"; sha256="118xdnzljskyf4ibdrlhy07r1y1x5r2b0mqagqaabxs7s9503whc"; depends=[caret e1071 kernlab Rcpp RcppArmadillo]; }; RMKdiscrete = derive2 { name="RMKdiscrete"; version="0.1"; sha256="0b4adw46sn98qmy4nxv5l5svcjrp5532x7slfhhgsskqx408lzjf"; depends=[]; }; RMOA = derive2 { name="RMOA"; version="1.0.1"; sha256="1ppbwqdfxzk1ayms0rqw22l0r8vkk8av39spwpq8avgl6vssw8c4"; depends=[rJava RMOAjars]; }; @@ -3271,11 +3313,13 @@ in with self; { RMTL = derive2 { name="RMTL"; version="0.9"; sha256="08da67wvzmibziqhnlzh43sydaihk4rsq2k5hs6ih3jkkidrhlgv"; depends=[corpcor doParallel foreach MASS psych]; }; RMThreshold = derive2 { name="RMThreshold"; version="1.1"; sha256="0wkc42vcggib002ad6ch43h6avpdgl12szrrrfd2p0wl72cwn5n1"; depends=[Matrix png]; }; RMTstat = derive2 { name="RMTstat"; version="0.3"; sha256="1nn25q4kmh9kj975sxkrpa97vh5irqrlqhwsfinbck6h6ia4rsw1"; depends=[]; }; + RMaCzek = derive2 { name="RMaCzek"; version="1.0.0"; sha256="0pjpsaqm9bfggbd1wagfazgqn23k5ba43a4vv1lmqq44l4fsdgb0"; depends=[GA seriation]; }; RMallow = derive2 { name="RMallow"; version="1.0"; sha256="0prd5fc98mlxnwjhscmghw62jhq9rj5jk8qf4fnaa2a718yxf9b5"; depends=[combinat]; }; RMariaDB = derive2 { name="RMariaDB"; version="1.0.6"; sha256="19pjxgz9h3bb89ra6ha6mbnzyz1sagmm82qd57y0rbrsvwn0pk2i"; depends=[BH bit64 DBI hms plogr Rcpp]; }; RMark = derive2 { name="RMark"; version="2.2.6"; sha256="0ihidwk7fbjjh6qmrd3rjmk2yjrjdf7a53sdnh6ynkjkzlqb2gr7"; depends=[coda matrixcalc msm]; }; RMediation = derive2 { name="RMediation"; version="1.1.4"; sha256="19idqx0hwljbcfrpqwa81k7cxbd8kv77ji8yi4n4p7517jbkzma6"; depends=[e1071 lavaan MASS]; }; RMixpanel = derive2 { name="RMixpanel"; version="0.7-1"; sha256="1xwmmfvky49n1l0w3kwcyaf2h4rhzz4k5icjwvpc90fqk8sxib6a"; depends=[base64enc jsonlite RCurl uuid]; }; + RMixtCompIO = derive2 { name="RMixtCompIO"; version="4.0.0"; sha256="09s1qpism2a9ixkza53jiny9k5ysyq8vq3hvcc23nmnjncaanar2"; depends=[BH doParallel foreach Rcpp RcppEigen]; }; RMySQL = derive2 { name="RMySQL"; version="0.10.17"; sha256="1xamf99ih44dvaxg5x4ivj0hkqssmabgqd7gh8b8q1srw7yg8kbm"; depends=[DBI]; }; RNAseqNet = derive2 { name="RNAseqNet"; version="0.1.2"; sha256="07wk0i8iz3cvkiqawxhm61g3nka8adw0zrrv60zx329gg49w0ycl"; depends=[ggplot2 glmnet hot_deck igraph PoiClaClu]; }; RNAsmc = derive2 { name="RNAsmc"; version="0.4.0"; sha256="17gkhmnrxa1zwh6qhc0x48smgyq35g5gdb4wv0m5pnbyhkqzs7sq"; depends=[RRNA]; }; @@ -3292,8 +3336,8 @@ in with self; { RNentropy = derive2 { name="RNentropy"; version="1.2.2"; sha256="0chvmrvpyyghilwb63y6pd1zp94i5qhpv5w19x9nw0ypk86pp2dj"; depends=[]; }; RNetCDF = derive2 { name="RNetCDF"; version="1.9-1"; sha256="0idfskxb1k8x0zzl6b0kgskdxn7zr49gw9xcj870ah9zp93iwnkx"; depends=[]; }; RNetLogo = derive2 { name="RNetLogo"; version="1.0-4"; sha256="1z7jp454k197c0zbkn64zmf25wadkiznv3w2csgiz917cbx6xcn1"; depends=[igraph rJava]; }; - RNewsflow = derive2 { name="RNewsflow"; version="1.1.0"; sha256="15dq5xmci20il4xgbsjcgx1x9l443x6cizvzfzr1w66ab7aa4jxz"; depends=[data_table igraph Matrix quanteda Rcpp RcppEigen RcppProgress scales slam stringi tm wordcloud]; }; - RNifti = derive2 { name="RNifti"; version="0.11.0"; sha256="0zs8ffa6gpi9cygxk7xjin6k3vpvfgb540a506zlk50bf6kc5nlf"; depends=[Rcpp]; }; + RNewsflow = derive2 { name="RNewsflow"; version="1.1.1"; sha256="1vigzkyh8p6x4hzrmcsbvv2jk3pz39kix6b12xzzllkvi1kq784q"; depends=[data_table igraph Matrix quanteda Rcpp RcppEigen RcppProgress scales slam stringi tm wordcloud]; }; + RNifti = derive2 { name="RNifti"; version="0.11.1"; sha256="0jcgdg5k2swmi57aqj347kfi1fc4nvag7pxdfz61kc0vqqamm0wg"; depends=[Rcpp]; }; RNiftyReg = derive2 { name="RNiftyReg"; version="2.6.6"; sha256="0a1f2nzlw1w9hd8kdiqal1kz8jabc5wvc5l9w5z1pjfgsry4jy75"; depends=[ore Rcpp RcppEigen RNifti]; }; 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]; }; @@ -3330,6 +3374,7 @@ in with self; { ROP = derive2 { name="ROP"; version="1.0"; sha256="12gh83r3hp1qdmw3p5rr1wfhsh90pirx67q456gl9ai6zgd8nkq8"; depends=[ROCR]; }; ROSE = derive2 { name="ROSE"; version="0.0-3"; sha256="12b9grh3rgaa07blbnxy8nvy5gvpd45m43bfqb3m4k3d0655jpk2"; depends=[]; }; ROlogit = derive2 { name="ROlogit"; version="0.1.2"; sha256="09j9c24f7plzpnnhpmzdi4gapb7w1377ksjwk6i2xpyr4bfsrr5k"; depends=[evd survival]; }; + ROpenCVLite = derive2 { name="ROpenCVLite"; version="0.3.410"; sha256="09mjwv5aq1a0frzmv8lm69kzf9lldql9nqfks95a8vd1z041ndir"; depends=[devtools pkgbuild]; }; ROpenDota = derive2 { name="ROpenDota"; version="0.1.2"; sha256="17s73yj2w5hlpy09ad83m4s2d9shg5h4zg64wvbp1ivyvpp7l308"; depends=[jsonlite RCurl]; }; ROpenFIGI = derive2 { name="ROpenFIGI"; version="0.2.8"; sha256="0fvd25vsqkgi3jv4s2lnfag5qksyzyb48d7rhfw6z8piz37n4xaj"; depends=[httr jsonlite]; }; ROpenWeatherMap = derive2 { name="ROpenWeatherMap"; version="1.1"; sha256="0h1yw93v06bx8svhghh1fsrf837qax9896klh64b06djpgg9ngb9"; depends=[httr jsonlite RCurl]; }; @@ -3341,6 +3386,7 @@ in with self; { ROracle = derive2 { name="ROracle"; version="1.3-1"; sha256="07zqzwaq5iqkjcmns2ahl1l71xjlznialb3dbyl4lwsh3p3fhf2n"; depends=[DBI]; }; RPANDA = derive2 { name="RPANDA"; version="1.6"; sha256="02pf0j6nrv12jlpyn5fb81hvwllsxx9g88p5cdcvwdldwmjhralb"; depends=[ape cluster coda corpcor deSolve fields fpc geiger glassoFast igraph Matrix mvMORPH mvtnorm phytools picante pracma pspline pvclust Rmpfr TESS]; }; RPCLR = derive2 { name="RPCLR"; version="1.0"; sha256="03kpyszsjb656lfwx2yszv0a9ygxs1x1dla6mpkhcnqw00684fab"; depends=[MASS survival]; }; + RPEIF = derive2 { name="RPEIF"; version="1.0"; sha256="13psw9sjpqq55vqf09ja4xkhpb6mp9zpzbka40v2gzxr503n69rq"; depends=[ggplot2 PerformanceAnalytics Rcpp RcppArmadillo RobStatTM xts zoo]; }; RPEXE_RPEXT = derive2 { name="RPEXE.RPEXT"; version="0.0.1"; sha256="0m5ml8ywxrf66mjz6m3xp1lajd7wdq9g7xsaln8n7ykq7h5615fc"; depends=[]; }; RPEnsemble = derive2 { name="RPEnsemble"; version="0.4"; sha256="0y9g22swcz0m5jbzi87ahxw27fb3jlf3iwvxb73kkzixqlvksw9y"; depends=[class MASS]; }; RPMG = derive2 { name="RPMG"; version="2.2-2"; sha256="1hyqhyn8g43cpdvh3iyrf12dbyafp6gv64hb53hr0h1094hrvz81"; depends=[]; }; @@ -3355,13 +3401,14 @@ in with self; { RProtoBuf = derive2 { name="RProtoBuf"; version="0.4.14"; sha256="1jn288796g61sfffnrfm0nm6igyv0yixlb09yhw8fqih7qg14lnx"; depends=[Rcpp RCurl]; }; RPtests = derive2 { name="RPtests"; version="0.1.4"; sha256="1r30pslbjq3dip41la81jlin2vhxdmayg902x9ryjy554awfgh7j"; depends=[glmnet randomForest Rcpp]; }; RPublica = derive2 { name="RPublica"; version="0.1.3"; sha256="1w2pn1g44a00ls8kkzj53a739pq6vzp38px2k0yh10rlzimmb21l"; depends=[curl httr jsonlite]; }; - RPushbullet = derive2 { name="RPushbullet"; version="0.3.1"; sha256="15cb1zlfnjaf5z4dqx3xrkbkja152ah7jhs21qhvfl20qz4cyh7r"; depends=[curl jsonlite]; }; + RPushbullet = derive2 { name="RPushbullet"; version="0.3.2"; sha256="0bky2qy4pvxak8wkly6ldckx2gvirvxw2mfbig3vcgabs9l4g6pq"; depends=[curl jsonlite]; }; RPyGeo = derive2 { name="RPyGeo"; version="1.0.0"; sha256="1alqgx6blqqwxm76w05g82kc2icx8nvjw7qkdz73gf9ckgza5bb3"; depends=[magrittr purrr raster reticulate rmarkdown sf stringr]; }; RQDA = derive2 { name="RQDA"; version="0.3-1"; sha256="1kqax4m4n5h52gi0jaq5cvdh1dgl0bvn420dbws9h5vrabbw1c1w"; depends=[DBI gWidgets gWidgetsRGtk2 igraph RGtk2 RSQLite]; }; RQEntangle = derive2 { name="RQEntangle"; version="0.1.3"; sha256="178haddk8nnscy2vym3k2a3ca9lf6nl7rpjja8lxqdjninvhvwb2"; depends=[iterators itertools]; }; RQGIS = derive2 { name="RQGIS"; version="1.0.4"; sha256="0x4jilj5nbikgkcg09913v3dgnfw0aqwwx66xajsfk5lqi6w5vjz"; depends=[raster RCurl readr reticulate rgdal sf sp stringr XML]; }; RQuantLib = derive2 { name="RQuantLib"; version="0.4.9"; sha256="1pirjgnf7yzddkidk1d0gbp6f1wlag6f1bzh1rmvm6c5zkww69nl"; depends=[Rcpp zoo]; }; - RRF = derive2 { name="RRF"; version="1.9"; sha256="1j8s07h0bn8imi0g1lkdwismisd6m4v454nldjp5jl11lffyiiaq"; depends=[]; }; + RRF = derive2 { name="RRF"; version="1.9.1"; sha256="135adnf7cfs8gddmmmgmzarjzg0qfrd7l67367yhy2b1k0s5ng1w"; depends=[]; }; + RRI = derive2 { name="RRI"; version="1.0"; sha256="163imfrhx435fxw39pi4vj1fmk6g6cldlsgmwcpgfqmp45ycclpj"; depends=[Rcpp RcppArmadillo]; }; RRNA = derive2 { name="RRNA"; version="1.0"; sha256="14rcqh95ygybci8hb8ays8ikb22g3850s9f3sgx3r4f0ky52dcba"; depends=[]; }; RRPP = derive2 { name="RRPP"; version="0.4.2"; sha256="1x1vrnqsd8ab70pj63vlpiwf8c76xriggb87j7p6c7yj96syp911"; depends=[]; }; RRTCS = derive2 { name="RRTCS"; version="0.0.3"; sha256="1riz1gjx3c0pf17xwybizb94nm5zgmfsnv6np3afvw831mb1x3l9"; depends=[sampling samplingVarEst]; }; @@ -3378,13 +3425,13 @@ in with self; { RSDA = derive2 { name="RSDA"; version="2.0.8"; sha256="1lnqncjmqci6lbdm2pph6ankwb9vhwi7mvgjip2qvc2ydgyv6gy9"; depends=[abind dplyr FactoMineR ggplot2 ggpolypath glmnet lazyeval nloptr pander princurve purrr randomcoloR reshape RJSONIO rlang scales scatterplot3d sqldf stringr tibble tidyr tidyselect XML xtable]; }; RSE = derive2 { name="RSE"; version="1.3"; sha256="1dvmj1zwkbp1dj9r8kcvbd8rpknfwfdqaqc5gfl82bh823w72099"; depends=[]; }; RSEIS = derive2 { name="RSEIS"; version="3.8-3"; sha256="1qrv41r17svz7dyzz1sik5zyqck29mzzxrjhj5q6mvrwag3x7fi5"; depends=[RPMG Rwave]; }; - RSGHB = derive2 { name="RSGHB"; version="1.2.1"; sha256="07iz1i04069vdns73zn0qna7lxmc3zlpmxwvxmajwbirs9db6lc3"; depends=[MCMCpack]; }; + RSGHB = derive2 { name="RSGHB"; version="1.2.2"; sha256="16s9iahbcdqykavm5cq8n76hlpfqlljl17xwh0vrz5ac7z4z3rdz"; depends=[MCMCpack]; }; RSIP = derive2 { name="RSIP"; version="1.0.0"; sha256="1yddqbnz0av69l53y83m7rnznc42qz66fc3qrispzaajs7p9n8d7"; depends=[ncdf4 raster rasterVis rgdal sp]; }; RSKC = derive2 { name="RSKC"; version="2.4.2"; sha256="0r9gpwhzscb6rbba3dg13p78pvskahgvsd59biag0shyii3xvwpm"; depends=[flexclust]; }; RSNNS = derive2 { name="RSNNS"; version="0.4-11"; sha256="0z27rgbqa1lsxvcqyl1456mb0pigvkrx099hdqv7zr4ax4k33547"; depends=[Rcpp]; }; RSNPset = derive2 { name="RSNPset"; version="0.5.3"; sha256="1llx6anwkl4as0hdyvmsrlg9z8mkn9p1qxgs6kqs39w87gyx0j36"; depends=[doRNG fastmatch foreach qvalue Rcpp RcppEigen]; }; RSPS = derive2 { name="RSPS"; version="1.0"; sha256="0ynxhgnxsf27qm8r5d9lyd59zksnc3kvx35hy25vff8j3bg7fqgi"; depends=[gridExtra lattice plyr]; }; - RSQLite = derive2 { name="RSQLite"; version="2.1.1"; sha256="1giwk4335sc6yhj3rs8h070g1mwy38kyqyqv6vcfxvskykj7vp6z"; depends=[BH bit64 blob DBI memoise pkgconfig plogr Rcpp]; }; + RSQLite = derive2 { name="RSQLite"; version="2.1.2"; sha256="1inrhap5cs0wry2jbw42fx9wwxb3qdzlpy0ba4f6a29bs8jx9nk6"; depends=[BH bit64 blob DBI memoise pkgconfig plogr Rcpp]; }; RSSL = derive2 { name="RSSL"; version="0.8"; sha256="0pynj5jppl2bxh0hh6lhqr6s54v0ny4mabk0zrx8xzcbidlwyhn1"; depends=[cluster dplyr ggplot2 kernlab MASS Matrix quadprog Rcpp RcppArmadillo reshape2 scales tidyr]; }; RSSOP = derive2 { name="RSSOP"; version="1.1"; sha256="119xrxpaf68qdb2kj2pbaja6im2nbxsgibb1bnlpnc3fcxkmqcsf"; depends=[]; }; RSSampling = derive2 { name="RSSampling"; version="1.0"; sha256="0p10l7qmksx4ysz1jb84f9nbqzig8wxhwy33yk8hq29nb5i4c9ik"; depends=[LearnBayes]; }; @@ -3402,7 +3449,7 @@ in with self; { RSpectra = derive2 { name="RSpectra"; version="0.15-0"; sha256="1ab975scdqaxdna9sayjl6l14hz991y0pc8c8ah48w000616km8s"; depends=[Matrix Rcpp RcppEigen]; }; RSpincalc = derive2 { name="RSpincalc"; version="1.0.2"; sha256="09fjwfz1bzpbca1bpzxj18ki8wh9mrr5h6k75sc97cyhlixqd37s"; depends=[]; }; RStata = derive2 { name="RStata"; version="1.1.1"; sha256="1wx6cz4567xkfplybmbwmw25snhlaxn48yi620cv6p5xqv458yp7"; depends=[foreign]; }; - RStoolbox = derive2 { name="RStoolbox"; version="0.2.4"; sha256="1lj3jlmlg1cffkpi0x5mjl0ypppjxcsl5zamxvld9ng8m2pgkbm7"; depends=[caret codetools doParallel foreach geosphere ggplot2 raster Rcpp RcppArmadillo reshape2 rgdal rgeos sp XML]; }; + RStoolbox = derive2 { name="RStoolbox"; version="0.2.6"; sha256="1pq0vxq53x8f0358qfq1rakb59cdfi4micp7hjb9fbz95q9am8mj"; depends=[caret codetools doParallel foreach geosphere ggplot2 raster Rcpp RcppArmadillo reshape2 rgdal rgeos sp XML]; }; RStorm = derive2 { name="RStorm"; version="1.0"; sha256="1n2kiy9b8w6rnv2zmzbl22grwibf619hadf2cjq1ch7rmbr7qb65"; depends=[plyr]; }; RStripe = derive2 { name="RStripe"; version="0.1"; sha256="0vp7zsd5xm8rf7196fivb76kkmxfx3gawxlyjhn9xqv92vawivra"; depends=[httr jsonlite RCurl]; }; RSuite = derive2 { name="RSuite"; version="0.37-253"; sha256="18ddhv5wbwp9qx33zskf11q8c9grdyvm93y8lxd5jy245x5hgzph"; depends=[devtools git2r httr jsonlite logging processx roxygen2]; }; @@ -3422,7 +3469,7 @@ in with self; { RUnit = derive2 { name="RUnit"; version="0.4.32"; sha256="1wc1gwb7yw7phf8b0gkig6c23klya3ax11c6i4s0f049k42r78r3"; depends=[]; }; RVAideMemoire = derive2 { name="RVAideMemoire"; version="0.9-73"; sha256="1zjvvqdcczpnxkm6n3zxv8ysgn5x44k7w2b12yx01h2x71bwg1hg"; depends=[ade4 boot car cramer FactoMineR lme4 MASS mixOmics nnet pls pspearman vegan]; }; RVFam = derive2 { name="RVFam"; version="1.1"; sha256="0gw8rgq11zndnqmay6y3y5rmmljvwhxzm2pqa90vs5413dnchq92"; depends=[coxme kinship2 lme4 MASS Matrix survival]; }; - RVenn = derive2 { name="RVenn"; version="1.0.0"; sha256="1nk1s8zj7f8zhxp5xfa5a3drq06vqds8i0vcr04iw0s2n9qvhrwg"; depends=[ggforce ggplot2 magrittr purrr rlang]; }; + RVenn = derive2 { name="RVenn"; version="1.1.0"; sha256="016m00xv59lkwm2is32v5nr4lw5a1ymdnz34r3ffflcv9bfrc6n4"; depends=[ggforce ggplot2 magrittr pheatmap purrr rlang vegan]; }; RVideoPoker = derive2 { name="RVideoPoker"; version="0.3"; sha256="06s4dlw0pw8rcq5b31xxqdpdk396rf27mai2vpvmn585vbm1ib7a"; depends=[pixmap rpanel tkrplot]; }; RViennaCL = derive2 { name="RViennaCL"; version="1.7.1.8"; sha256="0lh23g8zyd50p6hnl4dfmzrsg48y74g2h7dism9j2n1pfd9p9k5d"; depends=[]; }; RVowpalWabbit = derive2 { name="RVowpalWabbit"; version="0.0.13"; sha256="106lr6iz28gscczs18759zaki7dnxy1873swiakimfqmwpw9dp9n"; depends=[Rcpp]; }; @@ -3441,9 +3488,10 @@ in with self; { 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]; }; RZabbix = derive2 { name="RZabbix"; version="0.1.0"; sha256="0c5803chpzvp7dk9pjfx5f0nqynb76ywakz04ah2nw07ypvcyjyr"; depends=[httr jsonlite]; }; - RZigZag = derive2 { name="RZigZag"; version="0.1.6"; sha256="1sb1lmm5vnzkbzqxbmipkm2zb01zg2x15jgyrsplardyy8kpqxn7"; depends=[Rcpp RcppEigen]; }; + RZigZag = derive2 { name="RZigZag"; version="0.2.1"; sha256="1civ8qrk5y95775vzkd2m5arqczgan584r632ixy4q76nd5wa8zc"; depends=[Rcpp RcppEigen]; }; RZooRoH = derive2 { name="RZooRoH"; version="0.2.3"; sha256="0ihfc8hxqmlkx1xhkz3psw8szwjp01imasvynxbzrjmjf4q6amvq"; depends=[data_table doParallel foreach iterators RColorBrewer]; }; RaPKod = derive2 { name="RaPKod"; version="0.9"; sha256="1qxzi2lf431zd44bcd98ybhzydy1cz12g864l6r668jk91aqy1qg"; depends=[kernlab MASS proxy Rcpp RcppArmadillo]; }; + RaProR = derive2 { name="RaProR"; version="1.1-4"; sha256="0zaswmig1fmxdsfij5hl58z2q5iw15p9w5yd9i03rdyn3gnkka4g"; depends=[]; }; RaceID = derive2 { name="RaceID"; version="0.1.3"; sha256="1kmhjqhm6v4blwnll67b79ywrpsiygipz30nylxfi0030p37bld2"; depends=[cluster coop FateID fpc ica igraph irlba locfit MASS Matrix pheatmap quadprog randomForest RColorBrewer Rtsne vegan]; }; RadData = derive2 { name="RadData"; version="1.0.0"; sha256="14npn5vjcpvymdjkby83msjr3f1gsmzh0083gz6cgrp270fglkaw"; depends=[]; }; RadOnc = derive2 { name="RadOnc"; version="1.1.5"; sha256="0yz2pzcpz32xs04xfs90i714nn28cky7701w1h99cqsxsp892jkq"; depends=[geometry oro_dicom ptinpoly rgl]; }; @@ -3472,14 +3520,14 @@ in with self; { RateDistortion = derive2 { name="RateDistortion"; version="1.01"; sha256="1micjlbir1v5ar51g1x7bgkqw9m8217qi82ii6ysgjkhwdvpm075"; depends=[]; }; RatingScaleReduction = derive2 { name="RatingScaleReduction"; version="1.2.2"; sha256="15xkfjp0bkx9wjp8y27vs0iq2ir4qxjdl8405ix59sjb6lkvv3l2"; depends=[ggplot2 pROC]; }; RationalExp = derive2 { name="RationalExp"; version="0.2.2"; sha256="0a51sfps3sfb71m93jdsmbvj6kafbyfrq790ix238j570f5xafpg"; depends=[snowfall]; }; - Rbeast = derive2 { name="Rbeast"; version="0.1"; sha256="08yzf6hny95vkhjdf9z73i23zmsxvbfshw2wpbzakp8pq2s0sb7v"; depends=[]; }; + Rbeast = derive2 { name="Rbeast"; version="0.2.1"; sha256="03m7461j816sgdr3xvv6llyblmkcnhfxsrfiraqslg197xjbj978"; depends=[]; }; Rbent = derive2 { name="Rbent"; version="0.1.0"; sha256="0xkb57dhhfd3342rv0xwbhbhn4zp5fbfch84fbh0sickm09l9vrj"; depends=[Rfit]; }; Rbgs = derive2 { name="Rbgs"; version="0.2"; sha256="1q0dnbcpgx7x9klr6z33z6g2p9p8mrmhnsqjy6qw15ch720rrgn3"; depends=[imager magrittr rJava]; }; Rbitcoin = derive2 { name="Rbitcoin"; version="0.9.2"; sha256="0ndq4kg1jq6h0jxwhpdp8sw1n5shg53lwa1x0bi7rifmy0gnh66f"; depends=[data_table digest RCurl RJSONIO]; }; RblDataLicense = derive2 { name="RblDataLicense"; version="0.2.0"; sha256="187w7pfx4f7gly1isfs5cr3m6cxzr5ml25x3775xwm3xjjsh7ylg"; depends=[RCurl xts]; }; Rblpapi = derive2 { name="Rblpapi"; version="0.3.10"; sha256="14wkrjfbjc3rb3159sz8wdvshmrh3d17s01swp59s8if7hr94hq0"; depends=[BH Rcpp]; }; Rborist = derive2 { name="Rborist"; version="0.1-17"; sha256="0vsld7qr9zl9a6fj1vwdh6avdh23vkibyng6j8q0kd3za0dibcl0"; depends=[data_table Rcpp]; }; - Rcan = derive2 { name="Rcan"; version="1.3.71"; sha256="14xfwd99z12ryn4c8pa690c3q64nsi00fl076lpbzpilh64azjnb"; depends=[data_table ggplot2 scales]; }; + Rcan = derive2 { name="Rcan"; version="1.3.72"; sha256="1c2a0p6nc040irgmg50bw0w43ad55flrni8k37avpns1m9k309h1"; depends=[data_table ggplot2 scales]; }; Rcapture = derive2 { name="Rcapture"; version="1.4-2"; sha256="1nsxy5vpfv7fj03i6l5pgzjm0cldwqxxycnvqkfkshbryjcyl0ps"; depends=[]; }; RcellData = derive2 { name="RcellData"; version="1.3-2"; sha256="1zzkgpj2pc42xzz5pspyj981a04gjpna4br3lxna255366ijgz4l"; depends=[]; }; Rcereal = derive2 { name="Rcereal"; version="1.2.1"; sha256="0nl4p0wqpni16z62610sqcxsz1x6kannl2s1zakpmjkk80pyxlk6"; depends=[]; }; @@ -3511,7 +3559,7 @@ in with self; { RcmdrPlugin_RMTCJags = derive2 { name="RcmdrPlugin.RMTCJags"; version="1.0-2"; sha256="04g5a1dpch54k5ckfkrg4vsap1nc3af1i0i559qigv3hy8n7pm80"; depends=[coda igraph Rcmdr rjags rmeta runjags]; }; RcmdrPlugin_ROC = derive2 { name="RcmdrPlugin.ROC"; version="1.0-18"; sha256="0alwsvwry4k65ps00zvdqky9rh663bbfaw15lhwydbgcpqdkn2n6"; depends=[pROC Rcmdr ResourceSelection ROCR]; }; RcmdrPlugin_RiskDemo = derive2 { name="RcmdrPlugin.RiskDemo"; version="2.0"; sha256="1mclhcb138f13p7ghiggdm8zjrgxqrn3zn8biygfy6yvhw2j396p"; depends=[demography ftsa Rcmdr rgl]; }; - RcmdrPlugin_SCDA = derive2 { name="RcmdrPlugin.SCDA"; version="1.1.1"; sha256="0lky4vmia97vcpwsvzprgmkwkdwjwnmi8bdjx3r3w6rrc2lqb6a8"; depends=[Rcmdr SCMA SCRT SCVA]; }; + RcmdrPlugin_SCDA = derive2 { name="RcmdrPlugin.SCDA"; version="1.2.0"; sha256="1yg2b5vcnf956w04phxg15a4my9hvkbc27nzyn30b2wn47ysxghj"; depends=[Rcmdr SCMA SCRT SCVA]; }; RcmdrPlugin_SLC = derive2 { name="RcmdrPlugin.SLC"; version="0.2"; sha256="1nwpzmgfla1y05dxf81w0wmvvmvcq5jn5k8phlq30920ia7ybs8g"; depends=[Rcmdr SLC]; }; RcmdrPlugin_TeachStat = derive2 { name="RcmdrPlugin.TeachStat"; version="1.0.10"; sha256="0kbbvwjyfmd14d2nxiyin934vz3n3fgbp04bb8hxpcff3sp3wbxk"; depends=[Hmisc randtests Rcmdr tcltk2 tseries]; }; RcmdrPlugin_TeachingDemos = derive2 { name="RcmdrPlugin.TeachingDemos"; version="1.1-0"; sha256="0fgl1v1g74ca14pf3mmbv26j09v7jy6ddyap5qavgiy9s8qrwrh8"; depends=[Rcmdr rgl TeachingDemos tkrplot]; }; @@ -3533,14 +3581,14 @@ in with self; { RcmdrPlugin_temis = derive2 { name="RcmdrPlugin.temis"; version="0.7.10"; sha256="02rs5xdj6g57frndc87fly0ans16584j4d0rfpy1h72655cz66ab"; 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-3"; sha256="0abmrqphrpdlc831hwbwx15z4vdgn385kxhnqlbb9v0sjmfyszsl"; depends=[slam]; }; - Rcpp = derive2 { name="Rcpp"; version="1.0.1"; sha256="015rmxns8mhmnd9wnz9bmma4iwx2sf4bcwkkp9hcgvdmblzf0vg7"; depends=[]; }; + Rcpp = derive2 { name="Rcpp"; version="1.0.2"; sha256="170jlmjrs92z5qdv58badhxycjvfjpqwwpic7rm13pc9zkb3i4xd"; depends=[]; }; Rcpp11 = derive2 { name="Rcpp11"; version="3.1.2.0"; sha256="1x6n1z7kizagr5ymvbwqb7nyn3lca4d4m0ks33zhcn9gay6g0fac"; depends=[]; }; RcppAPT = derive2 { name="RcppAPT"; version="0.0.5"; sha256="0188sabgfmgh83yr3hmqpg5cmhllfkxzbxxchqr2r2fmj6x0ib1a"; depends=[Rcpp]; }; - RcppAlgos = derive2 { name="RcppAlgos"; version="2.3.3"; sha256="0kjijcl5gkdqqf5smxcai53x9zk0praf942gllc8xj0ymjyah4z4"; depends=[gmp Rcpp RcppThread]; }; + RcppAlgos = derive2 { name="RcppAlgos"; version="2.3.4"; sha256="1rmadfvavjn17xs0fs93h2dahil5nqg0w59f4zdsnn193cwcfi7p"; depends=[gmp Rcpp RcppThread]; }; RcppAnnoy = derive2 { name="RcppAnnoy"; version="0.0.12"; sha256="1b0fmip9c4i0my1yjrvqy8jxfiiqcggq2kms135q0b53njxnqwwg"; depends=[Rcpp]; }; - RcppArmadillo = derive2 { name="RcppArmadillo"; version="0.9.500.2.0"; sha256="1lyvpb7n54ijlqns29qiixqr39334knf67cnixvlic58945glrhv"; depends=[Rcpp]; }; + RcppArmadillo = derive2 { name="RcppArmadillo"; version="0.9.600.4.0"; sha256="07jg2667xyhmp1fbcdi5nnhmkk81da76s9rlswfq4k2sjsmbfmr0"; depends=[Rcpp]; }; RcppBDT = derive2 { name="RcppBDT"; version="0.2.3"; sha256="0gnj4gz754l80df7w3d5qn7a57z9kq494n00wp6f7vr8aqgq8wi1"; depends=[BH Rcpp]; }; - RcppCCTZ = derive2 { name="RcppCCTZ"; version="0.2.5"; sha256="03r7qfhxmn20925yjvqs5cbm255yk4kbrvw16dl2r98argblcmmk"; depends=[Rcpp]; }; + RcppCCTZ = derive2 { name="RcppCCTZ"; version="0.2.6"; sha256="1bkrzdcm18z7qfkcfq5yc4s8z6a43y6cfsa09k6j9ni9bl2pd6hf"; depends=[Rcpp]; }; RcppCNPy = derive2 { name="RcppCNPy"; version="0.2.10"; sha256="175bn75akwgz3vcp0n59kiqqz7q9cwkvih241nj8v810cp4gpmkp"; depends=[Rcpp]; }; RcppCWB = derive2 { name="RcppCWB"; version="0.2.8"; sha256="15iiv5kwh7c3pprpyyvjnbj80x9245f3zmfiy41w661n3cnka68p"; depends=[Rcpp]; }; RcppClassic = derive2 { name="RcppClassic"; version="0.9.11"; sha256="0aap391fh84342s64v5k43a1vy3cwzg01q3g6ry7mmd2d5h1vv1g"; depends=[Rcpp]; }; @@ -3548,7 +3596,7 @@ in with self; { RcppDE = derive2 { name="RcppDE"; version="0.1.6"; sha256="1i9jj595nqpb16y22z2b8fcf0gq1fg0pbiisbd837p1cyw4nff69"; depends=[Rcpp RcppArmadillo]; }; RcppDL = derive2 { name="RcppDL"; version="0.0.5"; sha256="1gii00bna6k9byaax7gsx42dv1jjnkrp4clbmdq59ybq3vkvw8z2"; depends=[Rcpp]; }; RcppDist = derive2 { name="RcppDist"; version="0.1.1"; sha256="02g57xwfipdcljv06krhm02dbqn9kfyj2km6rdg0a7vq9prwdz1x"; depends=[Rcpp RcppArmadillo]; }; - RcppDynProg = derive2 { name="RcppDynProg"; version="0.1.2"; sha256="0bp2ml70wclvqm39vylawwwd8jz245cxzkv97j6wlvni16g8yprn"; depends=[Rcpp RcppArmadillo wrapr]; }; + RcppDynProg = derive2 { name="RcppDynProg"; version="0.1.3"; sha256="099hbm355d30rwxqjd7j4dfw678551dc5v4y7yy6q4xxyf527lbs"; depends=[Rcpp RcppArmadillo wrapr]; }; RcppEigen = derive2 { name="RcppEigen"; version="0.3.3.5.0"; sha256="01bz41c29591ybzqn4z88ss036ai3anh9figryvmfpqcfwbszip5"; depends=[Matrix Rcpp]; }; RcppEigenAD = derive2 { name="RcppEigenAD"; version="1.0.0"; sha256="18zm9hsfqwiicxsdm87ix3qc261ljxxn2s736p6aayx82b6vwkz6"; depends=[BH functional memoise Rcpp RcppEigen Rdpack readr]; }; RcppEnsmallen = derive2 { name="RcppEnsmallen"; version="0.1.15.0.1"; sha256="01jx7vkfj1fa2b6lwjvhjf0a78zsi5hb4viqsfrka0sg385vlark"; depends=[Rcpp RcppArmadillo]; }; @@ -3559,6 +3607,7 @@ in with self; { RcppGreedySetCover = derive2 { name="RcppGreedySetCover"; version="0.1.0"; sha256="1v84i9gsmvpkmgd4niqnzp58nhrgn2j4rggsrnlh391ikdfrl51x"; depends=[BH data_table Rcpp]; }; RcppHMM = derive2 { name="RcppHMM"; version="1.2.2"; sha256="0scdzmns1yw2gbarblzd6cbvndlysz54ff17qijiz17ql5cyzly6"; depends=[Rcpp RcppArmadillo]; }; RcppHNSW = derive2 { name="RcppHNSW"; version="0.1.0"; sha256="158a069n42pbnjrlmvqsr6bm2cfp9hxpnk3nhp3dwi9qjlq4r9bm"; depends=[Rcpp]; }; + RcppHungarian = derive2 { name="RcppHungarian"; version="0.1"; sha256="1yx7kjjampjk47l8cqpv727g0nv23dnld9n8iwf7h1myfrl3yb6h"; depends=[Rcpp]; }; RcppMLPACK = derive2 { name="RcppMLPACK"; version="1.0.10-6"; sha256="0vjx6azp3sny6nv5k1cs6vk61hmbllqw8mgvi7zn15p7ilmhsyyi"; depends=[BH Rcpp RcppArmadillo]; }; RcppMeCab = derive2 { name="RcppMeCab"; version="0.0.1.2"; sha256="0varavfbrqzma176rw0dr9v5chh7pxh5y9g0rs3v7hqnlghp22y2"; depends=[BH Rcpp RcppParallel]; }; RcppMsgPack = derive2 { name="RcppMsgPack"; version="0.2.3"; sha256="0ffdw5ckkax8j87q0ykjhyp45l7gvxjppdi73kc4r5qxvijll2g3"; depends=[BH Rcpp]; }; @@ -3575,7 +3624,7 @@ in with self; { RcppTOML = derive2 { name="RcppTOML"; version="0.1.6"; sha256="1nyv4ynryh8vcrzyq01nzj13is40bjhxazlj9ilapyjdv9h5w3bs"; depends=[Rcpp]; }; RcppThread = derive2 { name="RcppThread"; version="0.5.3"; sha256="1ndidhzzwxcg01kl867a1mm64zgxf4hiaf858zr7dfkr3gzdd3lp"; depends=[]; }; RcppXPtrUtils = derive2 { name="RcppXPtrUtils"; version="0.1.1"; sha256="0jh64c46gp99d2nsih14vx34pamc8i7gkmiy2nj94rx3sxq62yh5"; depends=[Rcpp]; }; - RcppXsimd = derive2 { name="RcppXsimd"; version="7.1.3"; sha256="15c7lbgg0n7jsbpzf808yz272ncpscncmrdrgaq7cnxhl9i9yhgi"; depends=[Rcpp]; }; + RcppXsimd = derive2 { name="RcppXsimd"; version="7.1.4"; sha256="171281f8lbdnnv3q9x5c35ak8fkrymx7llnpv88dlh742z8nny1j"; depends=[Rcpp]; }; RcppXts = derive2 { name="RcppXts"; version="0.0.4"; sha256="143rhz97qh8sbr6p2fqzxz4cgigwprbqrizxpkjxyhq8347g8p4i"; depends=[Rcpp xts]; }; RcppZiggurat = derive2 { name="RcppZiggurat"; version="0.1.5"; sha256="0zmr3nvm5j0fpwxk3x9kxpwqbr66ldfvd10zy8xlgjbslz9myvfv"; depends=[Rcpp RcppGSL]; }; Rcrawler = derive2 { name="Rcrawler"; version="0.1.9-1"; sha256="1m6b1h72h8qjqcg3lzw6im6lpnkxhjg65g9fdjjqay6vy52ynznj"; depends=[callr data_table doParallel foreach httr jsonlite selectr webdriver xml2]; }; @@ -3600,7 +3649,7 @@ in with self; { ReacTran = derive2 { name="ReacTran"; version="1.4.3.1"; sha256="05c9jfvj134gy3by7m3r1fbar0m39vaydr7d2py9cakzs44fqfpj"; depends=[deSolve rootSolve shape]; }; RealVAMS = derive2 { name="RealVAMS"; version="0.4-3"; sha256="14jqrqza7bs11y1004wzi3bxkvkdfn43d82l0cyh6py8p37rfz28"; depends=[Matrix numDeriv Rcpp RcppArmadillo]; }; Rearrangement = derive2 { name="Rearrangement"; version="2.1"; sha256="0q253nj62rl65vjsq6503r80qa2j35wac8lv7ydp9w260p28z923"; depends=[quantreg]; }; - Recon = derive2 { name="Recon"; version="0.1.0.0"; sha256="153963p75vnaikp55khr1qnhvhhpzs82hc8fyrpcglpbmymq27v7"; depends=[rootSolve]; }; + Recon = derive2 { name="Recon"; version="0.3.0.0"; sha256="11gag2bl00pcy7ysfycaa58qarh6aigznldkc4kkn2178bl4ii62"; depends=[rootSolve]; }; RecordLinkage = derive2 { name="RecordLinkage"; version="0.4-11.1"; sha256="1b5bw87h2lrf5vkd2ni75rz3dj4vjls28wys5g39aajsn55ql10k"; 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.1.5"; sha256="1b6pp1vdn7jnyl8k828dgkxrx8sy2wyhkrn4rnfavqw4qvhm0mhm"; depends=[dplyr igraph magrittr RJSONIO rlang visNetwork]; }; @@ -3620,20 +3669,20 @@ in with self; { RelimpPCR = derive2 { name="RelimpPCR"; version="0.2.4"; sha256="0svfyh313wawzqx9hfb4cg0wn2ir6nd769z1k3dckdsb8d7xkh3q"; depends=[caret ggplot2 relaimpo reshape2 Rmisc]; }; Renext = derive2 { name="Renext"; version="3.1-0"; sha256="074djs4y71667aylpgh514pzijr90rgpzm4w5ayq9cgaqz22m3am"; depends=[evd numDeriv]; }; RenextGUI = derive2 { name="RenextGUI"; version="1.4-0"; sha256="0jfg4a85j06wxk8vq2q6j8md2kcss0s7k71218gfh9vybk7hl4h6"; depends=[gWidgets gWidgetstcltk R2HTML Renext]; }; - Renvlp = derive2 { name="Renvlp"; version="2.6.5"; sha256="0yw9c5115q4vism33avgak3b63pb77x9mvk2m8gfzdkphd2v3ndv"; depends=[Rsolnp]; }; + Renvlp = derive2 { name="Renvlp"; version="2.7"; sha256="1h65m1av2z5zj5mmhrf0vspnbws2dp6s6ihyrvcrm24ipcnkvinz"; depends=[Rsolnp]; }; ReorderCluster = derive2 { name="ReorderCluster"; version="1.0"; sha256="0ss750frzvj0bm1w7zblmcsjpszhnbffwlkaw31sm003lbx9hy58"; depends=[gplots Rcpp]; }; RepeatedHighDim = derive2 { name="RepeatedHighDim"; version="2.0.0"; sha256="1n9w4jb25pm0mmsahlfhkp9jmhgp5b21l1g85gm2wbxqkjsg7g0g"; depends=[MASS nlme]; }; Replicate = derive2 { name="Replicate"; version="1.1.0"; sha256="1iqzg7aspd2h0mc4w059nfz7hcxgbbl15389isrr63zfm0kcsbf6"; depends=[metafor]; }; - Replication = derive2 { name="Replication"; version="0.1.0"; sha256="0qykpc0lr18wis0xgn16y4a99n7plwl07dlc6knmqdp27193fry5"; depends=[blavaan lavaan MASS mice quadprog rjags runjags]; }; - Repliscope = derive2 { name="Repliscope"; version="1.0.1"; sha256="10713c7z84l8n7bmckybgvanzxmrckbk040ss7hbwsjk8xyy0s60"; depends=[colourpicker ggplot2 shiny]; }; + Replication = derive2 { name="Replication"; version="0.1.1"; sha256="1jf08kd7zwsgrabg14p0ad5ga8gcr2xdiy5mgljb9hz4ffyhb6fs"; depends=[blavaan lavaan MASS mice quadprog rjags runjags]; }; + Repliscope = derive2 { name="Repliscope"; version="1.1.0"; sha256="0hij4ng77bkd979ndbhx1nqq2rfb69q23ghyd7illgvgrc79y9mr"; depends=[colourpicker ggplot2 shiny]; }; RepoGenerator = derive2 { name="RepoGenerator"; version="0.0.1"; sha256="0d6s2sqyycaqrg32xdkp3pr5i7qmvwrfrjcd7f94a9y3lz4bz5b5"; depends=[git2r httr rmarkdown rstudioapi]; }; ResistorArray = derive2 { name="ResistorArray"; version="1.0-32"; sha256="0zqnl0bbqrj5hn5ywhlqyrlz5ryql88qahlgs9989v4rljcxxlam"; depends=[]; }; - ResourceSelection = derive2 { name="ResourceSelection"; version="0.3-4"; sha256="0892p714ddx2ffxg7n81599l0qm1dhfd3vm38ivxiiii8ws4nr5v"; depends=[MASS Matrix pbapply]; }; + ResourceSelection = derive2 { name="ResourceSelection"; version="0.3-5"; sha256="1vg5fkjfwkganxf0ji70pkp071841hjgr5sjxlaky8mx7n0cy80x"; depends=[MASS Matrix pbapply]; }; RevEcoR = derive2 { name="RevEcoR"; version="0.99.3"; sha256="1nym263ynjdir5kxv35jnmki9mshlplq0sk3xnjd4ac6f1cfbfqj"; depends=[gtools igraph magrittr Matrix plyr purrr stringr XML]; }; Rexperigen = derive2 { name="Rexperigen"; version="0.2.1"; sha256="158ksnd1gvzq7ii0ys2v0wrfnr001hni0i8m77p1fn1arixgmqdw"; depends=[digest jsonlite RCurl]; }; Rfacebook = derive2 { name="Rfacebook"; version="0.6.15"; sha256="0hp2mbm0hnyasizszvh5x9hv7z2q633zck1a1gvk36nbxb1shx7c"; depends=[httpuv httr rjson]; }; - Rfast = derive2 { name="Rfast"; version="1.9.4"; sha256="08czcm7sd6p47hwffbmjcza8nhcs3xmszp404nnllyq4vc796xc0"; depends=[Rcpp RcppArmadillo RcppZiggurat]; }; - Rfast2 = derive2 { name="Rfast2"; version="0.0.2"; sha256="026gp22z8bhq422qjvzj7idkaxkwvkdmlmxxraaknfvi47sjz0fd"; depends=[Rcpp RcppArmadillo Rfast]; }; + Rfast = derive2 { name="Rfast"; version="1.9.5"; sha256="003ghzhq9jnxqdmz3fjn3r32s40lspxrsc5n004n1py1kra0fxmx"; depends=[Rcpp RcppArmadillo RcppZiggurat]; }; + Rfast2 = derive2 { name="Rfast2"; version="0.0.3"; sha256="0kl4kvj30y4ns7yvdwyhyjpznsswaq1jlb9fmvp8kdwp5ii6y9ra"; depends=[Rcpp RcppArmadillo Rfast]; }; Rfit = derive2 { name="Rfit"; version="0.23.0"; sha256="1gxxipbh7mskrqwrpk1gf1dn8mp3l1v4hgmzii44bppffnxs7slp"; depends=[]; }; Rfolding = derive2 { name="Rfolding"; version="1.0"; sha256="15lf73zxr1slin9faj9k0z8qkb1g9nb7h080nfv99gsi2ks68ssg"; depends=[]; }; Rfssa = derive2 { name="Rfssa"; version="0.0.1"; sha256="0d1lpc57msw57i78d1hcjphxlci7rsvfn6mzfkh18x3dw90md9gv"; depends=[fda lattice plot3D Rcpp RcppArmadillo]; }; @@ -3643,7 +3692,6 @@ in with self; { Rglpk = derive2 { name="Rglpk"; version="0.6-4"; sha256="19mzpyimzq9zqnbi05j79b2di3nzaln8swggs9p8sqdr60qvr3d2"; depends=[slam]; }; Rgnuplot = derive2 { name="Rgnuplot"; version="1.0.3"; sha256="0mwpq6ibfv014fgdfsh3wf8yy82nzva6cgb3zifn3k9lnr3h2fj7"; depends=[]; }; RgoogleMaps = derive2 { name="RgoogleMaps"; version="1.4.3"; sha256="06ab3lg1rwm93hkshf1vxfm8mlxq5qsjan0wx43lhnrysay65js4"; depends=[png]; }; - Rgretl = derive2 { name="Rgretl"; version="0.2.2"; sha256="18jyp4bxs96ri1a4ifd52aj0q6kd2dygz8pkajbd9whq7bn5ick6"; depends=[lubridate png xml2]; }; Rhpc = derive2 { name="Rhpc"; version="0.18-204"; sha256="0ja2cx6sa8ihxnq96qhxfp43z5zd45b8jfb0y2rzzklnd7kj9kl1"; depends=[]; }; RhpcBLASctl = derive2 { name="RhpcBLASctl"; version="0.18-205"; sha256="1ls2286fvrp1g7p8v4l6axznychh3qndranfpzqz806cm9ml1cdp"; depends=[]; }; Ricetl = derive2 { name="Ricetl"; version="0.2.5.1"; sha256="1d7229ylnxgh2rvarwga229378ja79l978zjabf3sph4cqc1b965"; depends=[devtools gWidgets gWidgetsRGtk2 plyr readr readxl stringr tidyverse writexl]; }; @@ -3664,7 +3712,7 @@ in with self; { RkMetrics = derive2 { name="RkMetrics"; version="1.3"; sha256="1k6vnr1r4h69iznib638z45gd0f8wc4g4h0ji9f0017883g77li1"; depends=[]; }; Rknots = derive2 { name="Rknots"; version="1.3.2"; sha256="1krhma8hy3l5lbm6d8rxjlj9jw1zrd16h4wy4p1clfa5vlhh3bwi"; depends=[bio3d rgl rSymPy]; }; Rlab = derive2 { name="Rlab"; version="2.15.1"; sha256="1pb0pj84i1s4ckdmcglqxa8brhjha4y4rfm9x0na15n7d9lzi9ag"; depends=[]; }; - Rlabkey = derive2 { name="Rlabkey"; version="2.3.0"; sha256="0n9cp9fnccvqsmjqa5m7dvkkzg32i6jjsbhgh30n50psmyfwc8wl"; depends=[httr jsonlite Rcpp]; }; + Rlabkey = derive2 { name="Rlabkey"; version="2.3.1"; sha256="0m5v8wf6a1pipp0xi0ajxfk0fyslbmdx3698z439g4i5hbrg0i3r"; depends=[httr jsonlite Rcpp]; }; Rlda = derive2 { name="Rlda"; version="0.2.6"; sha256="0i8n01h9072q339p1kiqhcpwphw0d2x6bsszbhgfqc2b160dk2bl"; depends=[coda doParallel foreach gtools Rcpp RcppArmadillo RcppProgress]; }; Rlgt = derive2 { name="Rlgt"; version="0.1-3"; sha256="0g610v5rch5s31gc7dy9zx4mcgsdhn82y1pmr2rs14qma0v7x515"; depends=[BH forecast Rcpp RcppEigen rstan rstantools sn StanHeaders]; }; Rlibeemd = derive2 { name="Rlibeemd"; version="1.4.1"; sha256="06bb939awawpwn4g63b9jzq5b658lsznzy272zl0fy19x62c6bwr"; depends=[Rcpp]; }; @@ -3678,12 +3726,12 @@ in with self; { Rmisc = derive2 { name="Rmisc"; version="1.5"; sha256="1ijjhfy3v91fspid77rrkc5dkcb2lav37wc3f4k5lwrn24wzy5y8"; depends=[lattice plyr]; }; Rmixmod = derive2 { name="Rmixmod"; version="2.1.2.2"; sha256="1kfhaj47igcjs3h22slk8jywq85kbm5rnj4c1jhrp03hyzy2vg0v"; depends=[Rcpp RcppEigen]; }; RmixmodCombi = derive2 { name="RmixmodCombi"; version="1.0"; sha256="0cwcyclq143938wby0aj265xyib6gbca1br3x09ijliaj3pjgdqi"; depends=[Rcpp Rmixmod]; }; - Rmosek = derive2 { name="Rmosek"; version="1.3.4"; sha256="19y7l2nch7ahb4j8hcf84ampm7jxipqim47g68v0c6hj81m7r9s2"; depends=[]; }; + Rmosek = derive2 { name="Rmosek"; version="1.3.5"; sha256="18q39n2p3gms9zqrl8g15rjjk4v64365v0rm8r7zvvivh1hy5xa0"; depends=[]; }; Rmpfr = derive2 { name="Rmpfr"; version="0.7-2"; sha256="1zq3as34r27v2yc729731997wdhxb6cs5ilmak4nmsljabnac7gc"; depends=[gmp]; }; Rmpi = derive2 { name="Rmpi"; version="0.6-9"; sha256="1rhycla98hxgnnxlxxldr1x51djak7c2jjvlrv3jcsvgwp1ymqdj"; depends=[]; }; RnavGraphImageData = derive2 { name="RnavGraphImageData"; version="0.0.4"; sha256="1k1gnkghap878fck0bbz9mm0fr4cli6lh1d11r0cf47fvl6cc4gr"; depends=[]; }; RndTexExams = derive2 { name="RndTexExams"; version="1.5"; sha256="17azzxcawqqvfdbw1i34n03bj5yla8npyi7xh3pnx22xb7sbwq3x"; depends=[data_table stringi stringr]; }; - Rnets = derive2 { name="Rnets"; version="1.0.2"; sha256="1mym5zd7717mq6dlnv9b3qry7cfa5ylp3h596dbnnq5b1rhbbfis"; depends=[data_table glasso igraph rlang stringr]; }; + Rnets = derive2 { name="Rnets"; version="1.2.1"; sha256="08441hhmf1i97z5xb9pq651y6hwr2yraiyg1ns7qkxm2svz3kwxs"; depends=[data_table glasso ICSNP igraph rlang stringr]; }; Rnightlights = derive2 { name="Rnightlights"; version="0.2.3"; sha256="014bw1xln699y0zjaf5xifc2f3yl9zgb0acv7v1qw0q478ka9aak"; depends=[cleangeo data_table doSNOW dplyr ff ffbase foreach lubridate R_utils raster readr reshape2 rgdal rgeos rvest rworldmap settings snow sp stringr xml2]; }; Rnmr1D = derive2 { name="Rnmr1D"; version="1.2.4"; sha256="0n2nqxn3js3avnln9y5718r73rplr0mcyak70gwhzw4mph2z6i26"; depends=[base64enc doParallel foreach ggplot2 igraph impute MASS MassSpecWavelet Matrix plotly plyr ptw Rcpp signal speaq XML]; }; Rnumerai = derive2 { name="Rnumerai"; version="0.3"; sha256="0zvfp9zp73gm6pflf9bx1xk1s45xwwvcd56cbris08d2zfj3b3nl"; depends=[httr lubridate]; }; @@ -3698,7 +3746,7 @@ in with self; { RobStatTM = derive2 { name="RobStatTM"; version="1.0.0"; sha256="00c79qmq9r9vqwzzv0ijzpkz9ns33xlysml62b3y4lcfz15scbx9"; depends=[DEoptimR DT fit_models ggplot2 gridExtra PerformanceAnalytics pyinit robust robustbase rrcov shiny shinyjs xts]; }; RobinHood = derive2 { name="RobinHood"; version="1.0.7"; sha256="0zvibrkqs5awyshs4r61fxbsx4h81vsslma1c6a7r85255jq9vs3"; depends=[curl dplyr httr jsonlite lubridate magrittr profvis]; }; Robocoap = derive2 { name="Robocoap"; version="0.1-1"; sha256="0aj6iv85a1zfaknjhrzf6lnf0qn726dvnj4dywg9nii1kkqrkq2w"; depends=[data_table igraph markovchain tm]; }; - RobustAFT = derive2 { name="RobustAFT"; version="1.4-3"; sha256="0x7sn2y9s6nwzlj8476irv893crwag6v4k7w3w589k33kkz5n2hp"; depends=[robustbase survival]; }; + RobustAFT = derive2 { name="RobustAFT"; version="1.4-4"; sha256="17qjfpagz0wpl8hbyksnag51nj6b9arl9mk5a56avykd2nii95kd"; depends=[robustbase survival]; }; RobustCalibration = derive2 { name="RobustCalibration"; version="0.5.1"; sha256="0wsnvryvrl37acljrda2dm1d8aynqiy66yd2i857m035whixfpqa"; depends=[Rcpp RcppEigen RobustGaSP]; }; RobustGaSP = derive2 { name="RobustGaSP"; version="0.5.7"; sha256="1zjil79a5zwi51bsrifplj2yyxpqg4v9471bsclwzyzll24c46vk"; depends=[nloptr Rcpp RcppEigen]; }; RobustRankAggreg = derive2 { name="RobustRankAggreg"; version="1.1"; sha256="1pslqyr1lji1zvcrwyax4zg2s81p1jnhfldz8mdfhsp5y7v8iar3"; depends=[]; }; @@ -3706,7 +3754,7 @@ in with self; { Rodam = derive2 { name="Rodam"; version="0.1.6"; sha256="1204zj556xciw29bn2dzndv7dfmmvdhyj5r5slgfzhsxyx0ca4i2"; depends=[RCurl]; }; RonFHIR = derive2 { name="RonFHIR"; version="0.3.1"; sha256="06sgjcm45cl1nqdglpqnfdzpiglipg5yq8rr7n3f2qnf4251q3j3"; depends=[httr jsonlite R6 stringr]; }; Rook = derive2 { name="Rook"; version="1.1-1"; sha256="00s9a0kr9rwxvlq433daxjk4ji8m0w60hjdprf502msw9kxfrx00"; depends=[brew]; }; - RootsExtremaInflections = derive2 { name="RootsExtremaInflections"; version="1.1"; sha256="11wybhw180r4zaqwfs301zwzfzprwwl4hiyhjj78l3mnxgdnmwz7"; depends=[doParallel foreach iterators]; }; + RootsExtremaInflections = derive2 { name="RootsExtremaInflections"; version="1.2.1"; sha256="0qd6cmzp8fkb75ac79xbh4032vqwax7nk7d6yykpdbn0bnk2kvdi"; depends=[doParallel foreach inflection iterators]; }; Ropj = derive2 { name="Ropj"; version="0.2-2"; sha256="1jdn4m5xfnm7z7pjchqsy1zhh6kgbi8fw2jl8hw1pckjfyzhlwhw"; depends=[Rcpp]; }; Rothermel = derive2 { name="Rothermel"; version="1.2"; sha256="0zrz2ck3q0vg0wpa4528rjlrfnvlyiy0x1gr5z1aax1by7mdj82s"; depends=[ftsa GA]; }; RoughSetKnowledgeReduction = derive2 { name="RoughSetKnowledgeReduction"; version="0.1"; sha256="0zn6y2rp78vay9zwijpzhjpyq1gmcsa13m9fcsxkd1p2c8g5rbmf"; depends=[]; }; @@ -3725,6 +3773,7 @@ in with self; { Rramas = derive2 { name="Rramas"; version="0.1-6"; sha256="16aapvz9j81lvi5ryj41bvn3wf51b0gynnzs0jpvva4m3mvzw6an"; depends=[diagram]; }; Rraven = derive2 { name="Rraven"; version="1.0.6"; sha256="01yhmanf9hixv0pm5zw219b0hrazqcnxr5bkxm2bxpn7fz0hm8zr"; depends=[NatureSounds pbapply seewave tuneR warbleR]; }; Rrdrand = derive2 { name="Rrdrand"; version="0.1-16"; sha256="0j9yyvq8r1cgwj3kw1ak6hyazr67f2q0c1m651wdm0wcvm1ajx7f"; depends=[]; }; + Rsagacmd = derive2 { name="Rsagacmd"; version="0.0.1"; sha256="15lk35kb69q55z7mjv4ar5nkfn6nkah802272jp9wvf5r5zlw5zp"; depends=[foreign magrittr minpack_lm raster rgdal rlang sf stringr XML]; }; Rsampletrees = derive2 { name="Rsampletrees"; version="1.0.2"; sha256="1wz3dp1myjkxzf9l5mfli3dfbkc2fwg70xx7m9cxa06vq0a4w5pv"; depends=[ape haplo_stats Rcpp]; }; Rsampling = derive2 { name="Rsampling"; version="0.1.1"; sha256="14rp3j7iaii4rc3jkbijmbgvlagxxqjkz3vvfwwpxix43rsi8zsk"; depends=[]; }; Rsconctdply = derive2 { name="Rsconctdply"; version="0.1.3"; sha256="12xc1laxgivv4szp8341pvhmxnzzzzc2s4jhnqsqrbx71lbd9szg"; depends=[dplyr rjson rsconnect]; }; @@ -3757,7 +3806,7 @@ in with self; { Rwhois = derive2 { name="Rwhois"; version="1.0.3"; sha256="06mx98wi6r265ykkk81hk17yjkym6ar7c2cwp962ijfk3lxwc9l4"; depends=[stringr]; }; Rwinsteps = derive2 { name="Rwinsteps"; version="1.0-1.1"; sha256="0kaxhaa65k1hkhl4kqfxyyk6v967xncrdr5hy8b808zlbqriankc"; depends=[]; }; RxCEcolInf = derive2 { name="RxCEcolInf"; version="0.1-4"; sha256="0qyhxqd5yi4d1prj0i4g3k29zi0mx6wkjx24ynb4arxw6h1vabh4"; depends=[coda lattice MASS MCMCpack mvtnorm]; }; - RxODE = derive2 { name="RxODE"; version="0.9.0-8"; sha256="0cwh5glxbiy63zq1i5yqmrv3pjb0p5yqanx46c4njghd1xgjhnq7"; depends=[assertthat brew cli crayon digest dparser ggforce ggplot2 inline lotri magrittr Matrix memoise mvnfast n1qn1 pillar PreciseSums Rcpp RcppArmadillo remotes rex sys units]; }; + RxODE = derive2 { name="RxODE"; version="0.9.1-2"; sha256="1bb8pyna64nr2383b8dn4scgyhd3pkszh87gz92g89kirc7v50c5"; depends=[assertthat brew cli crayon digest dparser ggforce ggplot2 inline lotri magrittr Matrix memoise mvnfast n1qn1 pillar PreciseSums Rcpp RcppArmadillo remotes rex sys units]; }; RxnSim = derive2 { name="RxnSim"; version="1.0.3"; sha256="0fi4aic2brfbl6rsnnfwqq7l8ygvlmr98w0v749l3djpgn7sfrig"; depends=[data_table fingerprint rcdk rJava]; }; Rxnat = derive2 { name="Rxnat"; version="1.0.6"; sha256="1wzb4dihzbyp23yggi1n7c5ikbq6h2gl9v7bgwxf00y2gwlabjx4"; depends=[httr RCurl]; }; Ryacas = derive2 { name="Ryacas"; version="0.4.1"; sha256="1gd8zmrj98r4qsnlmn3qd2pldjk5dhj3f0ybn1dijwy192g1w3vd"; depends=[Rcpp settings xml2]; }; @@ -3766,11 +3815,11 @@ in with self; { SACOBRA = derive2 { name="SACOBRA"; version="0.7"; sha256="12aj4ghs3i3ks749z0l95ipv8gi33xgggkyjf21zvnzmb1dgphys"; depends=[testit]; }; SADEG = derive2 { name="SADEG"; version="1.0.0"; sha256="02ilykbdanx1isbd80c43hqpzkckq6dg40y0rklcnck6v96qky3n"; depends=[]; }; SADISA = derive2 { name="SADISA"; version="1.1"; sha256="00qixqbbkpc8g8nmggvrknsc03v9w04nb4dlcq91fs7g76rpzs92"; depends=[DDD pracma]; }; - SAFD = derive2 { name="SAFD"; version="2.0"; sha256="1ing0zkhl7f9pdcddivp3ii2siaxrrh0al7cdh1r92r4b93kfr70"; depends=[]; }; + SAFD = derive2 { name="SAFD"; version="2.1"; sha256="078ki9wrmcf80bwhx4d56gas79xrc17a0081i13yxvjqn6w7f7jd"; depends=[]; }; SAGMM = derive2 { name="SAGMM"; version="0.2.4"; sha256="18ig7ncmrfs5cyc28xpbqk9zjhwqfp7gwix7y2v1j4j2wbdc2hzs"; depends=[lowmemtkmeans mclust MixSim Rcpp RcppArmadillo]; }; SALES = derive2 { name="SALES"; version="1.0.0"; sha256="1kjmlwa4v2i7hzm947xby9jr0irsf4c851f7jyqyhqna9c65rx0g"; depends=[Matrix]; }; SALTSampler = derive2 { name="SALTSampler"; version="1.1.0"; sha256="1lh1w5kcx2sqv5czpfypdbq5mw7pxjbdk0vyg23zzjs26ynbdkn9"; depends=[lattice]; }; - SAM = derive2 { name="SAM"; version="1.1.2"; sha256="0ywl66z9q3ra70cczz3zjxanfcb707csik765zsi1zhxhn5m1hyb"; depends=[Rcpp RcppEigen]; }; + SAM = derive2 { name="SAM"; version="1.1.2.1"; sha256="01gj9k1gf35vm11p0p590irqc5daaiwmq05rl2v3n8h2azaz1c7l"; depends=[Rcpp RcppEigen]; }; SAMCpack = derive2 { name="SAMCpack"; version="0.1.1"; sha256="1nnrfc74hd39vnb94lxwfjksmjaz62x0alc2ga46gqyygrrg57g5"; depends=[Rcpp RcppArmadillo RcppXPtrUtils Rdpack]; }; SAMM = derive2 { name="SAMM"; version="1.1.1"; sha256="175jk3s9w68ccw1h019380lp9cajfsy3zigcnplp87pcn3qg7x2i"; depends=[Rcpp RcppArmadillo]; }; SAMUR = derive2 { name="SAMUR"; version="0.6"; sha256="0iyv7ljjrgakgdmpylcxk3m3xbm2xwc6lbjvl7sk1pmxvpx3hhhc"; depends=[Matching]; }; @@ -3799,15 +3848,15 @@ in with self; { SCEPtERbinary = derive2 { name="SCEPtERbinary"; version="0.1-1"; sha256="0rab0widfndx94dn1nchhs06q0d57vq2n3xy79p130l9rgp9v489"; depends=[MASS SCEPtER]; }; SCGLR = derive2 { name="SCGLR"; version="3.0"; sha256="10hsvcjgsycap6wkp06snp2zab1ppsp78kyncpbjnm3vp84qm0nz"; depends=[ade4 expm Formula ggplot2 Matrix pROC]; }; SCI = derive2 { name="SCI"; version="1.0-2"; sha256="1jvzkdv15ifgf6a3zjfzzcgw2y2vg0wp7yhiamiaqp8xkm142w49"; depends=[fitdistrplus lmomco]; }; - SCINA = derive2 { name="SCINA"; version="1.1.0"; sha256="1j3qnjyg9igdmqh22azzibb33lhlqcmx4d5mbawns7168azrw9h9"; depends=[gplots MASS]; }; - SCMA = derive2 { name="SCMA"; version="1.2.1"; sha256="17hn3axhmd6wchh1zmgrj026y5yhg6w68d1mif38rrf5cb2wwjnq"; depends=[]; }; + SCINA = derive2 { name="SCINA"; version="1.2.0"; sha256="1gv9widjwvk5j535r1zx6f41ylpa2r4168ya580llgblx85z402d"; depends=[gplots MASS]; }; + SCMA = derive2 { name="SCMA"; version="1.3.0"; sha256="0izpbvgimqyj529nzng94p0cvmz9l545b3ra4ycc23rsbg50q315"; depends=[]; }; SCORER2 = derive2 { name="SCORER2"; version="0.99.0"; sha256="1a28wga69ip9s98ch2dqgl0qkwa3w6frmaqcvhclc360ik813mxq"; depends=[]; }; SCORPIUS = derive2 { name="SCORPIUS"; version="1.0.3"; sha256="0ppxqb6lxxb9m9m89j52d49i873kilyscdnyalrkpky1b1xh22x0"; depends=[dplyr dyndimred dynutils ggplot2 MASS Matrix mclust pbapply pheatmap princurve purrr ranger RColorBrewer reshape2 tidyr TSP]; }; SCPME = derive2 { name="SCPME"; version="1.0"; sha256="0yhsaaa349wbrswcvp7w8c52wzp7rs3528rs4wqa8b3r3fh983mh"; depends=[doParallel dplyr foreach ggplot2 Rcpp RcppArmadillo RcppProgress]; }; SCRABBLE = derive2 { name="SCRABBLE"; version="0.0.1"; sha256="15k8fqcyvbqminqf41n9wx3xm7bg8v47g5vaf65aclj5wn2gn5y2"; depends=[ggplot2 gridExtra pracma rARPACK RColorBrewer Rcpp RcppEigen reshape2]; }; SCRSELECT = derive2 { name="SCRSELECT"; version="1.3-3"; sha256="118vwnd5gggvdhq7fbs0553l84vh5mhiag41q4svprd7p0pqd9hd"; depends=[mvtnorm]; }; - SCRT = derive2 { name="SCRT"; version="1.2.2"; sha256="1x6bzcgb5blavj4zdw4jam5r8yad3plyfzk31vz9pjv39784k229"; depends=[]; }; - SCVA = derive2 { name="SCVA"; version="1.2.1"; sha256="1ixy4ybw3c9w6q8csjv27r5f9x6988zrbr2a3yybhyw8xmkszc4v"; depends=[]; }; + SCRT = derive2 { name="SCRT"; version="1.3.0"; sha256="0668hjp7m1g7nx4p3ip0z83f1qn83pz0hdkjxxsnl1a8jwgb2748"; depends=[]; }; + SCVA = derive2 { name="SCVA"; version="1.3.0"; sha256="1s29pcx8rhgsnmha78nylvzr8wbffaczb2wbc15x04vd96xp7513"; depends=[ggExtra ggplot2 plotly scales]; }; SCperf = derive2 { name="SCperf"; version="1.1.1"; sha256="1kqi3sv9ds58l20pdcnjrrbf7fin82j73yqj5rbx4kjdw560ylb2"; depends=[]; }; SDALGCP = derive2 { name="SDALGCP"; version="0.2.0"; sha256="04yqa0dlr4p6fpc4dsiqwb02j056fz9j8qwf7939b5hpg8k9qwjg"; depends=[geoR maptools mapview Matrix pdist plyr PrevMap progress raster sp spacetime spatstat splancs]; }; SDD = derive2 { name="SDD"; version="1.2"; sha256="0wzgm1hgjv5s00bpd7j387qbvn5zvyrrd5fr2rgyll4cw9p4sd33"; depends=[Hmisc rgl rpanel sm tseries]; }; @@ -3815,12 +3864,13 @@ in with self; { SDLfilter = derive2 { name="SDLfilter"; version="1.2.1"; sha256="1chvg3vh5mwsczbv2ayq9pj1my1i4m2dmr7az1hh00yvlvilfp0y"; depends=[data_table geosphere ggmap ggplot2 ggsn gridExtra maps raster sp trip]; }; SDMPlay = derive2 { name="SDMPlay"; version="1.2"; sha256="0kafj5z1fi5d824h0n23qzn8a6n8fqm3bfc0pdfypzbaj2arjz3k"; depends=[dismo gbm raster SDMTools]; }; SDMTools = derive2 { name="SDMTools"; version="1.1-221.1"; sha256="1fsgnlc7glawimzijp11j53g5bnfp1mdq9wb0754idmxcdi8a99q"; depends=[R_utils]; }; - SDMtune = derive2 { name="SDMtune"; version="0.1.0"; sha256="1x83qh9gzfq9lfysv7brzhj32y9bk3fb0i12kdb6gw8ac3ynz6jy"; depends=[cli crayon dismo ggplot2 htmltools jsonlite kableExtra maxnet progress raster rasterVis Rcpp reshape2 rgdal rJava rstudioapi scales stringr whisker]; }; + SDMtune = derive2 { name="SDMtune"; version="0.1.1"; sha256="03a09k43wi9dsr3pxbwwvcg7zsc37ls6krdcqgsk0nrkqzyd9a97"; depends=[cli crayon dismo ggplot2 htmltools jsonlite kableExtra maxnet progress raster rasterVis Rcpp reshape2 rstudioapi scales stringr whisker]; }; SDT = derive2 { name="SDT"; version="1.0.0"; sha256="1jwpfd1pnzy9wcl90qv5bgwi19shsw9064dvml9zwbif8yw8dzjj"; depends=[quadprog]; }; SDaA = derive2 { name="SDaA"; version="0.1-3"; sha256="0z10ba4s9r850fjhnrirj2jgnfj931vwzi3kw9502r5k7941lsx0"; depends=[]; }; SDraw = derive2 { name="SDraw"; version="2.1.8"; sha256="05yn0mqdv5a3zyvd6jhmkjh4w06ry8zy0libr56jmp8fcnninvyw"; depends=[deldir rgeos sp spsurvey]; }; SEA = derive2 { name="SEA"; version="1.0"; sha256="1jcjgiy8459d8f603kiipcdq6d2awfcqzdv13hrdjgxpfnd1n1ha"; depends=[data_table doParallel foreach kolmim KScorrect MASS shiny]; }; SEAsic = derive2 { name="SEAsic"; version="0.1"; sha256="1mg01sag6n1qldjvmvbasac86s7sbhi4k99kdkav2hdh6n9jg467"; depends=[]; }; + SECFISH = derive2 { name="SECFISH"; version="0.1.4"; sha256="0bzm15k3rpyfa35gwpb6041cyfhnxfc4x08aryiy50j6xwcaif7n"; depends=[ggplot2 Hmisc optimization]; }; 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="2019.1"; sha256="05ky8gixr19hajssrdvc34dxj4h38wy8ac6mghcfxcxy48vafldf"; depends=[DBI demography dplyr forcats ggplot2 labelled LaF mgcv openxlsx plyr purrr Rcpp readr reshape2 rgl RSQLite scales stringr survival tibble tidyr WriteXLS]; }; @@ -3838,6 +3888,7 @@ in with self; { SGL = derive2 { name="SGL"; version="1.2"; sha256="13lpziwkxw2qj4496lvh76d59nfnmrd371jbgz78dhy8dpzyd7c3"; depends=[]; }; SGP = derive2 { name="SGP"; version="1.9-0.0"; sha256="1nfb9sh10d4wkhzrxyq829b6dhf47pbjp0hzsixamiyjjzhrjz5x"; depends=[Cairo colorspace crayon data_table digest doParallel doRNG equate foreach gridBase gtools iterators jsonlite matrixStats plotly quantreg randomNames RSQLite sn toOrdinal]; }; SGPdata = derive2 { name="SGPdata"; version="21.0-0.0"; sha256="0yi5744nd5m255rrysp1a05darg5ac7vrjk3wyfp45cvp45gcjcb"; depends=[crayon data_table]; }; + SHAPforxgboost = derive2 { name="SHAPforxgboost"; version="0.0.1"; sha256="0lkd63k5npvdv35kw6q8smfb0afjgliy0pxx5285vh3dqp5d287y"; depends=[data_table ggExtra ggforce ggplot2 RColorBrewer xgboost]; }; SHELF = derive2 { name="SHELF"; version="1.6.0"; sha256="1w26vv2r7hd8jpfn6vi4g9z3pav4gy58akvq2vzlcxiaxwv8lvnm"; depends=[ggExtra ggplot2 ggridges gridExtra Hmisc MASS rmarkdown scales shiny shinyMatrix tidyr]; }; SHIP = derive2 { name="SHIP"; version="1.0.2"; sha256="0b83cclibdz1r7sz968nmca4najwgps9wrdlsh4gxrl7fq40k4ln"; depends=[]; }; SHT = derive2 { name="SHT"; version="0.1.1"; sha256="0mwk9vygkpc4jbjlkw0ksxdg3afckylgqmwigjcrvfgdc5is171x"; depends=[fastclime pracma Rcpp RcppArmadillo Rdpack]; }; @@ -3926,14 +3977,14 @@ in with self; { SQB = derive2 { name="SQB"; version="0.4"; sha256="12ii8xlwd2r77bj76j7l43898ras25z3plhhv106jaklhpcnk23m"; depends=[caret nnet pls rpart]; }; SQDA = derive2 { name="SQDA"; version="1.0"; sha256="0nfimk625wb64010r5r7hzr64jfwgc6rbn13wvrpn0jgayji87h6"; depends=[limma mvtnorm PDSCE]; }; SQN = derive2 { name="SQN"; version="1.0.5"; sha256="0kb8kf6g482zqdp4avwvhs3pqghfny757dbzfl1abaigmvwvx4qj"; depends=[mclust nor1mix]; }; - SQRL = derive2 { name="SQRL"; version="0.6.2"; sha256="1hdbqifc8gmgp5g3ffng83dpd62qfygcahbl55xfl185l2fzqrvm"; depends=[RODBC]; }; + SQRL = derive2 { name="SQRL"; version="0.6.3"; sha256="006ahmqrwy2ckq098klvajwfzdmnx58pw0hy1plpw4slp7a3f2ls"; depends=[RODBC]; }; SQUAREM = derive2 { name="SQUAREM"; version="2017.10-1"; sha256="10xj26x7qjyvzndnbjl5krr9wabnb9cbrnp3m7xg673g8ddr12cv"; depends=[]; }; SRCS = derive2 { name="SRCS"; version="1.1"; sha256="13zf3cqs53w68f9zc1fkb9ql84rvzn7g1hbykqrbvss8hjaq8x1r"; depends=[]; }; SRRS = derive2 { name="SRRS"; version="0.1.1"; sha256="0jv545a97q4pyl89lmhn3y0jhdzyq033mvx144x8lcgx59s7cyi3"; depends=[gtools tcltk2]; }; - SRTtools = derive2 { name="SRTtools"; version="1.0.0"; sha256="0kxsmmxm5x7qv98kx0rmihv0qps5w7j1mlxickx9mz1vk6jdmgjf"; depends=[magrittr]; }; + SRTtools = derive2 { name="SRTtools"; version="1.2.0"; sha256="1203i6nqclx0faxyvhdaapmfxy8h95jj83svxriqh1hpava5s1dy"; depends=[magrittr]; }; SSBtools = derive2 { name="SSBtools"; version="0.4.0"; sha256="0rmvqhhw5zv8za3h8m59sqz0857hryn6c1bpsl4bdnyjzjfqa675"; depends=[Matrix stringr]; }; SSDM = derive2 { name="SSDM"; version="0.2.6"; sha256="0qyx755h6rqgc6i3mw0vdaw2jx1yclkm9qxb98njkfk8if7wmbmn"; depends=[dismo e1071 earth gbm gplots mgcv nnet randomForest raster rpart SDMTools shiny shinydashboard shinyFiles sp spThin]; }; - SSDforR = derive2 { name="SSDforR"; version="1.5.6"; sha256="1fpsj2rvqdy65ccy9hbw5k7pdaysxy2kjac2dsl2js4ah3pjfdrb"; depends=[MAd MASS metafor psych TSA TTR]; }; + SSDforR = derive2 { name="SSDforR"; version="1.5.7"; sha256="0j6a7imd9q2s1szvazs1rcbs1sbhxh399wab845ilxxz12krd0zb"; depends=[MAd MASS metafor psych TSA TTR]; }; SSLASSO = derive2 { name="SSLASSO"; version="1.2-1"; sha256="0x9nbq9lsnq9g47y50z2ymfbj09l2d1lbii2cfjm76nzk3k5lb39"; depends=[]; }; SSM = derive2 { name="SSM"; version="1.0.1"; sha256="1h8yyzh5rn5jay70kyzvwirfndi049a5w28qigrjv5rxd7ml84l7"; depends=[]; }; SSN = derive2 { name="SSN"; version="1.1.13"; sha256="0hk138p1jnlda7d2wxlrf2ipkgliqlip1i5xp67aym979g0b3aaj"; depends=[BH igraph lattice maptools MASS Matrix rgdal rgeos RSQLite sp]; }; @@ -3964,6 +4015,7 @@ in with self; { SVMMatch = derive2 { name="SVMMatch"; version="1.1"; sha256="1ykwrhlid4hs466xh3kv6y2qdhgk0jiglg0l3zwk5qlni6p26zc9"; depends=[Rcpp RcppArmadillo]; }; SVN = derive2 { name="SVN"; version="1.0"; sha256="0v0nyph5llvv3k1zn1ak4kvk6mqb0xd5iamqc1xlcdzamx8rjaib"; depends=[data_table igraph memoise]; }; SWATmodel = derive2 { name="SWATmodel"; version="0.5.9"; sha256="1i48g9nbjfn30ppwyzyz3k181nscv4wx773l8mzfdwhx0nlv4kyj"; depends=[EcoHydRology]; }; + SWIM = derive2 { name="SWIM"; version="0.1.0"; sha256="1mhmffmp0nqq7p6invg4rq4wq984g55fg83ysc9ma8rl584cspyz"; depends=[ggplot2 Hmisc nleqslv plyr Rdpack reshape2 spatstat]; }; SWMPr = derive2 { name="SWMPr"; version="2.3.1"; sha256="1az6ss8wkdgq4l1cmfflajzs7z6w6140bclb289gb090pi69p7gy"; depends=[data_table dplyr ggmap ggplot2 gridExtra httr lattice maptools oce openair RColorBrewer reshape2 tictoc tidyr XML zoo]; }; SYNCSA = derive2 { name="SYNCSA"; version="1.3.3"; sha256="1g00jzghvvhnj2npplh87bwbm479mwldskhard0vjlfmagbhjm8p"; depends=[FD permute RcppArmadillo vegan]; }; SafeBayes = derive2 { name="SafeBayes"; version="1.1"; sha256="09bhd3z9ia2mvpn1h0hil00j6cm4x9y9ymxc3gj8wd4ybdi3jqlm"; depends=[]; }; @@ -4004,11 +4056,11 @@ in with self; { Select = derive2 { name="Select"; version="1.4"; sha256="1qx4wwxxwjq31vf645xvwb0y2z5h4v6ca8fcrfpaj5kc33f333v2"; depends=[ade4 FD lattice latticeExtra Rsolnp]; }; SelectBoost = derive2 { name="SelectBoost"; version="1.4.0"; sha256="14i6dgg1yqnghjjfvi7l58kqm6pry9b91sy9gkwrvfqg0nz1dpny"; depends=[Cascade glmnet igraph lars msgps Rfast]; }; SelvarMix = derive2 { name="SelvarMix"; version="1.2.1"; sha256="02d16ffw5syq0d3yiim9jgrjlz99n956zxp23idpsmq6lb2whq66"; depends=[glasso Rcpp RcppArmadillo Rmixmod]; }; - SemNetCleaner = derive2 { name="SemNetCleaner"; version="0.9.9"; sha256="1pbp1h3kqgrdwr28psbrnd8i67rbff8hyldry46511zjmc8c7zaq"; depends=[qdap]; }; + SemNetCleaner = derive2 { name="SemNetCleaner"; version="1.0.0"; sha256="0bxc6i4qa81pqfcxvms55avnnys15iwibnawckvr900pn9mns50w"; depends=[searcher SemNetDictionaries stringdist]; }; SemNetDictionaries = derive2 { name="SemNetDictionaries"; version="0.1.2"; sha256="1swrccbdzqx8yv6z1kacd8zllsma94cg4vmrc08hz6fj93bya73j"; depends=[]; }; Semblance = derive2 { name="Semblance"; version="1.1.0"; sha256="1kzrg5z3244nx9y37p092wpangni3fxpx04i5fb4dhrmav4rvgab"; depends=[DescTools fields msos PerformanceAnalytics]; }; SemiCompRisks = derive2 { name="SemiCompRisks"; version="3.3"; sha256="06anhf0kqaz4i84g73w3l4gf0q2mwi00vlkciqfbxpwgrbacplf6"; depends=[Formula MASS survival]; }; - SemiMarkov = derive2 { name="SemiMarkov"; version="1.4.5"; sha256="18ma6098zng3ckf082qhjl837g8ppn3gli8l8nfnxirg5ra8zflp"; depends=[MASS numDeriv Rsolnp]; }; + SemiMarkov = derive2 { name="SemiMarkov"; version="1.4.6"; sha256="0nga790kcrvmbrx5asp4062711x0kjsccc246l4syiiw30b769ig"; depends=[MASS numDeriv Rsolnp]; }; SemiPar = derive2 { name="SemiPar"; version="1.0-4.2"; sha256="0pa3drpvclkw81ji5m1h5arj5c2rh03dnlff97cnnr1v5kvg1i4w"; depends=[cluster MASS nlme]; }; SemiParSampleSel = derive2 { name="SemiParSampleSel"; version="1.5"; sha256="0apbg8sddz2ab9170wvf7p6cgawvp4w13r97r5q7p3hx2hylb8sw"; depends=[CDVine copula gamlss_dist magic Matrix matrixStats mgcv mvtnorm trust VGAM]; }; SenSrivastava = derive2 { name="SenSrivastava"; version="2015.6.25"; sha256="0r4p6wafnfww07kq19lfcs96ncfi0qrl8n9ncp441ri9ajwj54qk"; depends=[]; }; @@ -4036,7 +4088,7 @@ in with self; { ShinyItemAnalysis = derive2 { name="ShinyItemAnalysis"; version="1.3.1"; sha256="1s1kb1rrppk0kfqywgsmyfl32hrq9ywv8241n9d3xv88cflxz237"; depends=[corrplot cowplot CTT data_table deltaPlotR difNLR difR DT ggdendro ggplot2 gridExtra knitr latticeExtra ltm mirt moments msm nnet plotly psych psychometric reshape2 rmarkdown shiny shinyBS shinydashboard shinyjs stringr VGAM xtable]; }; ShinyTester = derive2 { name="ShinyTester"; version="0.1.0"; sha256="0wm4rl2p8ggw6v2chk9b6ygh5y8p8cwzbyra0nr0qr2ka97didp8"; depends=[dplyr purrr readr stringr tidyr visNetwork]; }; ShortForm = derive2 { name="ShortForm"; version="0.4.2"; sha256="0lfnafkkwfhqv984mrbd13inck1sdzn7rq1qdklfjwks89dx9ql9"; depends=[ggplot2 lavaan stringr tidyr]; }; - ShrinkCovMat = derive2 { name="ShrinkCovMat"; version="1.2.0"; sha256="1ybd8vm69y50lj2mkmcdyplxb689xfg4spbl129v8hlvhw69mzmy"; depends=[]; }; + ShrinkCovMat = derive2 { name="ShrinkCovMat"; version="1.4.0"; sha256="0iyri3syjk9xv49d87fdyhnxg5c5x827vnak8vgckkkp62sdln2q"; depends=[Rcpp RcppArmadillo]; }; SiER = derive2 { name="SiER"; version="0.1.0"; sha256="1ng6vnh30z6z1nvclsdzc9gdbrsrb2kqdqvs6fwm0j1zqlk12x0y"; depends=[]; }; SiMRiv = derive2 { name="SiMRiv"; version="1.0.3"; sha256="1kzvbzmqcxs0sh23nmjd39zkg68kbnc5djpbjhqhn55qjdfx5776"; depends=[mco raster rgdal sp]; }; SiZer = derive2 { name="SiZer"; version="0.1-5"; sha256="1ldl7rza58fzfbqidr1kanhfhy744nrsxrm13qdpxirdxx3vji6q"; depends=[boot]; }; @@ -4048,7 +4100,7 @@ in with self; { Sim_PLFN = derive2 { name="Sim.PLFN"; version="1.0"; sha256="1jmsydhpfv2z9cr99hfy8cairhkkxpwk4wnz1adixwxazkn7qfah"; depends=[DISTRIB FuzzyNumbers]; }; SimComp = derive2 { name="SimComp"; version="3.2"; sha256="04rmpxasaa888p6f0rhhpvpqc39fppdkcwbq5sxcslx7bwc9w9z8"; depends=[mratios multcomp mvtnorm]; }; SimCop = derive2 { name="SimCop"; version="0.7.0"; sha256="1yrdy77a9h14v92c63ng8phi2ig73wy4xjjdb75322grc0bd3jq6"; depends=[quadprog]; }; - SimCorMultRes = derive2 { name="SimCorMultRes"; version="1.6.0"; sha256="0x0wcc3nqw57xs7jiwc8bzmcwnb69dvpfp7anhx6bx607rcbxfpi"; depends=[evd]; }; + SimCorMultRes = derive2 { name="SimCorMultRes"; version="1.7.0"; sha256="10snjwrh95407iracbc52b5cvr3sp2539rrjp7fw63q50pjl285v"; depends=[evd]; }; SimCorrMix = derive2 { name="SimCorrMix"; version="0.1.1"; sha256="1mx8xkg1nbh4x4xr6m672zyg00s3lky2sy5mz7dfkw40vz2bwi53"; depends=[BB ggplot2 MASS Matrix mvtnorm nleqslv SimMultiCorrData triangle VGAM]; }; SimDesign = derive2 { name="SimDesign"; version="1.14"; sha256="0im53w0hjm7qdi4xlp8mccnjx43k819wics8gmfqqxljwna0mmmm"; depends=[foreach pbapply plyr]; }; SimEUCartelLaw = derive2 { name="SimEUCartelLaw"; version="1.0.1"; sha256="1wg9sayk55mp3f2qykvfk0cbqh050vh0n1fhpq4fmlxqll87aml9"; depends=[plot3D plot3Drgl rgl]; }; @@ -4066,7 +4118,7 @@ in with self; { SimSeq = derive2 { name="SimSeq"; version="1.4.0"; sha256="068gg484w07qb4wajik2s3z79xfj0jg5l4pz69267dxi5kzd9fas"; depends=[fdrtool]; }; SimTimeVar = derive2 { name="SimTimeVar"; version="1.0.0"; sha256="1x0lkgqwx1vz1gbyvy0hx20n638n30j0dny1iz5vs0cvviq3cdv8"; depends=[car corpcor ICC metafor miscTools mvtnorm plyr psych]; }; SimVitD = derive2 { name="SimVitD"; version="0.1.1"; sha256="0xq9qi3vf1aggcwy2hn7q57zvis6ws1z4azvgp2xsndbn7rg9qda"; depends=[poisson]; }; - SimilaR = derive2 { name="SimilaR"; version="1.0.5"; sha256="0r1nbgf44i9b901l147qx06lncn0x86ngrd9lxhnrk8jkcnkkyhd"; depends=[BH Rcpp stringi]; }; + SimilaR = derive2 { name="SimilaR"; version="1.0.6"; sha256="1cdcpl8mhzx0yp9x1djpana6fh3wi75350xdjxrikhpx1pmfl8mi"; depends=[BH Rcpp stringi]; }; 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]; }; @@ -4087,14 +4139,14 @@ in with self; { Sleuth3 = derive2 { name="Sleuth3"; version="1.0-3"; sha256="0ngwri80cwqs50wjza8qyzzwign4ag1ck7fa1x7q5x08w9x6w08m"; depends=[]; }; SmCCNet = derive2 { name="SmCCNet"; version="0.99.0"; sha256="0ixvh1pd1gzbscwg4xjlcgxq5c9vqahil0fysfjc3fnba3wiidzx"; depends=[igraph Matrix pbapply PMA]; }; SmallCountRounding = derive2 { name="SmallCountRounding"; version="0.3.0"; sha256="1cy5vbsb7a62hf8rarq5fmkqn23cf2jvsbl0hcwd68h37b8sparp"; depends=[Matrix SSBtools]; }; - SmartEDA = derive2 { name="SmartEDA"; version="0.3.1"; sha256="09wgj3nyznspjf9bllfjx0l6rnalyxlzz45bx75cbiv5hwibasqf"; depends=[data_table GGally ggplot2 gridExtra ISLR rmarkdown sampling scales]; }; + SmartEDA = derive2 { name="SmartEDA"; version="0.3.2"; sha256="153bh9igdiq93ydibmfj9xklc5qj66zsakgkynk0apnczzzipn3y"; depends=[data_table GGally ggplot2 gridExtra ISLR rmarkdown sampling scales]; }; SmartSVA = derive2 { name="SmartSVA"; version="0.1.3"; sha256="10a8s2znsg8ywqkq9fsxiyqfsprrx33pqissazp2vmabs11mg4np"; depends=[isva Rcpp RcppEigen RSpectra sva]; }; SmartSifter = derive2 { name="SmartSifter"; version="0.1.0"; sha256="16rzma87k27qg6qy39mzywdj8pzkp7r9q7bpqyikazp3fk2nmfri"; depends=[mvtnorm rootSolve]; }; SmarterPoland = derive2 { name="SmarterPoland"; version="1.7"; sha256="03vs6hcd96va9kfhl2yq77alnm33j1dxy79kgrx17hlijsy65qqv"; depends=[ggplot2 htmltools httr jsonlite rjson]; }; Smisc = derive2 { name="Smisc"; version="0.3.9.1"; sha256="1dsgn37w690xh2r4mk3nwsbnaxjnw1a5qywihridvybf58nqgs06"; depends=[doParallel plyr]; }; SmithWilsonYieldCurve = derive2 { name="SmithWilsonYieldCurve"; version="1.0.1"; sha256="0qvhd1dn2wm9gzyp6k7iq057xqpkngkb4cfmvmjqmf0vhysp371w"; depends=[]; }; SmoothHazard = derive2 { name="SmoothHazard"; version="1.4.1"; sha256="147wjxgxnijpmixrfyl8kd4scz2w1xb8dcwvpr60zg32nv22g17r"; depends=[lava mvtnorm prodlim]; }; - SmoothWin = derive2 { name="SmoothWin"; version="2.0.0"; sha256="1mkmrh9f08sgvx4zvca2q09lrwvy24bcgi72bhy1dzdc4fbpg2s5"; depends=[nlme]; }; + SmoothWin = derive2 { name="SmoothWin"; version="3.0.0"; sha256="0zq2sq0w4rs3hrra24wgbbzv88d1hx6m8q8gmc5h6nbs1172hs66"; depends=[nlme Rfast]; }; SnakeCharmR = derive2 { name="SnakeCharmR"; version="1.0.7.1"; sha256="12kzjrxjrgph95m949z6ri97nn97gh6avzqibw1jn76rsnjrhi6r"; depends=[jsonlite Rcpp stringr]; }; SnakesAndLaddersAnalysis = derive2 { name="SnakesAndLaddersAnalysis"; version="2.1.0"; sha256="0h3664h6d32q201qfyv9y2gg4fhg3azdpwpmx4qfbc10hsc1ghl9"; depends=[]; }; SnowballC = derive2 { name="SnowballC"; version="0.6.0"; sha256="0b7pqdavf5jbf8si4ybnii5fff39p3b1rb5rym05j8s48hs7sqb1"; depends=[]; }; @@ -4128,6 +4180,7 @@ in with self; { SpaTimeClus = derive2 { name="SpaTimeClus"; version="1.0"; sha256="1l204b8yd11pxwcb026xy39f4lps4sqk6mml8cybnjch8clk9djc"; depends=[Rcpp RcppArmadillo]; }; SpadeR = derive2 { name="SpadeR"; version="0.1.1"; sha256="0iy2rkq4vvps1a73kqq37zpsyl4pvl3vh07dwvpfhvp7f8nxbx99"; depends=[]; }; SparkR = derive2 { name="SparkR"; version="2.4.3"; sha256="02knqjc12ynjk7pnr7i0mcmksmn8q5pr43z6pp02qmmm018yy4rq"; depends=[]; }; + SparseBiplots = derive2 { name="SparseBiplots"; version="3.5.0"; sha256="00ynx0cr543zyx9b633cbdalza9wmfgbvvgvr8b6s5r71lpjii8f"; depends=[sparsepca]; }; SparseDC = derive2 { name="SparseDC"; version="0.1.17"; sha256="0gsfj8631s67a0r9qjjll4rbb57nzk5fwm5bbggvf0027b9hk0pp"; depends=[]; }; 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=[]; }; @@ -4139,28 +4192,28 @@ in with self; { SpatEntropy = derive2 { name="SpatEntropy"; version="0.1.0"; sha256="0nk399anjhsdki9cra650ynk6sa0366495470sawxcfs3vxmlzrl"; depends=[spatstat]; }; SpatMCA = derive2 { name="SpatMCA"; version="1.0.1.0"; sha256="1sjrm1md4lmhyq1yw3np4llkgdskw3mk667jr0k3isjmr6z88gxa"; depends=[fields MASS Rcpp RcppArmadillo RcppParallel]; }; SpatPCA = derive2 { name="SpatPCA"; version="1.2.0.0"; sha256="12b9ijbzzkhwrs7q0z5srawiskr3gdjvgdsrmsn4dhyqdzdbi8b6"; depends=[Rcpp RcppArmadillo RcppParallel]; }; - SpatialAcc = derive2 { name="SpatialAcc"; version="0.1-2"; sha256="1nyxxwvlnhz78pw31dqijp1crlar5nak5934s4h0a4sajv9syif2"; depends=[]; }; + SpatialAcc = derive2 { name="SpatialAcc"; version="0.1-3"; sha256="0nx3x4jiiwwa2983lbszpm22xgc41gcdcm967h1p9a4xz2a6wgcs"; depends=[]; }; SpatialBall = derive2 { name="SpatialBall"; version="0.1.0"; sha256="09iy1smfqnb0rd2s9a1wqgscb1plwcwwph6a8215l4zrs6svszv2"; depends=[dplyr ggplot2 hexbin lubridate RColorBrewer]; }; SpatialEpi = derive2 { name="SpatialEpi"; version="1.2.3"; sha256="0d0kyh591m3hvalqpbj67pynpb9v00kdx1idc5mw4p9hsbfs10xm"; depends=[maptools MASS Rcpp RcppArmadillo sp spdep]; }; SpatialEpiApp = derive2 { name="SpatialEpiApp"; version="0.3"; sha256="0svnnzqshk08s58ishy8xhqch44mb5svgfphkvpgysdd68dgaysr"; depends=[dplyr dygraphs ggplot2 htmlwidgets knitr leaflet mapproj maptools RColorBrewer rgdal rgeos rmarkdown shiny shinyjs SpatialEpi spdep xts]; }; - SpatialExtremes = derive2 { name="SpatialExtremes"; version="2.0-7"; sha256="1y0h1pcfqp9ynxsr3yrfbihlwm25ypyb88jmm5k2g7xvm8h9g050"; depends=[fields maps]; }; + SpatialExtremes = derive2 { name="SpatialExtremes"; version="2.0-7.2"; sha256="0aqq9ryxi4xsdqjhc1lhb7ai8szs7m2vys6nn0ygps1w3pm4xwj8"; depends=[fields maps]; }; SpatialFloor = derive2 { name="SpatialFloor"; version="1.1.0"; sha256="07mwgcvkkq478l6wxvrdjs9d578x0kgs5xy86lgy5my0xqfcv6y8"; depends=[blocksdesign fields reshape2 taRifx]; }; SpatialGraph = derive2 { name="SpatialGraph"; version="1.0-2"; sha256="0cwswa5g3a6ng8qkwi04jz9pma4i0c16m7jpq6z3djzjin0znyk2"; depends=[igraph rgeos shape sp splancs]; }; SpatialML = derive2 { name="SpatialML"; version="0.1.3"; sha256="0akip0kkd1jjid12iwmaxkhkvcfzkxmrnrsv0b6nnvpjdl1jb589"; depends=[randomForest]; }; SpatialNP = derive2 { name="SpatialNP"; version="1.1-3"; sha256="1azymigqychsydqvy2n5fplv971i1gzxfhfnclm5r5rqh0xcdp3k"; depends=[]; }; - SpatialPack = derive2 { name="SpatialPack"; version="0.3"; sha256="12mx62drwqx351x4jfvv87rxr28ggz7iw83firkzr5xwfwfgr02c"; depends=[]; }; + SpatialPack = derive2 { name="SpatialPack"; version="0.3-8"; sha256="0laixlr37048x2dr1zbk41kjp533w47khc1d9rihmlrwxrflprd0"; depends=[]; }; SpatialPosition = derive2 { name="SpatialPosition"; version="2.0.0"; sha256="00z1kbkd7as4xnzqnizaap9qga4vakx7swyayli26ghp11krgfwr"; depends=[isoband lwgeom raster rgeos sf sp]; }; SpatialTools = derive2 { name="SpatialTools"; version="1.0.4"; sha256="0jgbrzsx2klvihv65y1ycqyr8awp5kqqz4qwfyfibx3b56lzna1q"; depends=[Rcpp RcppArmadillo spBayes]; }; SpatialVS = derive2 { name="SpatialVS"; version="1.1"; sha256="1xghfiz9wmmx11ssms7zjy3ggkjmc6kkbdwp3v5wjwpwapafzdk3"; depends=[fields MASS nlme]; }; SpatialVx = derive2 { name="SpatialVx"; version="0.6-5"; sha256="1n2d686aa6y8dy1y78i6ncl9abiafj96prfgkgcv8w8jmg0d23z5"; depends=[boot CircStats distillery fastcluster fields maps smatr smoothie spatstat turboEM waveslim]; }; SpatioTemporal = derive2 { name="SpatioTemporal"; version="1.1.9.1"; sha256="1i9w1gb4klwfwas934lw0a01pyp87y7ydrlk05xgd52i4j1y9wcn"; depends=[MASS Matrix]; }; - Spbsampling = derive2 { name="Spbsampling"; version="1.2.0"; sha256="0xl1431847a0wlawaxyb81xzp91q91s6ckkfs4bq4qxfwwcawvxd"; depends=[Rcpp RcppArmadillo]; }; + Spbsampling = derive2 { name="Spbsampling"; version="1.3.0"; sha256="1jy3dbadn4aa4h7s020ydgs9pksf7h3p2q9laxaqm1ygia71n6l0"; depends=[Rcpp RcppArmadillo]; }; SpecDetec = derive2 { name="SpecDetec"; version="1.0.0"; sha256="1940pl4vm1kzszq0hwhqkwbk1xmrimjdf03acpdndy089mdg9avc"; depends=[abind]; }; SpecHelpers = derive2 { name="SpecHelpers"; version="0.2.7"; sha256="1v3v717ah2fkx9225860dwppdf5m6nnnaaa4iwmj30rn17nqr4jh"; depends=[gsubfn splancs]; }; SpeciesMix = derive2 { name="SpeciesMix"; version="0.3.4"; sha256="0d6hfmzxqcvg4fcvpsfxx36k95fwkws4rlylrixikndj2fncgwb5"; depends=[MASS numDeriv]; }; SpecsVerification = derive2 { name="SpecsVerification"; version="0.5-2"; sha256="0dnya9mzkf48clp51jrnkz6lc4fps38nn3lap7n2wcp3dvbvdycg"; depends=[Rcpp RcppArmadillo]; }; SpectralMap = derive2 { name="SpectralMap"; version="1.0"; sha256="15689023k9jzg3s7bx5m97dmn00z876amqhxsxksy8n8wf09wr57"; depends=[fields scatterplot3d]; }; - Spectrum = derive2 { name="Spectrum"; version="0.6"; sha256="19z4h7kwx0jl7nc3bqqny08k24kax2g4xi0f2z8bsn2gg073wddk"; depends=[ClusterR diptest ggplot2 RColorBrewer Rfast Rtsne umap]; }; + Spectrum = derive2 { name="Spectrum"; version="0.7"; sha256="1wkz7q1c67p25czna2s3n76gqhmcp9b3kv8i0npbrfvcahyqxwjb"; depends=[ClusterR diptest ggplot2 RColorBrewer Rfast Rtsne umap]; }; SphericalCubature = derive2 { name="SphericalCubature"; version="1.4"; sha256="14xrxhmhavz82rcixnyharnbrvdzs6rh7gbxihaxh431d90w2q3k"; depends=[abind cubature mvmesh SimplicialCubature]; }; SphericalK = derive2 { name="SphericalK"; version="1.2"; sha256="18py4ylm10s75pihjvcy7w948379zy9l9azriw7g7pyp7px29wda"; depends=[]; }; SplitReg = derive2 { name="SplitReg"; version="1.0.0"; sha256="09ni4hqyr3ng1yvb2g4wyl8vm1sa05rv649g0c9bfq6m6cx7xdvy"; depends=[Rcpp RcppArmadillo]; }; @@ -4199,8 +4252,8 @@ in with self; { StrainRanking = derive2 { name="StrainRanking"; version="1.2"; sha256="1r8avm9xajqmsy4x7pgh1yaffq7wl5i5kg75kdilydwmii6n19i0"; depends=[]; }; StratSel = derive2 { name="StratSel"; version="1.3"; sha256="0hd6q8s8aiymcd33kv0gd0a4wzr86xxdzwn18jgpyk9q8pmg8gvl"; depends=[Formula MASS memisc mnormt pbivnorm]; }; Strategy = derive2 { name="Strategy"; version="1.0.1"; sha256="0phja1r0qfvcswvw5w1x6ny86p84wkqb029fdqgw10djdm9xp0f2"; depends=[xts zoo]; }; - StratifiedBalancing = derive2 { name="StratifiedBalancing"; version="0.2.0"; sha256="0iwzvschncb2vrmsawb6i94shn2cjbkph854x1z4ykr6ddw411g2"; depends=[plyr]; }; - StratifiedMedicine = derive2 { name="StratifiedMedicine"; version="0.1.0"; sha256="153blc204hc1jdkbszvsk6799cqll7vjq6p8wp3vqpk5sf250y5b"; depends=[BART coin dplyr ggplot2 glmnet grf mvtnorm partykit ranger rpart survival survRM2 TH_data]; }; + StratifiedBalancing = derive2 { name="StratifiedBalancing"; version="0.3.0"; sha256="0pklnm0q0imdhyzhwyb4i0j441dkk4k6qqlx8d4q2xnl62drqnvv"; depends=[bnlearn plyr]; }; + StratifiedMedicine = derive2 { name="StratifiedMedicine"; version="0.1.1"; sha256="08ym6b4hfirny2xqbxlk9klin4yb9xzfafgbrqs15jiqsg9svwzl"; depends=[dplyr ggplot2 glmnet mvtnorm partykit ranger survival]; }; StratifiedRF = derive2 { name="StratifiedRF"; version="0.2.2"; sha256="0a5djia6xacs17nnr5knr1acwzicrffz73q9nvnhdmihazq8v27d"; depends=[C50 dplyr]; }; StratigrapheR = derive2 { name="StratigrapheR"; version="0.0.6"; sha256="1383gnxfsczvpazkhdq0fpv0x41jq47ksxam29yq19m2gh4afswc"; depends=[diagram dplyr GGally ggplot2 shiny stringr XML]; }; StreamMetabolism = derive2 { name="StreamMetabolism"; version="1.1.2"; sha256="1sv30i7armk7jhxg5x9lh0r9qq3xixn1k2h0q89halkh1yraal8a"; depends=[chron maptools zoo]; }; @@ -4249,7 +4302,7 @@ in with self; { SynchWave = derive2 { name="SynchWave"; version="1.1.1"; sha256="127hllvig8kcs9gr2q14crswzhacv6v2s4zrgj50qdyprj14is18"; depends=[fields]; }; Synth = derive2 { name="Synth"; version="1.1-5"; sha256="1cfvh91nz6skjk8jv04fhwv3ga9kcsfgq3mdy8lx75jkx16zr0pk"; depends=[kernlab optimx]; }; T2EQ = derive2 { name="T2EQ"; version="1.1"; sha256="1skkkryw63pfx1xslia1lczb2psja6v6hcbph4isdcksb4l4pcig"; depends=[]; }; - TAM = derive2 { name="TAM"; version="3.1-45"; sha256="0zxh6z5pvpi0c4kvhgs2s1xvxx3z0pgg1xfh2vcwmvwsqbvampmr"; depends=[CDM coda MASS mvtnorm Rcpp RcppArmadillo sfsmisc]; }; + TAM = derive2 { name="TAM"; version="3.2-24"; sha256="1m185pkz56w6shc49cm2jpc9gyks1bv7r5qpqhqnib6xbbkz01xz"; depends=[CDM Rcpp RcppArmadillo]; }; TANDEM = derive2 { name="TANDEM"; version="1.0.2"; sha256="1h6m6aq2b5m9gdy4nck4dxv75gv50pfdhxx8xifgyv0d7n8czabq"; depends=[glmnet Matrix]; }; TAQMNGR = derive2 { name="TAQMNGR"; version="2018.5-1"; sha256="0bf0sgqa53l9y2bhwg2ngiwlcgrmj0nvxchlsmcc8zin388qf4pb"; depends=[Rcpp]; }; TAR = derive2 { name="TAR"; version="1.0"; sha256="0wjh2n9x3yn9by9a6mjvkl96qy7z549g6dsqp7b4d96xwmyqxlbv"; depends=[mvtnorm]; }; @@ -4295,11 +4348,11 @@ in with self; { TOC = derive2 { name="TOC"; version="0.0-4"; sha256="1c16d4wrzir6v3c323sck6r9yz6mv1a70xamlj5ha1ydmfixcza9"; depends=[bit raster rgdal]; }; TOSTER = derive2 { name="TOSTER"; version="0.3.4"; sha256="1pxcvlw2nhh1sv0d662xc61rykf7kz7f4xjq3yrqf119gjcmps5s"; depends=[ggplot2 jmvcore R6]; }; TP_idm = derive2 { name="TP.idm"; version="1.5"; sha256="07rxn0mpar3p6blg8fd3kbvdngyz9h9n0r0lcljnfdajfzbysv7h"; depends=[]; }; - TPD = derive2 { name="TPD"; version="1.0.0"; sha256="1fwj5l519mwsffm2pw2nbpm1mnlxkxzl53i7sqy810fccw47hgag"; depends=[ggplot2 gridExtra ks mvtnorm]; }; + TPD = derive2 { name="TPD"; version="1.1.0"; sha256="1ppj6ppi0lhlz079ygjnwx1l5f36bsi8zax23ssr1w6h4csw748m"; depends=[ggplot2 gridExtra ks mvtnorm]; }; TPEA = derive2 { name="TPEA"; version="3.1.0"; sha256="1yyc3q4dyf4d8m7wi851dnxf3xnvvfnvj28kl8z8py4r4jsb2hfy"; depends=[foreach igraph Matrix MESS RCurl XML]; }; TPES = derive2 { name="TPES"; version="1.0.0"; sha256="00g1limcappjrly93x7xb1llrgaxivmiky3kw40w2fs0303ha3d7"; depends=[]; }; TPMplt = derive2 { name="TPMplt"; version="0.1.2"; sha256="1sq72b0n0bskd488z2cag6hz9p48xgkwvp43hfc2gzs5x6ca7pmn"; depends=[directlabels e1071 ggplot2 RColorBrewer rgl rowr VBTree]; }; - TPmsm = derive2 { name="TPmsm"; version="1.2.1"; sha256="1vynzb6qpp8785rdjyarhvwbkasviamhljjlnp4i0dds96wwdgx1"; depends=[KernSmooth]; }; + TPmsm = derive2 { name="TPmsm"; version="1.2.2"; sha256="1ibb3ayd808x3a562qldaww7czmfq1cd1j4g4ch5k7q38jw5x835"; depends=[KernSmooth]; }; TR8 = derive2 { name="TR8"; version="0.9.20"; sha256="01xkjl269q1qlpm8cxpnb64czcv2xhrjjwp3brhxywx07za1q8lq"; depends=[gWidgets gWidgetstcltk plyr rappdirs RCurl readxl reshape taxize XML]; }; TRADER = derive2 { name="TRADER"; version="1.2-3"; sha256="1w9m2b866dyj82s118m64q8j9a1chpq2km2pnn9mfwwj8sivgdgn"; depends=[dplR]; }; TRAMPR = derive2 { name="TRAMPR"; version="1.0-8"; sha256="0nxp8wdr7yx94fk14m0r4dh2jxcvjqp6lg02092zww5y7jlbf4ds"; depends=[]; }; @@ -4312,13 +4365,16 @@ in with self; { TSDFGS = derive2 { name="TSDFGS"; version="1.0"; sha256="1wk1j0bzcapp2pknhiichh947xs6dpkrfr2h7s1vqyzb9a0yajif"; depends=[Rcpp RcppEigen]; }; TSDT = derive2 { name="TSDT"; version="1.0.0"; sha256="0cscy8g6qab09lgzdpz9s85l7m7v5gnjf0n3h82730xzd50r4za7"; depends=[hash mlbench modeltools party rpart survival survRM2]; }; TSE = derive2 { name="TSE"; version="0.1.0"; sha256="0fzdlryb8m9h6q8w0q42wpphmvm439zxk1imqzmskm48r7w6nm7w"; depends=[]; }; + TSEind = derive2 { name="TSEind"; version="0.1.0"; sha256="0xv968a12p9riq5nk82gq1ixglb2077c99i2a5ws6s23xzs1s29h"; depends=[]; }; TSEntropies = derive2 { name="TSEntropies"; version="0.9"; sha256="1bwb3kyhzc6sxhvpagf4vjmh8ghx44lpc9ms4jwrsrzdhcvnfc7l"; depends=[]; }; TSEtools = derive2 { name="TSEtools"; version="0.1.3"; sha256="1n5dklsqsz6w31rhszrq0rrxc9mingz4haxmnjzanacvvmzsj36j"; depends=[quantmod xts]; }; + TSEwgt = derive2 { name="TSEwgt"; version="0.1.0"; sha256="0j14vja4r4qvw4f94461adi1g4igx9c0az20z6bkbkkhp79xi62l"; depends=[]; }; TSF = derive2 { name="TSF"; version="0.1.1"; sha256="0v3pq64yknp3n6lw6c87slv1avsv7rlb82gm670q4jzv5d174phv"; depends=[forecast fracdiff]; }; TSGSIS = derive2 { name="TSGSIS"; version="0.1"; sha256="0zrlin6xi6sv5qb18a0wi8lzldqlwa9lbwnra44w3jza3kakff7n"; depends=[glmnet MASS]; }; TSHRC = derive2 { name="TSHRC"; version="0.1-6"; sha256="13x5l0y0nh972p39s32dv8byds19g8265s2mphbrzz1v59aq0xk3"; depends=[]; }; TSMCP = derive2 { name="TSMCP"; version="1.0"; sha256="1wzi6wzd8l5bkm0qc1mfvj067xywm208xl6r87a4svcn1ydr4vl4"; depends=[lars plus]; }; TSMN = derive2 { name="TSMN"; version="1.0.0"; sha256="12wgcc7szbcbk3d1a17wz96rlwp5l39cn0i03hjsb0sbrs7mjwg5"; depends=[]; }; + TSMSN = derive2 { name="TSMSN"; version="0.0.1"; sha256="0zy9r6i1p161h1zh0vnz1npsh48q3nc2c5hcgzvf78nfznnn6wg1"; depends=[mvtnorm numDeriv progress sn]; }; 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-7"; sha256="0rxxhvqi55869dg2p82hzg5kvgcqf9h60cjcg00k3pv9aw4x07kb"; depends=[foreach]; }; @@ -4334,13 +4390,15 @@ in with self; { TScompare = derive2 { name="TScompare"; version="2015.4-1"; sha256="0jmxnrbsdg368f29bp70rc9i88si5zjblbcn8rcjyn2k9vpd3q2f"; depends=[DBI tfplot tframe TSdbi]; }; TSdata = derive2 { name="TSdata"; version="2016.8-1"; sha256="199dy4phc6z0kzbp4kks55519c3xgsx4dkwrypr9sg8xhprrwnib"; depends=[]; }; TSdbi = derive2 { name="TSdbi"; version="2017.4-1"; sha256="0vwx2wyls4byyp67q9bp1psxdq5jnlimwk2162khk6daaxs14aiv"; depends=[DBI tframe]; }; - TSdist = derive2 { name="TSdist"; version="3.5"; sha256="1drql61vh0qwmcxxp07rfsz1bd7zqn1zqx5mh0zczshv91blm0bi"; depends=[cluster dtw KernSmooth locpol longitudinalData pdc proxy TSclust xts zoo]; }; + TSdist = derive2 { name="TSdist"; version="3.6"; sha256="13asbgak6p0zyfigz1j2paw7qm2l02186cgblixrcp6jj8q8mm0l"; depends=[cluster dtw KernSmooth locpol longitudinalData pdc proxy TSclust xts zoo]; }; TSeriesMMA = derive2 { name="TSeriesMMA"; version="0.1.1"; sha256="0dkrz3m5lh872c0q9nw4h0p6g4j1j9fn92hz8xlifpsbsyzpz63b"; depends=[]; }; TSfame = derive2 { name="TSfame"; version="2015.4-1"; sha256="197v123mkxr7qlksnb5iadms5zbc8xqbpgr2cspb8x1krz6phssz"; depends=[DBI fame tframe tframePlus tis TSdbi]; }; TSmisc = derive2 { name="TSmisc"; version="2016.8-1"; sha256="0xvn6qlvvdc65l356r8b5ppddjd35k9fc4b5w5wn3j5wzxfllbk1"; depends=[DBI gdata quantmod tframe tframePlus TSdbi tseries zoo]; }; TSodbc = derive2 { name="TSodbc"; version="2015.4-1"; sha256="0m6r97gs483jg6jlmfkbzxg3jvf6q140kvpidjccj224zb1sqlcq"; depends=[DBI RODBC tframe tframePlus TSdbi TSsql]; }; + TSplotly = derive2 { name="TSplotly"; version="1.1.1"; sha256="0amy8lmxl4mid6f5jhd0mcaqwpr8smxj0wa5561md15ix4qnvwmi"; depends=[dcemriS4 forecast ggplot2 plotly prettydoc zoo]; }; TSrepr = derive2 { name="TSrepr"; version="1.0.3"; sha256="1sbspq2pyyrc9zh2dx8nq3yv58rwziv2a2j1jfgkz8v9zqrsbhqf"; depends=[dtt MASS mgcv quantreg Rcpp wavelets]; }; TSsdmx = derive2 { name="TSsdmx"; version="2016.8-1"; sha256="06h1iwgshiq4bvly5l1nrddrh2knc82z2aqxh8ls9ipbs7qjsvaf"; depends=[DBI rJava RJSDMX tframe tframePlus TSdbi]; }; + TSsmoothing = derive2 { name="TSsmoothing"; version="0.1.0"; sha256="1m4y6hfw5ghqmvbnha05w6k0abbr08xdcahmh897g68b06vcrjsl"; depends=[ggplot2 gridExtra MASS Matrix]; }; TSsql = derive2 { name="TSsql"; version="2017.4-1"; sha256="0f71q6gqfx4r3ghsmr572cvkpmf2xf7kipf10ii99z1y23dxmsdn"; depends=[DBI tframe tframePlus TSdbi zoo]; }; TSstudio = derive2 { name="TSstudio"; version="0.1.4"; sha256="0cc59f7zw5plyj35svh6vr3id0j8c8ywihz5ms9c1gpfiq101a9w"; depends=[bsts data_table dplyr forecast forecastHybrid future future_apply lubridate magrittr plotly purrr RColorBrewer reshape2 scales tidyr viridis xts zoo]; }; TTAinterfaceTrendAnalysis = derive2 { name="TTAinterfaceTrendAnalysis"; version="1.5.4"; sha256="0r79qbmn4z9v4f4g737xs3mhc4dp6s6llkcz6c3hihwnq1vrvd7h"; depends=[e1071 lubridate multcomp mvtnorm nlme pastecs relimp reshape rkt tcltk2 zoo]; }; @@ -4376,9 +4434,9 @@ in with self; { TempleMetrics = derive2 { name="TempleMetrics"; version="1.2.0"; sha256="0g8a799grsjqyq55pnlgixyq2qxhvl5k01jcjwc08q54w2dg0xf0"; depends=[BMisc pbapply]; }; Temporal = derive2 { name="Temporal"; version="0.1.1"; sha256="0x001apiph67cyh2ckx2k9mi6jb86agnmfvn94i27q9lpy4cn1sh"; depends=[expint numDeriv plyr Rcpp RcppEigen]; }; Ternary = derive2 { name="Ternary"; version="1.1.1"; sha256="1l5hhr89n8yp62a5azdd2b828x48qmasspzmcrd20w5194n6jpcw"; depends=[viridisLite]; }; - TestCor = derive2 { name="TestCor"; version="0.0.0.9"; sha256="0734lkpk2kx4lpbr8rqiwrzdxcy22v3515v2dn3cna4fhk85isxs"; depends=[MASS Rcpp]; }; + TestCor = derive2 { name="TestCor"; version="0.0.1.0"; sha256="0jqx74khjw8d3gvw5kn3yqfps877043d9wa6ffb33b5x7nfnj4hj"; depends=[MASS Rcpp]; }; TestDataImputation = derive2 { name="TestDataImputation"; version="1.1"; sha256="10b1g9m2s6nbs8lrpcx3s1jf0fmqyd07mg3vx1pnma8r3vwy1yh7"; depends=[Amelia mice]; }; - TestDimorph = derive2 { name="TestDimorph"; version="0.1.0"; sha256="18dfq7m7yv5kv1l0a2xjb5gd3bmmalfixsnjgi70bhi3lsma0wlx"; depends=[biotools plyr purrr reshape2 rowr]; }; + TestDimorph = derive2 { name="TestDimorph"; version="0.2.0"; sha256="1ckcfr4il1bcjcwvri35wj1bps4nxy1s959n40mx41211khj0rz1"; depends=[caret corrplot dplyr klaR MASS mda plyr purrr reshape2 Rfast rlang rowr stringr truncnorm]; }; TestFunctions = derive2 { name="TestFunctions"; version="0.2.0"; sha256="018nkz8r6vqahrzq3d588i3ffb1bmd1pdk87j4ivcdsx99mq15sn"; depends=[]; }; TestScorer = derive2 { name="TestScorer"; version="1.7.2"; sha256="006c3g3gx55mfr93srldwvgz5vm6nkr3f57yi4qg6krn0d32865f"; depends=[]; }; TestingSimilarity = derive2 { name="TestingSimilarity"; version="1.0"; sha256="1fagy9168cz09p460pa0qyn8m79zg4i2b9j5vg8gm1ssqi2znsl9"; depends=[alabama DoseFinding lattice]; }; @@ -4405,7 +4463,6 @@ in with self; { TimeVTree = derive2 { name="TimeVTree"; version="0.3.1"; sha256="124kg9zcq4b2j4qvg9f6gykbmzf69qjnnw54nv213ip2h4rdkv32"; depends=[survival]; }; TimeWarp = derive2 { name="TimeWarp"; version="1.0.15"; sha256="1v6f6d1h9dc8npdy0ph5hhc4jjkzh8kac48lz4ahgngi9n0xwql9"; depends=[]; }; Tinflex = derive2 { name="Tinflex"; version="1.5"; sha256="15nbzr3q8rfrqywvlqi48r30fgq4lhlhp1fbnf12j49k6q2aixb1"; depends=[]; }; - TipDatingBeast = derive2 { name="TipDatingBeast"; version="1.0-8"; sha256="1yx4jyh3a5s4h8anvd6pc73fzzcfdll4kp89b2xi0i01yswx22pd"; depends=[DescTools mclust TeachingDemos]; }; TippingPoint = derive2 { name="TippingPoint"; version="1.1.0"; sha256="1f5bfag892yk47r1pw2rlvqz9qnkaz8radprpxh0q0knviw3f9fp"; depends=[bayesSurv ggplot2 RColorBrewer reshape2]; }; Tlasso = derive2 { name="Tlasso"; version="1.0.1"; sha256="0flx4l7q3qndp77349ayfrszyim7mvs7yfvv3j9a1mhf3gdn9j14"; depends=[expm huge igraph rTensor]; }; TmCalculator = derive2 { name="TmCalculator"; version="1.0.0"; sha256="067xcpik00r6cdb4q1z09dgdqacyxqg21xn9nzvqfnp6s3nw6a9s"; depends=[]; }; @@ -4418,7 +4475,7 @@ in with self; { TotalCopheneticIndex = derive2 { name="TotalCopheneticIndex"; version="1.0.1"; sha256="0yc21vs10rzmwx0z6d0gyyncr25835vb7wpn392csc5big6d73xc"; depends=[memoise]; }; TraMineR = derive2 { name="TraMineR"; version="2.0-12"; sha256="11bgksw8bps9s5kmp9kyfh3pdxbqiq1iq21jl1j7i4m62bgrwyhn"; depends=[boot cluster Hmisc RColorBrewer]; }; TraMineRextras = derive2 { name="TraMineRextras"; version="0.4.5"; sha256="1xi2il33qklkjviayz644iwghpak0nvzakqfaln5l8gsg33gk7lg"; depends=[cluster RColorBrewer survival TraMineR]; }; - TrackReconstruction = derive2 { name="TrackReconstruction"; version="1.1"; sha256="1f2l3nshb6qrhyczw5rxqqzmsjxf0rvv3y78j8d9lv1nnd9kxzq5"; depends=[fields RColorBrewer]; }; + TrackReconstruction = derive2 { name="TrackReconstruction"; version="1.2"; sha256="1kpdiwwzxsdwv5255xlvcnxvnp39ky0aws41g1l5i7cpbv88kca5"; depends=[fields RColorBrewer]; }; Trading = derive2 { name="Trading"; version="1.2"; sha256="0wlwpf1iygcs0cy7ms57b1bbp8f3s193bvc6fcm31ih5ph8pr48i"; depends=[]; }; TrafficBDE = derive2 { name="TrafficBDE"; version="0.1.0"; sha256="1lnh9lbjxaradivnd1dkd2szggjh2r4v7klpyxb862dxsmdxxrqw"; depends=[caret data_table dplyr lubridate neuralnet RCurl zoo]; }; Traitspace = derive2 { name="Traitspace"; version="1.1"; sha256="1wlrpnzb39vgkqy0ynbwlgrkkqgklrk6pw7f8p7p2i132qk2c291"; depends=[mclust permute]; }; @@ -4446,7 +4503,7 @@ in with self; { TukeyRegion = derive2 { name="TukeyRegion"; version="0.1.2"; sha256="03lik9vkah3hjhn0l4ci95v2h4q8mnziq006idipn69l4gmnddxl"; depends=[bfp BH ddalpha MASS Rcpp rgl Rglpk]; }; TunePareto = derive2 { name="TunePareto"; version="2.5"; sha256="0v1ylh4m5s80zp346pxxlvhm5070w83mlzfxjyp4n000c8r2nkf4"; depends=[]; }; TurtleGraphics = derive2 { name="TurtleGraphics"; version="1.0-8"; sha256="0h77pj7rs3lrqi1y2dm1cbrmj13mjpq6y5nw8bcq0s2kbnkfw67l"; depends=[]; }; - Tushare = derive2 { name="Tushare"; version="0.1.1"; sha256="0iz3wa11i8k4ss9iayab0vn80aq1ll8darmpkw0qpia8j50kcb2s"; depends=[data_table forecast httr tidyverse]; }; + Tushare = derive2 { name="Tushare"; version="0.1.2"; sha256="1ai218cjw1hsxw75cc84w11y3gljccjsflwbnxp4mhr0af3lp2r3"; depends=[data_table forecast httr tidyverse]; }; TwoCop = derive2 { name="TwoCop"; version="1.0"; sha256="1ycxq8vbp68z82r2dfg2wkc9zk3bn33d94xay20g2p55lnzl2ifd"; depends=[]; }; TwoPhaseInd = derive2 { name="TwoPhaseInd"; version="1.1.1"; sha256="0xsqiq4x7vmhif9j8zi1smbchwm4fsbgb10i4vxi0biijybizk9z"; depends=[survival]; }; TwoRegression = derive2 { name="TwoRegression"; version="0.1.2"; sha256="0qr9zrfmbh4c4207gvwa384q5njjx6nsl6lc58d25m8bkfalifpi"; depends=[data_table dplyr magrittr seewave]; }; @@ -4455,11 +4512,12 @@ in with self; { UBCRM = derive2 { name="UBCRM"; version="1.0.1"; sha256="1h9f8wlxdgb67qqqnfhd9gfs4l2cq84vajhcb0psva0gwdd1yf6i"; depends=[]; }; UBL = derive2 { name="UBL"; version="0.0.6"; sha256="0238irg7r3g248h4x4bdb308wvfqq99hwykywf4k2bssdd25kwjk"; depends=[automap gstat MBA randomForest sp]; }; UCR_ColumnNames = derive2 { name="UCR.ColumnNames"; version="0.1.0"; sha256="1nwwq93f60r9aik51l7mzckg81f81nz5kgzynyzp5sm4y2wmpzwn"; depends=[]; }; - UCSCXenaShiny = derive2 { name="UCSCXenaShiny"; version="0.1.1"; sha256="0y655ixxqm6rka3dk3i7arrapy0qiafics58dklnhb99riadpzqf"; depends=[dplyr DT ggplot2 magrittr plotly RColorBrewer shiny shinyBS shinyjs shinythemes UCSCXenaTools zip]; }; - UCSCXenaTools = derive2 { name="UCSCXenaTools"; version="1.2.3"; sha256="0zl45fxjimxq6f2923xp5vmqghraf5agzdaagxqmfkshc26xr6a2"; depends=[dplyr DT httr jsonlite magrittr readr shiny shinydashboard]; }; + UCSCXenaShiny = derive2 { name="UCSCXenaShiny"; version="0.2.0"; sha256="04v5px1ph8529xn93bhr2r6kmfdr96xzbp3wnyr6i3a9rf3kdlb0"; depends=[dplyr DT ggplot2 ggpubr magrittr plotly RColorBrewer shiny shinyBS shinyjs shinythemes tibble UCSCXenaTools zip]; }; + UCSCXenaTools = derive2 { name="UCSCXenaTools"; version="1.2.5"; sha256="1l7jblnwsywmkmjb7iqzyv0hbr9ldls374hcz4wynw1fbl66zk94"; depends=[dplyr httr jsonlite magrittr readr rlang]; }; UKgrid = derive2 { name="UKgrid"; version="0.1.1"; sha256="1p2s49lj1b2nyp8m8mif8cfsgxli8ii649gix1hlyn73gzrm8mjj"; depends=[data_table dplyr lubridate magrittr rlang xts zoo]; }; UNCLES = derive2 { name="UNCLES"; version="2.0"; sha256="0c61sm09dh0yfrjrjjnizg7qrf8xgc1zdldwhjh64kq8k8g5wa69"; depends=[class kohonen pdist]; }; UNF = derive2 { name="UNF"; version="2.0.6"; sha256="0sr740dhfp7z9wvhajww43g5gz79x5y5dbflw5a813jgmiqm1jyq"; depends=[base64enc digest]; }; + UNPaC = derive2 { name="UNPaC"; version="1.0.0"; sha256="0mm5fqc5rdf24xw5kkh54nc3a0vp4vigkhl8wj14nyiw4xzi67lr"; depends=[glasso]; }; UPMASK = derive2 { name="UPMASK"; version="1.2"; sha256="160rsb0nbndf61khcs3s8xv9nj7ln8zl6l11157ywdcjqd2q5qnq"; depends=[DBI dimRed loe MASS RSQLite]; }; UPSvarApprox = derive2 { name="UPSvarApprox"; version="0.1.1"; sha256="1lm3xzj70s070ag2sk24nq5ayckk3mnqfmwppbhq5i4y13fw6vip"; depends=[]; }; USAboundaries = derive2 { name="USAboundaries"; version="0.3.1"; sha256="1mqbxkv347307mbvn70929bi3l8wmiwrp86rxdgy45g2ddjdcb6s"; depends=[]; }; @@ -4477,23 +4535,24 @@ in with self; { Umpire = derive2 { name="Umpire"; version="1.3.7"; sha256="1yg1vrz36jgni7pkl4ch095ckcdx177j2w28zb7s8scjpvm20h3z"; depends=[]; }; UncDecomp = derive2 { name="UncDecomp"; version="0.0.4"; sha256="1v29y64jm3axllwy0cgmyki6ii3ph2zyvcgbzv1pdrgxgj14qhck"; depends=[]; }; UncerIn2 = derive2 { name="UncerIn2"; version="2.0"; sha256="08cg7armz9xwwn1222aws98cwrvmw0s73pxpnszmrmrli1qs92k1"; depends=[automap fields geoR gstat RandomFields Rcpp sp]; }; - UncertainInterval = derive2 { name="UncertainInterval"; version="0.4.7"; sha256="0b7mx919lbj12zrj8l01wfrdpqiq7s7p9q25alp7yf4jpv9w4vfa"; depends=[nloptr reshape2 rootSolve]; }; + UncertainInterval = derive2 { name="UncertainInterval"; version="0.5.0"; sha256="11vwf45bhgzzriwjjzjvbbwpzknbf6xl5s9ng7gxh58q20jy038j"; depends=[nloptr reshape2 rootSolve zoo]; }; UniDOE = derive2 { name="UniDOE"; version="1.0.2"; sha256="14jz4acrvbv59sbr7gya8g0z749vv0i04gl5wl0y4218byjvw6bs"; depends=[Rcpp]; }; UniIsoRegression = derive2 { name="UniIsoRegression"; version="0.0-0"; sha256="0lmrmb9sbk41ak7sbcrzhfnijb1skgb4lqg9m9imc98lcp69h7z0"; depends=[Rcpp]; }; Unicode = derive2 { name="Unicode"; version="12.0.0-1"; sha256="1wpzj5jwmb9d9iz1xvgn8mc2xjri28g97k4lpafybb1v4xnxqk54"; depends=[]; }; + UniprotR = derive2 { name="UniprotR"; version="1.0.1"; sha256="03r375cy36vjlcksvjwhrgi2vh6gvycbp9ml5x0jmgfi729drdqd"; depends=[ggplot2 httr magick plyr scales]; }; UnitCircle = derive2 { name="UnitCircle"; version="0.1.3"; sha256="0z5ssps8l5ka4aw4984qml15scw4pfssara5dls82afhfhpkszsr"; depends=[]; }; UnivRNG = derive2 { name="UnivRNG"; version="1.2"; sha256="0cx6bdzzypxnaqi4wkb20saqd5sfa2rga5cqh694l70vj9c3zw26"; depends=[]; }; UpSetR = derive2 { name="UpSetR"; version="1.4.0"; sha256="007i0njnjjy7vbrxabwav7a1kk2n0hn2mkvqsdzzfk10ckp5y7im"; depends=[ggplot2 gridExtra plyr scales]; }; UsingR = derive2 { name="UsingR"; version="2.0-6"; sha256="1lr8z45r5s7fxrd42rswm6w7s3k5nds244b9d525jb5v4n8w9kpw"; depends=[HistData Hmisc MASS]; }; UtilityFrailtyPH12 = derive2 { name="UtilityFrailtyPH12"; version="1.0"; sha256="06f5gmwwk1r14ab6v5jcxz0pmdph7ffi4y57mjg9byn7pjnibflk"; depends=[bindata mvtnorm Phase123 Rcpp RcppArmadillo]; }; - V8 = derive2 { name="V8"; version="2.2"; sha256="1wwnwm9rhz3pld76ihd0camlyli8namjayljz151fqp64inwrik1"; depends=[curl jsonlite Rcpp]; }; + V8 = derive2 { name="V8"; version="2.3"; sha256="1cq5snck0hnjwchy92g5ysdabf70i5hjw3r3401sqv6nq5rdf87p"; depends=[curl jsonlite Rcpp]; }; VAR_etp = derive2 { name="VAR.etp"; version="0.7"; sha256="0py5my3ilhcmz44m15hh0d219l9cz7rda4a9gbmf8wh9cgvvj1s3"; depends=[]; }; VARSEDIG = derive2 { name="VARSEDIG"; version="1.9"; sha256="18j73wm22bjvf2y0c09bfmdyx4x2gd0jhfcqhbk1sgsk24zjr63z"; depends=[]; }; VARsignR = derive2 { name="VARsignR"; version="0.1.3"; sha256="09mnf9hvsi4wx1c81yq97mzggwk6s7nka7awrws63icjybqjmra9"; depends=[HI minqa mvnfast]; }; VARtests = derive2 { name="VARtests"; version="2.0.5"; sha256="0gmm2qrrl4v5vx0nhiwq5brvanhybpb2q0zlf4dihramhjjbwyar"; depends=[Rcpp RcppArmadillo sn]; }; VBLPCM = derive2 { name="VBLPCM"; version="2.4.5"; sha256="1q5n87zzakdv0mflgsy6a5lc25ryjm7h90i3nr0dvccd0l8d4wpm"; depends=[ergm mclust network sna]; }; VBTree = derive2 { name="VBTree"; version="0.1.0"; sha256="0g0lyvclnfmd3zc8yhcibhli0hyxrba6wb3hx039fsg80q7y02h4"; depends=[tensorA]; }; - VCA = derive2 { name="VCA"; version="1.3.4"; sha256="1qyf20i6bgjg3lxivhx4kgr66m63wkzw8r26aqhz0cs1j0w741dk"; depends=[lme4 Matrix numDeriv]; }; + VCA = derive2 { name="VCA"; version="1.4.0"; sha256="076li3bd192lyg9hpcj391sg38jnr6mm8br550l31lqkz9f4nifn"; depends=[lme4 Matrix numDeriv]; }; VDAP = derive2 { name="VDAP"; version="2.0.0"; sha256="134x4aisaim72xkyzb1vb8vhl2m4i12yzh6cj858a1ag7b0ing3n"; depends=[drc ggplot2 reshape2 stringr]; }; VDJgermlines = derive2 { name="VDJgermlines"; version="0.1"; sha256="1aqjhkcj3bd5hk7iz0f2cy5nfp23gvhqsmg6nzlxd9klwc6xpq2h"; depends=[ape stringdist]; }; VDSPCalibration = derive2 { name="VDSPCalibration"; version="1.0"; sha256="1hrmmhvk3mhd3bdl0msnm5shcj4cjgd3pn1rkfkv8fh4llqvz7w8"; depends=[]; }; @@ -4515,9 +4574,10 @@ in with self; { VNM = derive2 { name="VNM"; version="7.1"; sha256="19qglcibb7r6jjz0n0piklwfv3hi4jphd6vmyfbm0ccjjkmn5nin"; depends=[Rcpp]; }; VRPM = derive2 { name="VRPM"; version="1.2"; sha256="1cai5a71vzkx0d7cwzsxbcz7r9cdkqjk4l4bp2ffj5pp7nrlh15r"; depends=[fields ggplot2 Hmisc kernlab R2HTML ROCR shiny survival viridis]; }; VSE = derive2 { name="VSE"; version="0.99"; sha256="07m5080nw72b77238v2wwdh4dxsvv6y78d4j1329n90wyj2crxl4"; depends=[car GenomicRanges igraph IRanges]; }; - VSURF = derive2 { name="VSURF"; version="1.0.4"; sha256="1sby2ls8yhxv4hx0y508pypsj1sbc0d269yl0xnqbxz44bhj8zzm"; depends=[doParallel foreach randomForest rpart]; }; + VSURF = derive2 { name="VSURF"; version="1.1.0"; sha256="1azfd4sb89mp27l86k293qj81x94gfiy1ihwnb6c558p8h69xsgf"; depends=[doParallel foreach randomForest ranger Rborist rpart]; }; + VTShiny = derive2 { name="VTShiny"; version="0.1.0"; sha256="1zq6irla3q7hqs8jpjdya7vy3frqrj72rwmd1sgxwrkgpmpxw6x7"; depends=[EnvStats rmarkdown shiny]; }; VTrack = derive2 { name="VTrack"; version="1.21"; sha256="1acf2b8zy72shc4768rhikfa3590h3l3nwk32jk7pwsms0nb87rf"; depends=[checkmate doParallel foreach gdistance gstat Hmisc intervals lubridate plotKML plyr raster sp spacetime XML]; }; - VWPre = derive2 { name="VWPre"; version="1.1.0"; sha256="1ccrim9nx5fmmadg687gz9qrfkyxp48rskg1n2pxfwd3h10c9js1"; depends=[dplyr ggplot2 mgcv rlang shiny tidyr]; }; + VWPre = derive2 { name="VWPre"; version="1.2.0"; sha256="1s9fc86gr8yf8h53sz8gg4dhm2vqxwpp42symsmy2xscrjavd7ph"; depends=[dplyr ggplot2 mgcv rlang shiny tidyr]; }; VaRES = derive2 { name="VaRES"; version="1.0"; sha256="0gw05jiqgirhz3c8skbb07y4h44r6vi68gnd5y7ql455v0c2raza"; depends=[]; }; VarBundle = derive2 { name="VarBundle"; version="0.3.0"; sha256="0jfx9gkb3f29lgc0nrz3xc7m2ham0scx9lay7x5a6ira7crga6cr"; depends=[crayon dplyr glue magrittr R6 stringr tibble]; }; VarED = derive2 { name="VarED"; version="1.0.0"; sha256="16j9p2a143y4hqclsv1mig0fccrzjx2r0lll0wz8isjp9x1wzjv8"; depends=[]; }; @@ -4537,13 +4597,12 @@ in with self; { VeryLargeIntegers = derive2 { name="VeryLargeIntegers"; version="0.1.6"; sha256="1ccl4j3vb6aw1qfbqil67dy74daldajwzm7s5hqcidm73fd0wknc"; depends=[Rcpp]; }; VetResearchLMM = derive2 { name="VetResearchLMM"; version="1.0.0"; sha256="1a7wm04bsr5shak7l8ypxlhlnx3qkq1jdpjnji1n05p6b00ih9h1"; depends=[ggplot2 lme4 lmerTest multcomp nlme]; }; ViSiElse = derive2 { name="ViSiElse"; version="1.2.1"; sha256="14vv25wnqcplf7k0ybfdlcvyhnja0h0kvz39yzlh2qkavjvdaf2y"; depends=[chron colorspace Matrix stringr]; }; - VineCopula = derive2 { name="VineCopula"; version="2.1.8"; sha256="1sdj6561ya7px4bp4kq23ggjf1bmis465zpnwn0i650z3q6y7al7"; depends=[ADGofTest copula doParallel foreach kdecopula lattice MASS mvtnorm network]; }; + VineCopula = derive2 { name="VineCopula"; version="2.2.0"; sha256="12p1bmp3b5vm0zfmwhbjj5gbmp0gf1ad7dcyzk6lda3zqkvfyfmi"; depends=[ADGofTest copula doParallel foreach kdecopula lattice MASS mvtnorm network]; }; VisuClust = derive2 { name="VisuClust"; version="1.2"; sha256="0hnjmrz352950rzky88q4nwvkx7zp6x3lsm7kff5dl4w05iq4wsl"; depends=[aplpack]; }; 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-6"; sha256="0nfay5nqss3zlw4nikj8h3zzlnjfxjch4pm3qky15qrcigrybrbl"; depends=[curl xml2]; }; - WACS = derive2 { name="WACS"; version="1.0"; sha256="1x6vn7xhrnaggrxkvap6si8gz7b6z2zpjpbb9zgag4vyq3s7nxgy"; depends=[mclust mnormt mvtnorm tmvtnorm]; }; WARN = derive2 { name="WARN"; version="1.2-3"; sha256="0vkp70cc3slz9y8qfybrqyjyglsxz9fnqrid735h2a113h4xvr3v"; depends=[MASS]; }; WCE = derive2 { name="WCE"; version="1.0.2"; sha256="105pwpd9ikm0gwz4r12jl6cgs1riwsk9pn5qk9cn3msgwa0sdynx"; depends=[plyr survival]; }; WCM = derive2 { name="WCM"; version="0.2.1"; sha256="0d2yw6kzn7mvxwllxfbk6vfiy8l1fd7ggjgi92kjn0j0y66cadw4"; depends=[pracma raster]; }; @@ -4556,27 +4615,27 @@ in with self; { WLreg = derive2 { name="WLreg"; version="1.0.0"; sha256="0paghjcshhrr6y1gm98d6gr78zvgzhl678g9f96hppfa4q3lfpr7"; depends=[inline survival]; }; 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=[]; }; - WMWssp = derive2 { name="WMWssp"; version="0.3.7"; sha256="1bjah78il3g1lr4wz1a7d41frlqsyy1pn4cdc9k3yq1gm5sxx6kk"; depends=[]; }; + WMWssp = derive2 { name="WMWssp"; version="0.4.0"; sha256="16m4hvjqdcpkvswvqwgm0pq9nm7vjrlqldzi4i69izlwccp37v47"; depends=[]; }; WPC = derive2 { name="WPC"; version="1.0"; sha256="0li502hwa4n945yfnilslyvl12ls66kazbfmxb4kkjbaf500mjp9"; depends=[msm survival]; }; WPKDE = derive2 { name="WPKDE"; version="0.1"; sha256="100vla11fbw16x5n4w4kbslz4n725v4x6j0hrxzrk99ryl0crmf6"; depends=[]; }; WRS2 = derive2 { name="WRS2"; version="1.0-0"; sha256="1ax7lchbg0f5miq5779p1zmk6pw36hvwwmbpvsfqwahl5wlvii0s"; depends=[MASS mc2d plyr reshape]; }; WRSS = derive2 { name="WRSS"; version="2.3"; sha256="182753820fjwl544sv7rhkjsdy268r8fgspyq88brqlpfj7k6rdw"; depends=[GGally ggplot2 Hmisc network nloptr]; }; WRTDStidal = derive2 { name="WRTDStidal"; version="1.1.1"; sha256="0q2rdzbz3cbgr19sh9j3fqdn0lvwrq93qq2rjmnhx6ia9avkywa8"; depends=[caret dplyr fields foreach forecast ggplot2 gridExtra lubridate purrr quantreg RColorBrewer survival tidyr]; }; - WVPlots = derive2 { name="WVPlots"; version="1.1.0"; sha256="0nwfjjyz54r6xjh9hzrpy3mc6as92db2vb4d39l34n2ni496xky9"; depends=[cdata ggplot2 gridExtra mgcv sigr wrapr]; }; + WVPlots = derive2 { name="WVPlots"; version="1.1.1"; sha256="0922r7h03aczhqjw20djc6nwvmj7rq8dbhk2752jv3ndjdl5ywlw"; depends=[cdata ggplot2 gridExtra mgcv sigr wrapr]; }; WWGbook = derive2 { name="WWGbook"; version="1.0.1"; sha256="0q8lnd1fp4rmz715x0lf61py3xw8wg55yq3gvswaqwy68dlqrzjc"; depends=[]; }; WWR = derive2 { name="WWR"; version="1.2.2"; sha256="0ia1dd12r1l08s9nhgvk55jmqwv58jawm25gd2ni6wpa3mcmq02g"; depends=[inline]; }; WaMaSim = derive2 { name="WaMaSim"; version="1.0.0"; sha256="0sa7qd2bpn3sp06mlpissxxkfhg7j1d07nnwlnz7nyg7pivwnpan"; depends=[magrittr]; }; 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]; }; WaveLetLongMemory = derive2 { name="WaveLetLongMemory"; version="0.1.2"; sha256="1p9ld6w2qgbvkvp7xkzzd14v89rxcwl6vlr1zgxkpc5awl1ln1a8"; depends=[fracdiff wmtsa]; }; WaveletANN = derive2 { name="WaveletANN"; version="0.1.0"; sha256="08qnx0lk2laiyx1q1wxj15j0yic65r7mbhr6lqbdllq30v4dcj88"; depends=[forecast fracdiff wavelets]; }; WaveletArima = derive2 { name="WaveletArima"; version="0.1.1"; sha256="19hz2q280m41qh3m9lx3i9p6p5fl6pw8r9b06xk6sn04hxbim8xx"; depends=[forecast fracdiff wavelets]; }; WaveletComp = derive2 { name="WaveletComp"; version="1.1"; sha256="07w2aa0jiflvxyqhgh48705hg8hjspd103jd00i2pcw2v42hwmf8"; depends=[]; }; WaverR = derive2 { name="WaverR"; version="1.0"; sha256="084fhzggzm075w6wp2lqd3j0an21idhw8z5l8ynz4y96mpmn204a"; depends=[kimisc MASS]; }; WeMix = derive2 { name="WeMix"; version="3.1.1"; sha256="0hg7ib3spfd5fp71gfbrh234wxinv3xswyaxb4gzd8342qg2xxhk"; depends=[lme4 Matrix minqa NPflow numDeriv Rmpfr statmod]; }; - WebGestaltR = derive2 { name="WebGestaltR"; version="0.4.0"; sha256="0jqhkfxvz17ypib4481fgmpg1fjmmijy8xzfn1s0aldzlyl770k8"; depends=[apcluster doParallel doRNG dplyr foreach httr igraph jsonlite Rcpp readr rlang whisker]; }; + WebGestaltR = derive2 { name="WebGestaltR"; version="0.4.1"; sha256="1xr4qxrp98jawmpw9k2nlbl4qr8ydgm2krmf606ybjrng8l8mdzn"; depends=[apcluster doParallel doRNG dplyr foreach httr igraph jsonlite Rcpp readr rlang whisker]; }; WebPower = derive2 { name="WebPower"; version="0.5.2"; sha256="11255q41zai4q6n2mpk3fzhi2lyyr3g8dxqfajkb93f68m1b38jp"; depends=[lavaan lme4 MASS PearsonDS]; }; + WeibullFit = derive2 { name="WeibullFit"; version="0.1.0"; sha256="1a80gcqbmvb1rz2dr2syy16wn6ixjn6l40gayys9zy8302hky9ir"; depends=[e1071 FAdist glue kSamples mixdist optimx R_methodsS3 R_oo sqldf xtable]; }; WeibullR = derive2 { name="WeibullR"; version="1.0.10"; sha256="1h2w1rgap9yjns7cby0559jwzzwhzjq1h6lwsawrfnni7c36iliq"; depends=[Rcpp RcppArmadillo]; }; WeightIt = derive2 { name="WeightIt"; version="0.5.1"; sha256="16gj7ynk4l67z7fjc345211hgqwxbdb6z1bpy27z5s4i7x4fyf8y"; depends=[cobalt]; }; Weighted_Desc_Stat = derive2 { name="Weighted.Desc.Stat"; version="1.0"; sha256="030i12mnwlj976avvk3grrccgprsckmc35dm2ajwdfc9dijhypnj"; depends=[]; }; @@ -4601,7 +4660,7 @@ in with self; { WriteXLS = derive2 { name="WriteXLS"; version="5.0.0"; sha256="1gypq7zh22kpraz0bgj4jyvy2hbj1l8r7m6y34531vjdgwf67sss"; depends=[]; }; WufooR = derive2 { name="WufooR"; version="0.9"; sha256="13flcb7hwnhsnlak4m3mvwmbq2fd42027lgp8fhg25sra6dwcd7h"; depends=[dplyr httr jsonlite]; }; XBRL = derive2 { name="XBRL"; version="0.99.18"; sha256="1bwvxqbxdf1ynz2bv27l86h05h8y19q2li2y79xk819p5nkxq341"; depends=[Rcpp]; }; - XGR = derive2 { name="XGR"; version="1.1.5"; sha256="1cn17m8q16516gyjnbkkdsxhyjcsxi83h3nm7pwzyh2qjp5qhmkl"; depends=[BiocGenerics dnet dplyr GenomicRanges ggnetwork ggplot2 ggrepel igraph IRanges MASS Matrix RCircos S4Vectors supraHex tidyr]; }; + XGR = derive2 { name="XGR"; version="1.1.6"; sha256="1y1g0n0idvixzl4bgwrccz77jcnmbb9ba760xal2y29sgshz6wpx"; depends=[BiocGenerics dnet dplyr GenomicRanges ggnetwork ggplot2 ggrepel igraph IRanges MASS Matrix RCircos S4Vectors supraHex tidyr]; }; XHWE = derive2 { name="XHWE"; version="1.0"; sha256="1ca8y9q3623d0vn91g62nrqf3pkbcbkpclmddw5byd37sdrgsi5l"; depends=[]; }; XKCDdata = derive2 { name="XKCDdata"; version="0.1.0"; sha256="1lx9frlbc549qrh4d3m79r3l9icfzqkgfgp8raa8x46a2havi0a5"; depends=[assertthat dplyr glue htmltools httr jsonlite magrittr tibble]; }; XLConnect = derive2 { name="XLConnect"; version="0.2-15"; sha256="1cvq677m09gwpwhj3fy15mbfn0s0b1y35w95pjnijiwpcpdxiq96"; depends=[rJava XLConnectJars]; }; @@ -4616,7 +4675,7 @@ in with self; { XRSCC = derive2 { name="XRSCC"; version="0.1"; sha256="0hs2whjsd02avaz79zkrd8gjw9qd7l6ysxmhx4w1r7gb1cj9rr7c"; depends=[]; }; XiMpLe = derive2 { name="XiMpLe"; version="0.10-2"; sha256="16dmslc3ji9zbbm2khw8ib8rhwan0mdlfyd4h29v42lcx6l1d0pv"; depends=[]; }; Xmisc = derive2 { name="Xmisc"; version="0.2.1"; sha256="11gwlcyxhz1p50m68cnqrxmisdk99v8vrsbvyr7k67f0kvsznzs1"; depends=[]; }; - Xplortext = derive2 { name="Xplortext"; version="1.1.1"; sha256="18a8qqpakwgv60gm89cmil18q35mlir3xl4yl5j5fswcj5qpdkdx"; depends=[FactoMineR ggplot2 gridExtra slam stringr tm]; }; + Xplortext = derive2 { name="Xplortext"; version="1.2.1"; sha256="1c19i367vbcf8ikb364kz8488lcd5ignyagg9bhza282grhla7kn"; depends=[FactoMineR flashClust flexclust ggdendro ggplot2 gridExtra MASS slam stringi stringr tm]; }; YPInterimTesting = derive2 { name="YPInterimTesting"; version="1.0.3"; sha256="0fca963rsbs9k7ivffsqk4hzap6ll7s709kqs6aby0plghrdla2w"; depends=[MASS Rcpp]; }; YPmodel = derive2 { name="YPmodel"; version="1.3"; sha256="1vll33nm7xynnbq15wksk9c38jhjfd6l1bbzijn5skqc5yik1r5x"; depends=[]; }; YRmisc = derive2 { name="YRmisc"; version="0.1.5"; sha256="0vdxw67j4sx3m713s2spvj7jlk9h2g9hg4169zabfah8ni7gdman"; depends=[ggplot2 gridExtra robust]; }; @@ -4647,6 +4706,7 @@ in with self; { aSPU = derive2 { name="aSPU"; version="1.48"; sha256="0kjvwwvyhiz9i5kxqg68lq6cvxnk9vzvp5zca5hfv2g77j42wh9h"; depends=[fields gee MASS matrixStats mvtnorm]; }; aTSA = derive2 { name="aTSA"; version="3.1.2"; sha256="1p3spas0sxj08hkb8p6k2fy64w86prlw1hbnrqnrklr0hnkg2g54"; depends=[]; }; aVirtualTwins = derive2 { name="aVirtualTwins"; version="1.0.1"; sha256="1jg19ns3mxfycc11i2c152d83n4kqz3dd6d269sijnxrw80kzjki"; depends=[party randomForest rpart]; }; + aaSEA = derive2 { name="aaSEA"; version="1.0.0"; sha256="0x0vp91m3vxgzrs38mf36d24i5i7f03jsisbdrx7s1slbqzdrkv8"; depends=[Bios2cor DT Hmisc magrittr networkD3 plotly seqinr shiny shinydashboard]; }; abbyyR = derive2 { name="abbyyR"; version="0.5.5"; sha256="1vldnd3dg89aj6a73nhirirqddbfdrnzhb5m3679i60sark8nk6r"; depends=[curl httr plyr progress readr 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=[]; }; @@ -4658,7 +4718,7 @@ in with self; { abf2 = derive2 { name="abf2"; version="0.7-1"; sha256="0d65mc1w4pbiv7xaqzdlw1bfsxf25587rv597hh41vs0j0zlfpxx"; depends=[]; }; abind = derive2 { name="abind"; version="1.4-5"; sha256="0b1zd8jbnl6l292cr9rb50m09fy3ylxvzkpgi5lfb1nbzddcwfis"; depends=[]; }; abjutils = derive2 { name="abjutils"; version="0.2.3"; sha256="0n4zps65y3zg0gfzlv97w91si52a9izkncirskbkj5x9hk0nhxcv"; depends=[devtools dplyr furrr future glue httr magrittr progress purrr readr rlang rstudioapi scales stringi stringr tibble tidyr]; }; - abn = derive2 { name="abn"; version="1.3"; sha256="1q9hzpxwg835711kxwygd0l2awal6f015f8s6fprwz7graz1wbbm"; depends=[Cairo lme4 MASS nnet Rcpp RcppArmadillo rjags]; }; + abn = derive2 { name="abn"; version="2.1"; sha256="08jlvb6i5f7ry2dwm0jgrnn2w95vr0l67dpx13n9878lz9ld131b"; depends=[lme4 MASS nnet Rcpp RcppArmadillo rjags]; }; abnormality = derive2 { name="abnormality"; version="0.1.0"; sha256="1fzfskl9akl06nliy8hkv2a0pznpj8pwcypg3gj5r2nzvr3kan9v"; depends=[MASS Matrix]; }; abodOutlier = derive2 { name="abodOutlier"; version="0.1"; sha256="1pvhgxmh23br84r0fbmv7g53z2427birdja96a67vqgz18r3fdvj"; depends=[cluster]; }; abstractr = derive2 { name="abstractr"; version="0.1.0"; sha256="1ymwp7syrynwd4i8aj2x5n8jdi9d96fjzl6jb09n0bnr5fgl7vig"; depends=[colourpicker emojifont ggplot2 gridExtra rintrojs shiny shinythemes]; }; @@ -4671,8 +4731,9 @@ in with self; { accrual = derive2 { name="accrual"; version="1.3"; sha256="11clm9s5c5518nmp6hd6pjnp0s28y92b2i2x0xgj4j5g816p4j3z"; depends=[fgui SMPracticals tcltk2]; }; accrued = derive2 { name="accrued"; version="1.4.1"; sha256="05g1jb5914z18rcai1ahn7nihn27vr2rnadwv94gc1j7ivvikvs5"; depends=[]; }; ace2fastq = derive2 { name="ace2fastq"; version="0.6.0"; sha256="09kk3yyqnr2xp820g0p3aai9a21figigjr9lxkr3zjq2d8gzwfic"; depends=[stringr]; }; - acebayes = derive2 { name="acebayes"; version="1.6.0"; sha256="19bf3swcpr13a3mw767p2wadsmfh8sbj2nw8if4m4ykmnk66r7a2"; depends=[compare lhs randtoolbox Rcpp RcppArmadillo]; }; + acebayes = derive2 { name="acebayes"; version="1.7"; sha256="1zp78gq72waqglgafapir3jf1r5dzwqar594mg440vva85m741za"; depends=[compare lhs randtoolbox Rcpp RcppArmadillo]; }; acepack = derive2 { name="acepack"; version="1.4.1"; sha256="1f98rpfjmhd92rdc3j004plyfpjailz6j0ycysbac0kgj83haxc2"; depends=[]; }; + acfMPeriod = derive2 { name="acfMPeriod"; version="1.0.0"; sha256="1yww8isfrbs2v9s94hx7p2imyszcgadwafdgpj438n2ik0q6p9d5"; depends=[MASS]; }; 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]; }; @@ -4683,10 +4744,12 @@ in with self; { acs = derive2 { name="acs"; version="2.1.4"; sha256="0ajw9rf8l8akcvgqvbxjvryc6wjx74521xyxswz2b0bky3m6kah5"; depends=[httr plyr 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=[]; }; + activPAL = derive2 { name="activPAL"; version="0.1.3"; sha256="1h6hp5z89ji73gdzxy1dgbfwjysiy5lvcqh90xagpb7sa7ahs3na"; depends=[devtools dplyr ggplot2 lubridate magrittr tidyr]; }; activity = derive2 { name="activity"; version="1.2"; sha256="11w2bz6p9xbzdh6773dmbbh6rws0h5dj18p8m0ivzizgq932vdzs"; depends=[circular pbapply]; }; + activityCounts = derive2 { name="activityCounts"; version="0.1.2"; sha256="0zgxr2sk3a8kmygfxx1p5hnrfwdkxx7php6jlrhm8wv6052ck8jz"; depends=[lubridate magrittr seewave signal tibble]; }; activpalProcessing = derive2 { name="activpalProcessing"; version="1.0.2"; sha256="1y0bjx2qx53iy930y9iww4q1yzjj8y16cwgixk1mq3w4g1f116d1"; depends=[chron]; }; actogrammr = derive2 { name="actogrammr"; version="0.2.3"; sha256="1jzvarmd41yqlrkagzlc8m19n5mn0w0b36fy50lyvgrfsafjfbqa"; depends=[dplyr ggplot2 lubridate readr tidyr]; }; - actuar = derive2 { name="actuar"; version="2.3-1"; sha256="0i0w5y0bgma42p4cbrbv0bxkambp7hgqqlsg90p5skfvg7r1n3bk"; depends=[expint]; }; + actuar = derive2 { name="actuar"; version="2.3-2"; sha256="176ch6lbjn2f7vx2npjvl4y1j3l4v2g87g9sag2shvgh6sh5d7ix"; depends=[expint]; }; ada = derive2 { name="ada"; version="2.0-5"; sha256="1h3a07czp0w3hrhjcg1fz721y8vsfclzqi3rq8qfzgpfb4h1f06r"; depends=[rpart]; }; adabag = derive2 { name="adabag"; version="4.2"; sha256="109wrl1pwvmyv2l909hrvk7dg4aa9pv449mvdycp50zwrsw9w0a7"; depends=[caret doParallel foreach rpart]; }; adagio = derive2 { name="adagio"; version="0.7.1"; sha256="1h9l0ddrxq8y35iy9hdkxdvdwsqpnpkzzbkbwwhm4380lq1m7a3k"; depends=[]; }; @@ -4727,11 +4790,11 @@ in with self; { adjustedcranlogs = derive2 { name="adjustedcranlogs"; version="0.1.0"; sha256="08apfvpqvnnalx230p4qf5ckrwm1sgzras4zfrysgym5d4map9ci"; depends=[cranlogs dplyr lubridate rvest xml2]; }; adklakedata = derive2 { name="adklakedata"; version="0.6.1"; sha256="1lzj3ib4bgfkq5lq12n47pwc52h7k35xbbwj6brwsgx1gd4fx3x6"; depends=[httr rappdirs]; }; adlift = derive2 { name="adlift"; version="1.4-1"; sha256="14q7fnhlqvxdhnfjhdhfmadz241srplbm069a7ybbsql21cphpf3"; depends=[EbayesThresh]; }; - admisc = derive2 { name="admisc"; version="0.2"; sha256="1kz0zvvlkpwzq7xkmdyysnhsk40m9445x22z041n42s00fv09ji2"; depends=[]; }; + admisc = derive2 { name="admisc"; version="0.3"; sha256="10khlmkiv9xyhd8rhcj4fb5h24pflmdl6np26rky6j5sa7vhi97y"; depends=[]; }; admixturegraph = derive2 { name="admixturegraph"; version="1.0.2"; sha256="0ld4qyyvbnr5lz9ff64wjwif4c9xnqyjmbfgbl9bk6pia98zppl3"; depends=[doParallel dplyr foreach ggplot2 MASS neldermead pracma]; }; adnuts = derive2 { name="adnuts"; version="1.0.1"; sha256="1l52f33yzbvcz27iw0k6iwcnfanr65lw206d7w4609k2vmlw8ink"; depends=[ellipse R2admb rstan]; }; adoption = derive2 { name="adoption"; version="0.6.2"; sha256="18mjhsh19bjmh27sv5fiay0xv1la0qy96v48b093f7kqfx4c21xb"; depends=[quadprog RandomFieldsUtils tkrplot]; }; - adoptr = derive2 { name="adoptr"; version="0.2.0"; sha256="1iqw8sbsn7pq5azv9pg7v9lisw4pb4qfd9chnk4y7bgiis46sy6w"; depends=[nloptr]; }; + adoptr = derive2 { name="adoptr"; version="0.2.2"; sha256="0mxknvrwkmd46n45zcai3d6jgw27rjf2k9wbr4ma8vivbnykgsxn"; depends=[nloptr]; }; adpss = derive2 { name="adpss"; version="0.1.1"; sha256="0p2gyfc4rxmms8zdsq4hjsh1njfl2s736arq8aq1am2wh1w9k5ch"; depends=[Rcpp]; }; ads = derive2 { name="ads"; version="1.5-3"; sha256="1k1japzcf0mafxkv9dlzaqz9n4c749lsx0lja4wj327ninpdcfy4"; depends=[ade4 spatstat]; }; advclust = derive2 { name="advclust"; version="0.4"; sha256="1g8a8q4zh6d4152jb66fh7wj7k6ks5k4kfcazzw70jdn10yi6b38"; depends=[clue ggplot2 knitr MASS reshape2]; }; @@ -4740,7 +4803,7 @@ in with self; { aemo = derive2 { name="aemo"; version="0.2.0"; sha256="11msifszq7pzmcmwibf2dk2j5dqjc74hrxdxshlprkp6p8sfhijh"; depends=[assertthat dplyr lubridate stringr]; }; afCEC = derive2 { name="afCEC"; version="1.0.2"; sha256="0jdppp93z5nb8m5qbry6cvd472mwiq1yrmm11906c3z2bfz7791f"; depends=[Rcpp RcppArmadillo rgl]; }; afc = derive2 { name="afc"; version="1.4.0"; sha256="1iy1wa88kf6zi6x7lbd0jdir653cvzvdraliqpxbac413wwb5gwl"; depends=[]; }; - afex = derive2 { name="afex"; version="0.23-0"; sha256="0yv4s7461swn0116y4wq9v139p1br5rr6hhnq1cmkbvybmwj2vp7"; depends=[car lme4 lmerTest pbkrtest reshape2]; }; + afex = derive2 { name="afex"; version="0.24-1"; sha256="14w7kcwr5hxmjcjmdm5ia9ka3bw1nl18pxlm1vpw62nmvicn3455"; depends=[car lme4 lmerTest pbkrtest reshape2]; }; affluenceIndex = derive2 { name="affluenceIndex"; version="1.0"; sha256="1nb2dlsnvjsvkyrfdaskmpr3kv3qgdfb60xgmzvscfli0yf4dzr1"; depends=[]; }; afmToolkit = derive2 { name="afmToolkit"; version="0.0.1"; sha256="1pm3xyh9vq10mmfgknlvlfr9f027xprrgy1dvbbxpi7f111hv1gl"; depends=[assertthat DBI dplyr ggplot2 gridExtra minpack_lm scales tibble]; }; afpt = derive2 { name="afpt"; version="1.0.0"; sha256="0kshyzvw8sp7p686xi98g758zld3n7kq44lnvly8d0y8fg6ahcl2"; depends=[]; }; @@ -4771,12 +4834,13 @@ in with self; { akmeans = derive2 { name="akmeans"; version="1.1"; sha256="1nqbxbx583n0h2zmpy002rlmr6j86j6bg76xj5c69brrh59dpyw1"; depends=[]; }; akmedoids = derive2 { name="akmedoids"; version="0.1.2"; sha256="0grblrqaqdlvfjkv064kvk4bpaw1zygycbdzrhpfyaaqhc86rnqn"; depends=[ggplot2 Hmisc kml longitudinalData reshape2]; }; alabama = derive2 { name="alabama"; version="2015.3-1"; sha256="0mlgk929gdismikwx4k2ndqq57nnqj7mlgvd3479b214hksgq036"; depends=[numDeriv]; }; - alakazam = derive2 { name="alakazam"; version="0.2.11"; sha256="0p6rg09cxphp6mcbllwrvps4l9y2qssxhgxy6ryr4958gc1may16"; depends=[dplyr ggplot2 igraph lazyeval progress Rcpp readr scales seqinr stringi tidyr]; }; + alakazam = derive2 { name="alakazam"; version="0.3.0"; sha256="1jgamm75apjpij3yfzx62c44hfiyv1gdcmcb6n4hgbdszl2ii2bg"; depends=[ape dplyr ggplot2 igraph lazyeval Matrix progress Rcpp readr rlang scales seqinr stringi tibble tidyr]; }; albopictus = derive2 { name="albopictus"; version="0.5"; sha256="0kw1agm9jqi9wl5zbx8bryngy751g3sih36rgbrx0m2170cy42d9"; depends=[]; }; ald = derive2 { name="ald"; version="1.2"; sha256="1xmvxmyc1nmsrlyr0rvzz20jx6g1f2jvxpg9f39v48ngg5gmanjj"; depends=[]; }; + alfr = derive2 { name="alfr"; version="1.2.1"; sha256="1ldq8gvgqjjabn86hdqb6hxch8x4hvr6djv5ly4mx039dipc8jxi"; depends=[httr jsonlite magrittr stringr]; }; alfred = derive2 { name="alfred"; version="0.1.7"; sha256="1467rg5q2dqbqy8vj2061glb1gksq96rnjlifgyiv5rarwzy9b4y"; depends=[dplyr jsonlite lubridate magrittr tibble tidyr]; }; algaeClassify = derive2 { name="algaeClassify"; version="0.1.0"; sha256="19iad7av908zrfsv6nwwk4yllfls6pyhyzg78zyh4lk76r04kbjp"; depends=[]; }; - algorithmia = derive2 { name="algorithmia"; version="0.0.2"; sha256="0kly70l9si8ni8n5xm30vai70pvfvip6354scvjqj34362s0lm0a"; depends=[base64enc httr rjson xml2]; }; + algorithmia = derive2 { name="algorithmia"; version="0.2.0"; sha256="0h1llcwk1qkxg26ikib44nd19da1q39n3gd8jwwb36687drl26qp"; depends=[base64enc httr rjson]; }; alignfigR = derive2 { name="alignfigR"; version="0.1.1"; sha256="0jsj0h7zpzj6ynfydl8qbggm03xx8db769rli7rcx9909xdxabk6"; depends=[ggplot2]; }; alineR = derive2 { name="alineR"; version="1.1.4"; sha256="1gi4pl7ij60pz85yjiga5kvldraj9n3nhcyqdxrigs0cqvdwg3ar"; depends=[]; }; allan = derive2 { name="allan"; version="1.01"; sha256="02bv9d5ywbq67achfjifb3i7iiaaxa8r9x3qvpri2jl1cxnlf27m"; depends=[biglm]; }; @@ -4794,6 +4858,7 @@ in with self; { alphavantager = derive2 { name="alphavantager"; version="0.1.1"; sha256="0rbvbws0g50z76pvkydadf97gq5yg1l03xlfqyy3yblqh59cj5s6"; depends=[dplyr glue httr jsonlite purrr readr stringr tibble tidyr timetk]; }; alr3 = derive2 { name="alr3"; version="2.0.8"; sha256="1vkwgf5c9zb8pphcw47vfwwk12nfj4nggj8dr88jwbdnv7yd257h"; depends=[car]; }; alr4 = derive2 { name="alr4"; version="1.0.6"; sha256="0v98yzi0fcjxq0ak0w05001h8m9nfa9l0ann9bqvz8bwcmb3jlr2"; depends=[car effects]; }; + altair = derive2 { name="altair"; version="3.1.1"; sha256="0qy23lzz2lfsrhl9yn195r5gdkspgi99zlp13l1fpcw0d02diw1z"; depends=[assertthat htmlwidgets jsonlite magrittr repr reticulate rlang vegawidget]; }; alterryx = derive2 { name="alterryx"; version="0.5.0"; sha256="1p9q4244bm7hf6my8q951idw41xa5gcrdl7znmsng9pwxh8dnz3h"; depends=[base64enc digest httr jsonlite]; }; altmeta = derive2 { name="altmeta"; version="2.2"; sha256="1k3p06v8ccj0dbjfpl4nw6579bwcy4j925rk15v55khqmrlx780l"; depends=[]; }; amap = derive2 { name="amap"; version="0.8-17"; sha256="1il94bkhl8192vawq4gr2gwyhqhid27jr2312rhvr72ssg8p713b"; depends=[]; }; @@ -4826,21 +4891,22 @@ in with self; { anim_plots = derive2 { name="anim.plots"; version="0.2.1"; sha256="0z811y4zzrqas1ynrq4syhxvbcw2girxa6g9biry9d0qgq1w8cp1"; depends=[animation]; }; animalTrack = derive2 { name="animalTrack"; version="1.0.0"; sha256="0jlvfflpaq64s48sblzh1n1vx8g3870iss97whigri29s6hn79ry"; depends=[rgl]; }; animation = derive2 { name="animation"; version="2.6"; sha256="02jv4h9hpp8niw9656r5n36kqr71jbyynxnywkkkdi0aj8w3cach"; depends=[magick]; }; + animint2 = derive2 { name="animint2"; version="2019.7.3"; sha256="13s6s0py5hfywgknl0521d0xhdb86988pqwymwsw054l9xhp5dns"; depends=[digest gtable lazyeval MASS plyr reshape2 RJSONIO scales tibble]; }; anipaths = derive2 { name="anipaths"; version="0.9.7"; sha256="1h6rcrybjfc4kn377bay2c3nfv6qwwi0nk14xh6jfdsxqybq6dw2"; depends=[animation ggmap knitr mgcv RColorBrewer rgdal scales sp]; }; anocva = derive2 { name="anocva"; version="0.1.1"; sha256="1byg40jla71k1901js5h9yq89j63d00vkm60id1fxlpv95c4wdrr"; depends=[cluster]; }; anoint = derive2 { name="anoint"; version="1.4"; sha256="10gdqgag9pddvxh80h458gagvv1474g4pcpa71cg3h7g62rqvmv5"; depends=[glmnet MASS survival]; }; anomalize = derive2 { name="anomalize"; version="0.1.1"; sha256="1szxjc8bh616z2xc50hcggh4ky1b7343i3xmg81rbssvkl2gghlh"; depends=[dplyr ggplot2 glue purrr rlang sweep tibble tibbletime tidyr timetk]; }; anomaly = derive2 { name="anomaly"; version="1.1.0"; sha256="0v1pgyckqkimyh1hh68clyqnm9hkzmz3dal676l9qaiwbgqmkxi4"; depends=[dplyr ggplot2 Rdpack rlang]; }; anominate = derive2 { name="anominate"; version="0.6"; sha256="01p2qkqf88bzhwywyass5r8dwg2ycflmkbzmsps7fzy0kv3xyb02"; depends=[coda MCMCpack pscl wnominate]; }; - antaresEditObject = derive2 { name="antaresEditObject"; version="0.1.6"; sha256="0fl25phnzjv93qw20d2mkhl1w2rix44qiqxg44i3rhfn3qncpa05"; depends=[antaresRead assertthat data_table whisker]; }; + antaresEditObject = derive2 { name="antaresEditObject"; version="0.1.7"; sha256="0whwlqsjc9ygh2iv9bmgxglqk061l3mgfsq1a0848180wci6frwb"; depends=[antaresRead assertthat data_table whisker]; }; antaresProcessing = derive2 { name="antaresProcessing"; version="0.17.0"; sha256="0mq2b1dkkgli8d53mpcllilh72gf8189f5mf0dxjcv4qinnhrrvm"; depends=[antaresRead data_table stringi]; }; - antaresRead = derive2 { name="antaresRead"; version="2.2.3"; sha256="0ylj2q39w82xkbq5qfz8srqmmcrkrpgf3k15apswf2hzax2pvik0"; depends=[bit64 data_table lubridate plyr shiny stringr]; }; + antaresRead = derive2 { name="antaresRead"; version="2.2.4"; sha256="0vi7g3mz92djxhraii788j4ialyvq013cw0grwndp2rz2bmxmgd8"; depends=[bit64 data_table lubridate plyr shiny stringr]; }; antaresViz = derive2 { name="antaresViz"; version="0.15.0"; sha256="16gf5spgx56rgf2d25zv5dihhbbgvfxryswfqa4gjlpjc2827zar"; depends=[antaresProcessing antaresRead assertthat data_table dygraphs geojsonio htmltools htmlwidgets leaflet leaflet_minicharts lubridate manipulateWidget plotly rAmCharts raster rgeos shiny sp spMaps webshot]; }; anthro = derive2 { name="anthro"; version="0.9.1"; sha256="1vm9gqxr81dllr6ib7r5w65rrfsawvif2fw6im2m6c7vljminlbg"; depends=[survey]; }; antitrust = derive2 { name="antitrust"; version="0.99.11"; sha256="025pm7n06yid28b34llm4rh0mlz0daz9ygh5z0hd87scp8f9gy00"; depends=[BB evd MASS numDeriv rhandsontable shiny]; }; antiword = derive2 { name="antiword"; version="1.3"; sha256="034znb0g9wwb8gi1r3z75v3sbb4mh83qrc4y8mbfx5lbgh8zhj6j"; depends=[sys]; }; anyLib = derive2 { name="anyLib"; version="1.0.5"; sha256="1x9x58hhkkwdskmgdjv94ynh811n9w0752hh4214adl1qpn576vm"; depends=[BiocManager curl devtools httr withr]; }; - anytime = derive2 { name="anytime"; version="0.3.4"; sha256="1q3qdld3qk709c0jg1ljv8zbvw4xycwiwjwbdc3ikwcqnvafrl9q"; depends=[BH RApiDatetime Rcpp]; }; + anytime = derive2 { name="anytime"; version="0.3.5"; sha256="0jbbfcrggkm04m50b6m2y62x4qvnch4d0wh4l1j26r687a39a0py"; depends=[BH Rcpp]; }; aod = derive2 { name="aod"; version="1.3.1"; sha256="1g03ajhs6bid80i83xn3917abhymzgrydqx86wxxpkqga018hb85"; depends=[]; }; aods3 = derive2 { name="aods3"; version="0.4-1.1"; sha256="1kdmgzd5nkzm0awdjls6fc8p9hxsph9ha9k1jxbppdi4i6f0i7rv"; depends=[boot lme4]; }; aoos = derive2 { name="aoos"; version="0.5.0"; sha256="0y92vs27i0mkpjdclqzq4j9g1axkymhi3v8xp1v6hazh35yzjkfj"; depends=[magrittr roxygen2]; }; @@ -4856,9 +4922,10 @@ in with self; { ape = derive2 { name="ape"; version="5.3"; sha256="08wbk1kxhs32bmmvqlqanbdg1w235amd35k8m00fngsj9h9xzc08"; depends=[lattice nlme Rcpp]; }; apercu = derive2 { name="apercu"; version="0.2.3"; sha256="0w9hi8pdjb3nschh4cy387q67jxhkl2bn9vir949rsl831x4cs1j"; depends=[pls]; }; apex = derive2 { name="apex"; version="1.0.3"; sha256="157i67yvb9xqlhzcgkxj7n5lq65svxs82z38dv2c0k8p4krjl1pd"; depends=[adegenet ape phangorn]; }; + apexcharter = derive2 { name="apexcharter"; version="0.1.1"; sha256="16zndkg4kgaxcgm1434l2lc5h4jkm5849aacadakq3jh0qa9fbqg"; depends=[ggplot2 htmlwidgets magrittr rlang scales]; }; aphid = derive2 { name="aphid"; version="1.3.3"; sha256="1jqpn7w5sgy4k49qd9ci6yj89s55gzwl5w5ldw793mzpg6if7lfn"; depends=[kmer openssl Rcpp]; }; aplore3 = derive2 { name="aplore3"; version="0.9"; sha256="0af6klscsxvh4amp519b6r41bzysf61p040fj4l5706bbya1arhw"; depends=[]; }; - aplpack = derive2 { name="aplpack"; version="1.3.2"; sha256="14vwzzshsgkw6gxwnnf6h9fixnwp3g8pd3rv6qjr0y8gis1lmjbg"; depends=[]; }; + aplpack = derive2 { name="aplpack"; version="1.3.3"; sha256="010saim43d3hr83ksi916846rh6qfbb0gvhsf5jbdx95m4bai9g3"; depends=[]; }; apmsWAPP = derive2 { name="apmsWAPP"; version="1.0"; sha256="1azgif06dsbadwlvv9nqs8vwixp6balrrbpj62khzmv1jvqr4072"; depends=[aroma_light Biobase DESeq edgeR genefilter gtools multtest seqinr]; }; apng = derive2 { name="apng"; version="1.0"; sha256="13hvr1w566anrhdicaqwqjgfq2lk3zkn5gcfgy8zazjnad4vy07y"; depends=[bitops]; }; apollo = derive2 { name="apollo"; version="0.0.7"; sha256="1znbxyvwyv7mm8jz86xj50yx2x9hpp6awdh567aw9pkvdy6bwmjp"; depends=[coda maxLik mnormt mvtnorm numDeriv randtoolbox Rcpp RcppArmadillo RcppEigen RSGHB sandwich]; }; @@ -4898,7 +4965,7 @@ in with self; { argosfilter = derive2 { name="argosfilter"; version="0.63"; sha256="0rrc2f28hla0azw90a5gk3zj72vxhm1b6yy8ani7r78yyfhgm9ig"; depends=[]; }; argparse = derive2 { name="argparse"; version="2.0.1"; sha256="1as7h6z7kzgv0fqzpnp76qbm96b4jcd37azd58b7rz0l1n94764l"; depends=[findpython jsonlite R6]; }; argparser = derive2 { name="argparser"; version="0.4"; sha256="0s1wxshx4jk69wfxhycx973q6y8cmqrfymyjklhq1i8xrj0kmmx9"; depends=[]; }; - ari = derive2 { name="ari"; version="0.1.0"; sha256="05pva8jp7dhl46dm1fha6f8mavrs76a6c491fq3mavly8qcbgx44"; depends=[aws_polly progress purrr rmarkdown rvest tuneR webshot xml2]; }; + ari = derive2 { name="ari"; version="0.3.1"; sha256="0hrmvnqs56v94lgl8i14p336nfcnd2x5yam4hclw7i4mj2l3r9ys"; depends=[hms progress purrr rmarkdown rvest text2speech tuneR webshot xml2]; }; aricode = derive2 { name="aricode"; version="0.1.2"; sha256="0w5ap0lhp9x67qvz3z80y49311g6h24x11yn8ziv75s3kaxy2wvz"; depends=[Matrix Rcpp]; }; arkdb = derive2 { name="arkdb"; version="0.0.5"; sha256="00ih2in6q0kismpc5jc8w3609nxjkmybx8i19cjlbr93y2zjm29i"; depends=[DBI progress]; }; arm = derive2 { name="arm"; version="1.10-1"; sha256="0vvp90jygajd6ydky57z66wqjq9msfbl88irj5jbsray574mh4bg"; depends=[abind coda lme4 MASS Matrix nlme]; }; @@ -4972,7 +5039,7 @@ in with self; { astsa = derive2 { name="astsa"; version="1.9"; sha256="0s5d94ra8fiy0c5h8n6mk7nk9k3cmcdirafb8rcps2aqr3yh4k4d"; depends=[]; }; asus = derive2 { name="asus"; version="1.0.0"; sha256="16hp8xajb631a5amm1cvhzq8z4cwh1vjiavv3n11fzpxyskhmfrb"; depends=[rwt wavethresh]; }; asymLD = derive2 { name="asymLD"; version="0.1"; sha256="1q05pxwn6arpalspgf2m0cym4ivnwyv94i58k9kaihd37kvm5lgc"; depends=[]; }; - asymmetry = derive2 { name="asymmetry"; version="2.0"; sha256="02l9sg4f7i0mxzh4p7r930fswy4b04dv0icm7f2h1rldsnswh2sk"; depends=[gplots smacof]; }; + asymmetry = derive2 { name="asymmetry"; version="2.0.2"; sha256="0x5yzlf804mhwfr9244b04vnixiyh5d8vmqrfffgid3dijg2zszm"; depends=[gplots smacof]; }; asympTest = derive2 { name="asympTest"; version="0.1.4"; sha256="02l07psiy1888zx86j2r1l5lznz47wdmzbh39pd2nbj8r9i80szr"; depends=[]; }; asypow = derive2 { name="asypow"; version="2015.6.25"; sha256="0il38djkmw5ka7czpalmhq6yycx7flpdpgbd7p5nx52rsjdv49mj"; depends=[]; }; atable = derive2 { name="atable"; version="0.1.2"; sha256="0859yyg2a548wajsmjljzk5hysj14fgsk63qhy35838rkgw85zxc"; depends=[DescTools doBy effsize Hmisc plyr reshape2 settings]; }; @@ -4992,6 +5059,7 @@ in with self; { audit = derive2 { name="audit"; version="0.1-1"; sha256="0hrcdcwda5c0snskrychiyfjcbnymkcl2x43bapb6inw9y8989qv"; depends=[]; }; auditor = derive2 { name="auditor"; version="0.3.1"; sha256="1ndd5a5264b91qaw0qj9rwjvhn9lgw7y5dirjqlzkib6q9mcyanq"; depends=[car factoextra fdrtool GGally ggplot2 ggrepel gridExtra hnp plotROC ROCR tseries]; }; augSIMEX = derive2 { name="augSIMEX"; version="3.7.3"; sha256="0cdqpckc4aiwi2dnkcvk2m9n0bg9f7qmd84n3rdw6clcrd0f95wz"; depends=[Formula MASS nleqslv Rcpp rootSolve]; }; + augmentedRCBD = derive2 { name="augmentedRCBD"; version="0.1.1"; sha256="0l2x8f8xqrvsn4gbi707xw2nfxcvcmxwgpzq4vh8ngxnq89m2179"; depends=[dplyr emmeans flextable ggplot2 moments multcomp multcompView officer Rdpack reshape2 stringi]; }; auk = derive2 { name="auk"; version="0.3.3"; sha256="0ysp1wn8ik2sgl2cc21bjvfhr39clc485frpi6z7xmnh57aqi56q"; depends=[assertthat countrycode dplyr httr magrittr rlang stringi stringr tidyr]; }; aurelius = derive2 { name="aurelius"; version="0.8.4"; sha256="00bpf9sggvnajpmg3zsdgfjinkb6wbrcf1ris7qfhh1rp5rz4m4m"; depends=[gbm glmnet jsonlite]; }; auth0 = derive2 { name="auth0"; version="0.1.1"; sha256="1snmd6b16paglfpaf0bawja25rj3n7k8cv3hd7112vspc7lb62h0"; depends=[htmltools httr shiny yaml]; }; @@ -5008,17 +5076,17 @@ in with self; { autoplotly = derive2 { name="autoplotly"; version="0.1.2"; sha256="0ajzzj9w9f0v9n37liml63hq5xwkqq53lw85p0a2h99n4lg2hdg8"; depends=[ggfortify ggplot2 plotly]; }; autopls = derive2 { name="autopls"; version="1.3"; sha256="1qf5gk1vsz1p5670w7bgzh3b15wvrx1gy6ih4sivw0vj8bcjxbw9"; depends=[pls]; }; autoshiny = derive2 { name="autoshiny"; version="0.0.2"; sha256="0s06ynnirgsh19x8qq4020piirkhvjqpvz372syygvlal062y6cn"; depends=[shiny]; }; - autothresholdr = derive2 { name="autothresholdr"; version="1.3.4"; sha256="1d0zx0k6pxcymm6h915039rs6ncq3cmjnci571520fc3l0svvl8j"; depends=[checkmate filesstrings glue ijtiff magrittr purrr Rcpp rlang]; }; + autothresholdr = derive2 { name="autothresholdr"; version="1.3.5"; sha256="1dvc21w57ir34vhcrbz58scl4ly057yn1ibmdkly99hwfkpihv3x"; depends=[checkmate filesstrings glue ijtiff magrittr purrr Rcpp rlang]; }; autovarCore = derive2 { name="autovarCore"; version="1.0-4"; sha256="0i5fvx0z2kri0c855q40hd596kfjhmwpp2zw7d7k0xvk2xbcgbiv"; depends=[Amelia jsonlite Rcpp urca vars]; }; av = derive2 { name="av"; version="0.2"; sha256="0vw6136sh1rgsah10xrcrgrpb6rpf5l8vixs950yq51syxc1y2qc"; depends=[]; }; - available = derive2 { name="available"; version="1.0.2"; sha256="0fhynbw75f7adw3168a4mkaqkpb910bi0rym8imbpasgnqrr6smc"; depends=[cli clisymbols crayon desc glue jsonlite memoise SnowballC stringdist tibble tidytext udapi yesno]; }; + available = derive2 { name="available"; version="1.0.4"; sha256="18dqm10dicbvjd5wli4nkv4fip0fgh2b9h9gm5511ayfsdg8lc8l"; depends=[cli clisymbols crayon desc glue jsonlite memoise SnowballC stringdist tibble tidytext udapi yesno]; }; averisk = derive2 { name="averisk"; version="1.0.3"; sha256="02j27d4jxgy2bk5sgxp1xdfyqr321civs99qj0g8cp34gwqk0j3m"; depends=[MASS]; }; aweek = derive2 { name="aweek"; version="1.0.0"; sha256="0a9d4yp694qch34mf08qc5fwsn21h9mw1ak6vylaq73nwiihajw9"; depends=[]; }; aws = derive2 { name="aws"; version="2.2-1"; sha256="1g0saj3v67cjdk6396ck3ah7qvv3m9awj4b3v1n86nkwdpa75z91"; depends=[awsMethods gsl]; }; aws_alexa = derive2 { name="aws.alexa"; version="0.1.7"; sha256="0k3kwkmi13j2nrkyi6ahpc98s24idx4m5s4wkqkgqhi8xaljpp7c"; depends=[aws_signature dplyr httr xml2]; }; aws_cloudtrail = derive2 { name="aws.cloudtrail"; version="0.1.5"; sha256="0p7qj9ivs14ska11a9qni4n0f8d05c1p126zvlxj9038c9p0y1wx"; depends=[aws_s3 aws_signature httr jsonlite]; }; aws_comprehend = derive2 { name="aws.comprehend"; version="0.1.2"; sha256="0480ggfdmcv2pkjzmwh40h4nd87qswrpwr6h3j959f9y8zmzfd7n"; depends=[aws_signature httr jsonlite]; }; - aws_ec2metadata = derive2 { name="aws.ec2metadata"; version="0.1.6"; sha256="0mcrgkz6kc2i59m0s40szkaz1hqvs5nak53q4wxxpc2ykc6r6izn"; depends=[curl jsonlite]; }; + aws_ec2metadata = derive2 { name="aws.ec2metadata"; version="0.2.0"; sha256="1lbljg2fp3yh1hwlbmprkc1prw80jv0ycvpg1vggagm68wm5x288"; depends=[curl jsonlite]; }; aws_iam = derive2 { name="aws.iam"; version="0.1.7"; sha256="0hag8j5g8rqg39x4f6d8vwwzhz98cx7549xixfl9cxiff7x9sz2c"; depends=[aws_signature httr jsonlite xml2]; }; aws_kms = derive2 { name="aws.kms"; version="0.1.2"; sha256="1bg1csdlwgaw928jschq1pxhg1ibrzy2q85vvc2zhlfd6c6xif3d"; depends=[aws_signature base64enc httr jsonlite]; }; aws_lambda = derive2 { name="aws.lambda"; version="0.1.6"; sha256="16vis596clxn6h9j1k66224ikacsg0f9xrzqi5987nqlzrwskjgk"; depends=[aws_signature base64enc httr jsonlite]; }; @@ -5040,6 +5108,7 @@ in with self; { baRcodeR = derive2 { name="baRcodeR"; version="0.1.3"; sha256="06fk70d52c4vi5bc42wljpxkvr3n45likhvs5b5r0lpw4himy1fm"; depends=[DT miniUI qrcode rstudioapi shiny]; }; babar = derive2 { name="babar"; version="1.0"; sha256="13j5klrcnd4dwrgdbxlvwcj56l9mzi4j9ga6jj5i04pgdc6vsfx5"; depends=[]; }; babel = derive2 { name="babel"; version="0.3-0"; sha256="1iwvx69051yhlxbcl6bypvc3mcih0q8bf3i29r3i79356hp12xqa"; depends=[edgeR]; }; + babelwhale = derive2 { name="babelwhale"; version="1.0.0"; sha256="054m108wws0i58r4zk1qgd2fkfccdb7rw95ja467m63k0g9pxzn3"; depends=[crayon dplyr dynutils processx purrr]; }; babynames = derive2 { name="babynames"; version="1.0.0"; sha256="1vchzyk5pkr0zhh1q8k9g771n45jxiislipwkgrgamv7yzr49xsp"; depends=[tibble]; }; bacistool = derive2 { name="bacistool"; version="0.9.8"; sha256="1yq7d2657l6iyy5v094c9rwphbpyhnijhwvacwhb07k6c6h069wh"; depends=[rjags]; }; backShift = derive2 { name="backShift"; version="0.1.4.2"; sha256="1nj7mcdpzfzq68qg86rrys752gzw69n99yyb0jzg6r8qrgpcxj49"; depends=[clue ggplot2 igraph MASS matrixcalc mvnmle reshape2]; }; @@ -5050,19 +5119,21 @@ in with self; { badgecreatr = derive2 { name="badgecreatr"; version="0.2.0"; sha256="0mdixklaxky5gs8zm99ky280vxxlbq1mxnaarq6x0d1cb71bzv4l"; depends=[git2r]; }; badger = derive2 { name="badger"; version="0.0.4"; sha256="0y0kr0r5b44c19w93sisd61khiwhlgj3n88mhfgs3ljbl68qjcvh"; depends=[dlstats rvcheck]; }; bagRboostR = derive2 { name="bagRboostR"; version="0.0.2"; sha256="1k9w98p3ad3myzyqhcrc4rsn7196qvhnmk5ddx3fpd1rdvy2dnby"; depends=[randomForest]; }; + baggedcv = derive2 { name="baggedcv"; version="1.0"; sha256="1rqs4sm6g1anck5s2dxlm1vcmylpphcbs2dpvf1sjki5lrzdq9z4"; depends=[doParallel foreach kedd mclust]; }; + baggr = derive2 { name="baggr"; version="0.1.0"; sha256="04iqvdj3ih5i6qwb25rmngvhw66v00xb2x5mzgbicd712dydp57s"; depends=[bayesplot BH crayon ggplot2 gridExtra Rcpp RcppEigen rstan rstantools StanHeaders]; }; bain = derive2 { name="bain"; version="0.2.1"; sha256="0z3c6k4hr6zkkzm2v8m1rmblbcz2j7hzipa9brirhhwqdlh8l6mj"; depends=[]; }; bairt = derive2 { name="bairt"; version="0.1.2"; sha256="17nc0lp0bzwshik33v0gq5d6nd2gvm4799b7rfiq089zhnzv90kj"; depends=[coda mvtnorm shiny shinyjs]; }; baitmet = derive2 { name="baitmet"; version="1.0.1"; sha256="02ydakqr8v41hdnhcsgigwnic8d48qswryg1srb5w1fqdmdglnkl"; depends=[erah HiClimR Rcpp signal XML]; }; - balance = derive2 { name="balance"; version="0.1.9"; sha256="1nr6v0m98rx30ij4q80w5i1f9rss7w4k9yk074y9xp2dpaxh36s6"; depends=[ggplot2]; }; + balance = derive2 { name="balance"; version="0.2.4"; sha256="13ksd1ysd2by8qdc3vn1fgnaj1c2v0py7f501bajiyq6hpcwn1c5"; depends=[ggplot2]; }; ballr = derive2 { name="ballr"; version="0.2.3"; sha256="1bfbdzn4q3i5m87vbxymxha54vgxjfckzpxk52m54fkwpz6yw9cl"; depends=[dplyr janitor lubridate magrittr rlang rvest xml2]; }; bamboo = derive2 { name="bamboo"; version="0.9.24"; sha256="1fw1wniba0kxb44d2w9r9nh5sy1jhrk48bn0zblz2y6gvwn8m2vn"; depends=[rscala]; }; - bamdit = derive2 { name="bamdit"; version="3.2.1"; sha256="18l9kd3a0d4y6z38k9nm18j32g6dxmwylv8cv1wp3fzffv51lm1s"; depends=[ggExtra ggplot2 gridExtra MASS R2jags rjags]; }; - bamlss = derive2 { name="bamlss"; version="1.0-1"; sha256="1nxy8a075dhdwz9jhyicqj1naz95w0mns64c6j59gpzwp03nvml4"; depends=[coda colorspace Formula Matrix MBA mgcv mvtnorm sp survival]; }; + bamdit = derive2 { name="bamdit"; version="3.3.2"; sha256="11v9hy8ijbcqhwim0s3y69dz11jvys4vjvfnshj4p5qdz38sji6l"; depends=[ggExtra ggplot2 gridExtra MASS R2jags rjags]; }; + bamlss = derive2 { name="bamlss"; version="1.0-2"; sha256="1g28c91j6zkmcah7dblgpgw789fsrcd9f3gbr8n8aa2yfflazjkp"; depends=[coda colorspace Formula Matrix MBA mgcv mvtnorm sp survival]; }; bamp = derive2 { name="bamp"; version="2.0.7"; sha256="0yrqy4cj6wq98d5yfm9ahzhp2giwyqzd93s2fhxb8r4mzza5i9hm"; depends=[abind coda]; }; banR = derive2 { name="banR"; version="0.2.0"; sha256="0m71m99f8f4wckylry6z16gw6r2cc4wxbd9287ns00jr6s13x6c8"; depends=[dplyr httr magrittr purrr readr rlang stringr tibble]; }; bandit = derive2 { name="bandit"; version="0.5.0"; sha256="03mv4vbn9g4mqikd9map33gmw2fl9xvb62p7gpxs1240w5r4w3fp"; depends=[boot gam]; }; bang = derive2 { name="bang"; version="1.0.0"; sha256="16wy2imrdvhpdzi6ix9k69afqdyc44d1xr655yd3q1cl12x1nr04"; depends=[bayesplot rust]; }; - bannerCommenter = derive2 { name="bannerCommenter"; version="0.1.0"; sha256="0ycx771g9a73w0sx8zzix8kswwbjagzhbyvaq7l5r8a9ayfli8ic"; depends=[]; }; + bannerCommenter = derive2 { name="bannerCommenter"; version="0.1.1"; sha256="0ndm4z6gkd9flxsh1sx08c5ahm8297hzn8f5hc1mpn5m998ajjsj"; depends=[]; }; banter = derive2 { name="banter"; version="0.9.3"; sha256="1ziys0zy66477ynr8rp2kv7w82n6226whn47aa06kkb4nhcqfk2c"; depends=[dplyr ggplot2 gridExtra magrittr plyr randomForest ranger rfPermute rlang tibble tidyr]; }; banxicoR = derive2 { name="banxicoR"; version="0.9.0"; sha256="0vchm2hnqm45fhn8k38rcam4vkazmifcl40390s2r04bgvqr0pnl"; depends=[rvest stringr xml2]; }; bapred = derive2 { name="bapred"; version="1.0"; sha256="08kvc4cc984jv08ikwbja8zxidrcdiwi5w88hlqakbm8yc6hzssa"; depends=[affy affyPLM Biobase FNN fuzzyRankTests glmnet lme4 MASS mnormt sva]; }; @@ -5078,8 +5149,8 @@ in with self; { baseballDBR = derive2 { name="baseballDBR"; version="0.1.2"; sha256="0w54g1avcqamc12lmvjchlqbqck9jfjccm441k03nsql460mpydq"; depends=[dplyr magrittr rvest xml2]; }; basefun = derive2 { name="basefun"; version="1.0-5"; sha256="1w8nbwpa9invndhlndha4dsrmvmar4xar1hzixnxkcbrzj6yzmi8"; depends=[Matrix orthopolynom polynom variables]; }; baseline = derive2 { name="baseline"; version="1.2-1"; sha256="1vk0vf8p080ainhv09fjwfspqckr0123qlzb9dadqk2601bsivgy"; depends=[SparseM]; }; - basetheme = derive2 { name="basetheme"; version="0.1.0"; sha256="05b1fk65x1hhkd10pihpqpdf5kqgckrs8sr7y6s9yv9rifq9m650"; depends=[]; }; - basicMCMCplots = derive2 { name="basicMCMCplots"; version="0.2.0"; sha256="0j8hsgs91qv9l0xngv87w6my61207c56jkl9s125xmlrqg5ifj84"; depends=[]; }; + basetheme = derive2 { name="basetheme"; version="0.1.1"; sha256="021zgrdqz1yvb2linraskfk9cxqjjc3p5z5r0dhhnrkpy4ijbkyz"; depends=[]; }; + basicMCMCplots = derive2 { name="basicMCMCplots"; version="0.2.2"; sha256="1yhdhl1vzvz7wysrgj96dgqsbdc1p7031m0m69m8ha8wx4vryil8"; depends=[]; }; basicTrendline = derive2 { name="basicTrendline"; version="2.0.3"; sha256="10rq9hriyn50b28ikvl0vsvchbkrc0pjzxamq4ix1xd04n4drkl9"; depends=[investr scales]; }; basicspace = derive2 { name="basicspace"; version="0.20"; sha256="0nyljk8ydasirgv7ijxplyhk10s8m9k3rw5qmgf0z81dm7p257wc"; depends=[]; }; basictabler = derive2 { name="basictabler"; version="0.3.0"; sha256="1dzjdgc8ffnr219m5zb410ln1rbnzz96g1aqb70pkg9gp0ykgk29"; depends=[dplyr htmltools htmlwidgets jsonlite R6]; }; @@ -5093,7 +5164,7 @@ in with self; { batman = derive2 { name="batman"; version="0.1.0"; sha256="0ccgx506p4iri23k2ikb8jmh04dp08w66785bv52iy8kd359h43f"; depends=[Rcpp]; }; batteryreduction = derive2 { name="batteryreduction"; version="0.1.1"; sha256="0j838q7063bplkzd50kmnxji80cgysfsq7m1qifv8z7a2zsh8c8g"; depends=[pracma]; }; bayes4psy = derive2 { name="bayes4psy"; version="1.1.1"; sha256="08fziwvsdwwwpk5hjsh8r9n920qqcwz5j5566p3m78dm5dsjkl7x"; depends=[BH circular cowplot dplyr emg ggplot2 mcmcse metRology Rcpp RcppEigen reshape rstan rstantools StanHeaders]; }; - bayesAB = derive2 { name="bayesAB"; version="1.1.1"; sha256="0kxrhxg43hzkcziyqpwy29iqs7i0qi3pn3jz0z1s8paf8drbgdf4"; depends=[ggplot2 Rcpp]; }; + bayesAB = derive2 { name="bayesAB"; version="1.1.2"; sha256="0xg29s3h4dy43snlc365q80ix96hwh4mfy1qvv87yys3i9zfinm5"; depends=[ggplot2 Rcpp rlang]; }; bayesCL = derive2 { name="bayesCL"; version="0.0.1"; sha256="1l278lxidn16nma2ny14wjajcqyzbr6j5xl2lj08cic26c7hvjbm"; depends=[]; }; bayesCT = derive2 { name="bayesCT"; version="0.99.1"; sha256="1ylv7l4rs4sb7lld6m2w02xg9g26fm8z9jdrszbjc18z1f4bm78j"; depends=[bayesDP dplyr magrittr purrr]; }; bayesDP = derive2 { name="bayesDP"; version="1.3.2"; sha256="1xv133v01mbfsy0w5acc9819m92dcxfdjg4a8p7kdfkycz4ilwnl"; depends=[ggplot2 Rcpp RcppArmadillo survival]; }; @@ -5116,13 +5187,14 @@ in with self; { bayeslm = derive2 { name="bayeslm"; version="0.8.0"; sha256="1gvqkbz1wmqkxjwkdgj5pir5j1qy5dzjm4jv6mz3mplm16z5vzbl"; depends=[coda Rcpp RcppArmadillo RcppParallel]; }; bayesloglin = derive2 { name="bayesloglin"; version="1.0.1"; sha256="0j2ziahf6mwsz2gvb1azvdzlmszlpqgr5zqcqa68pxgq947sa2cs"; depends=[igraph]; }; bayeslongitudinal = derive2 { name="bayeslongitudinal"; version="0.1.0"; sha256="0g45ikpnbry1albb3asrzab5z3sy98yf74c64qn02d65xgafifwg"; depends=[LearnBayes MASS mvtnorm]; }; - bayesm = derive2 { name="bayesm"; version="3.1-1"; sha256="0y30cza92s6kgvmxjpr6f5g0qbcck7hslqp89ncprarhxiym2m28"; depends=[Rcpp RcppArmadillo]; }; + bayesm = derive2 { name="bayesm"; version="3.1-3"; sha256="041ach2f2vrqzd5kz17v7wmkjz6z8cjjihpk4qvczm4cr9z85r2i"; depends=[Rcpp RcppArmadillo]; }; bayesmeta = derive2 { name="bayesmeta"; version="2.3"; sha256="12rljnlr7wv0q95ild7vrsbgkpg7zw1lmh6gx4kpip1ckax04360"; depends=[forestplot metafor]; }; bayesmix = derive2 { name="bayesmix"; version="0.7-4"; sha256="1qms1nnk2nq3gqr8zf2b9ri4wv8jrxv5i8s087k1rwdvya3k5r9a"; depends=[coda rjags]; }; bayesplot = derive2 { name="bayesplot"; version="1.7.0"; sha256="0h23sbfny2hcipvvfhq5aiwdh1vanizn7f8lpb9kffypxhcd7v7w"; depends=[dplyr ggplot2 ggridges glue reshape2 rlang tibble tidyselect]; }; bayespref = derive2 { name="bayespref"; version="1.0"; sha256="0gwlzs7qkgmf90np7xv85d27jjqggyhfj00vpya664a2znyjb3jm"; depends=[coda lattice MASS MCMCpack RColorBrewer]; }; bayesreg = derive2 { name="bayesreg"; version="1.1"; sha256="12g5sklip3i8fpzrhvbikhgnl6kx8fxb88hfv8f34jy71r3h7zyp"; depends=[pgdraw]; }; bayess = derive2 { name="bayess"; version="1.4"; sha256="0axipk5hn2hw3g4dfh7y3xa0dxqmi8kqpbr77nl14y7ydpija6xm"; depends=[combinat gplots MASS mnormt]; }; + bayest = derive2 { name="bayest"; version="1.0"; sha256="0ysfy96s9pk0xw0rzygf43c5jpj9j37kap3cd6w3m6361a0dw8mj"; depends=[]; }; bayestestR = derive2 { name="bayestestR"; version="0.2.2"; sha256="09r654lrhwwnshn5h2s2fbx3c8wigv3j4sva5hmfnkwjg8cclhd9"; depends=[insight]; }; bayesvl = derive2 { name="bayesvl"; version="0.8.5"; sha256="1gb2in8hjiqb3daqz6phn1639i6p2w641kxrm3zh4rm3d6hg6hzr"; depends=[bayesplot bnlearn coda dplyr ggplot2 reshape2 rstan StanHeaders viridis]; }; bayfoxr = derive2 { name="bayfoxr"; version="0.0.1"; sha256="1295296mbjpmd0bg1pfxvyp0az3sry6gsq9ir3l8x64w5a4qrzd5"; depends=[]; }; @@ -5155,6 +5227,7 @@ in with self; { bdclean = derive2 { name="bdclean"; version="0.1.15"; sha256="14cy8yaqd6bg2zyh2wvndydk9sigaydavxl4cfypqz5kqdhj82z9"; depends=[bdchecks bdDwC data_table DT finch knitr leaflet rgbif rmarkdown shiny shinydashboard shinyjs spocc]; }; bde = derive2 { name="bde"; version="1.0.1"; sha256="1f25gmjfl58x4pns89abfk85yq5aad3bgq9yqpv505g5gxk62d3v"; depends=[ggplot2 shiny]; }; bdots = derive2 { name="bdots"; version="0.1.19"; sha256="1cj6ly62d50z6713119hadl90cxf5x30wpnpx6mssmd49zds6nxb"; depends=[doParallel doRNG foreach Matrix mvtnorm nlme]; }; + bdpar = derive2 { name="bdpar"; version="1.0.0"; sha256="0f5hwm4j4m8q1jgyal710p6s1hwc05kxzmcp3zsavwm8qzcc9s60"; depends=[ini magrittr pipeR purrr R6 rlist svMisc]; }; bdpopt = derive2 { name="bdpopt"; version="1.0-1"; sha256="1z7mdqklw3frsdzyhvx8s8wvblwm28fr1gca2yrivqjng0r47lx4"; depends=[coda rjags]; }; bdpv = derive2 { name="bdpv"; version="1.3"; sha256="0wcnmamqrbqwskgv2yhnxq2kb179n63c825y9hsl20rfca0ijh6m"; depends=[]; }; bdribs = derive2 { name="bdribs"; version="1.0.4"; sha256="19qakmdw3l8vfxkr4p1ydkyfs4cmq37lqzw7l5zx5rdn6zlhqwh4"; depends=[rjags]; }; @@ -5185,7 +5258,7 @@ in with self; { benchden = derive2 { name="benchden"; version="1.0.5"; sha256="1cwcgcm660k8rc8cpd9sfpzz66r55b4f4hcjc0hznpml35015zla"; depends=[]; }; benchmarkme = derive2 { name="benchmarkme"; version="1.0.0"; sha256="1jslcz56m48rx64w80xxccdzhmqbpg2b81rp8i358mj9xjrasya9"; depends=[benchmarkmeData doParallel dplyr foreach httr Matrix tibble]; }; benchmarkmeData = derive2 { name="benchmarkmeData"; version="1.0.1"; sha256="1azjsvz855kzrd2fwc2v06pzdlc75492sq8pxwk4via8jp11jm67"; depends=[dplyr tibble]; }; - benchr = derive2 { name="benchr"; version="0.2.3"; sha256="1rjcjhjarmrbw5mn77vpi18cykf0lvagv6hnfcc24057anng48ip"; depends=[Rcpp RcppProgress]; }; + benchr = derive2 { name="benchr"; version="0.2.3-1"; sha256="1q8g9v7zbspd2gmydwwfi3avdsnmn5ahr9iybdqsicgfch5plsf5"; depends=[Rcpp RcppProgress]; }; bender = derive2 { name="bender"; version="0.1.1"; sha256="07npksrj094h884lli0fjvwjc1lhcwzlsk9wx82761mka5xajv4v"; depends=[httr jsonlite R6]; }; benford_analysis = derive2 { name="benford.analysis"; version="0.1.5"; sha256="0y0c7l2r9s7lg9bw4ndcqwisa5l6a2cpydn1vmz88h3yva0l68cg"; depends=[data_table]; }; bentcableAR = derive2 { name="bentcableAR"; version="0.3.0"; sha256="1gjrlv94av9955jqhicaiqm36rrgmy0avxn9y7wbp2s1sbg7fyg7"; depends=[]; }; @@ -5203,7 +5276,7 @@ in with self; { betas = derive2 { name="betas"; version="0.1.1"; sha256="1v85r6lrk21viwzam42gi42bgbwh5ibn3dpbh3aqrf3dnn1rdsyd"; depends=[robust]; }; betategarch = derive2 { name="betategarch"; version="3.3"; sha256="0hqvyps3lwix2fkzk18wrkhxpqhgardvib9sq1ip8gn8sn1dsi8y"; depends=[zoo]; }; bethel = derive2 { name="bethel"; version="0.2"; sha256="1zlkw672k1c5px47bpa2vk3w2906vkhvifz20h6xm7s51gmm64i0"; depends=[]; }; - beyondWhittle = derive2 { name="beyondWhittle"; version="1.1"; sha256="178bhy2plkahklgwyhk2rlamjzyi8md612z58wi1mrbryzv4lsy1"; depends=[BH forecast ltsa MASS MTS Rcpp RcppArmadillo]; }; + beyondWhittle = derive2 { name="beyondWhittle"; version="1.1.1"; sha256="1nr414wvfwycp3s9v592jd4gk5wdjfklk7ypqabx73k5fsxrcc0g"; depends=[BH forecast ltsa MASS MTS Rcpp RcppArmadillo]; }; bezier = derive2 { name="bezier"; version="1.1.2"; sha256="1vw5128v8h973xwa1fdm9cw2jvrldj87nd55lddlp3qsz3ag4br6"; depends=[]; }; bfa = derive2 { name="bfa"; version="0.4"; sha256="08n6446xl2w8z0rsqi6v2hp9cp744frxw6vrbxg5cpybhyyfzr36"; depends=[coda Rcpp RcppArmadillo]; }; bfast = derive2 { name="bfast"; version="1.5.7"; sha256="0n75minka55rxpvs3qkj0c65ydn1gc3i8lkr2gdyn1adjkl5yn01"; depends=[forecast raster sp strucchange zoo]; }; @@ -5214,7 +5287,7 @@ in with self; { bgmfiles = derive2 { name="bgmfiles"; version="0.0.6"; sha256="10qldfjjq5fx5jrrakdxc8k2pf0vp8ifg18nq56lvx9n28mqigim"; depends=[]; }; bgmm = derive2 { name="bgmm"; version="1.8.3"; sha256="09hsqjjyzlpl0fqb7832j5ydrr0yc42zb1c9q1y5hbrms7yp00p8"; depends=[car combinat lattice mvtnorm]; }; bgsmtr = derive2 { name="bgsmtr"; version="0.5"; sha256="1yqj3761zs64kdh63vaz6glpv65i3ji8fi51nqq8wlggak0zklnx"; depends=[CholWishart coda EDISON inline LaplacesDemon Matrix matrixcalc miscTools mnormt mvtnorm Rcpp sparseMVN statmod]; }; - bhm = derive2 { name="bhm"; version="1.13"; sha256="1iq1hjc7xn2kmmxgzv6mzcvvf48kqp5b8lavmzrqykak3v4z02nz"; depends=[coda survival]; }; + bhm = derive2 { name="bhm"; version="1.15"; sha256="1xfm1k3wf4k1c65pd9201c00y4qda3lw9aycjh6q34ixyl6g5jg5"; depends=[coda MASS survival]; }; bhrcr = derive2 { name="bhrcr"; version="1.0.3"; sha256="1w52f4ghl328vdcr8hwvmdrnxnj45fy4r21yqzg5q1fpd4mpjw2i"; depends=[AER Cairo MASS MCMCpack msm mvtnorm survival]; }; biasbetareg = derive2 { name="biasbetareg"; version="1.0"; sha256="1562zdin0y5mrp36ih11ir3h9cv49cx1l98chxd89fkj8x3c1fbg"; depends=[betareg]; }; bib2df = derive2 { name="bib2df"; version="1.1.1"; sha256="0d57883df774qqwpssmly3f1gci32yc5sgwc3x8f2rjih23s1nf6"; depends=[dplyr httr humaniformat stringr]; }; @@ -5225,6 +5298,7 @@ in with self; { bife = derive2 { name="bife"; version="0.6"; sha256="1fmzmzq3hxr9kzqq5zmmsm2927vjb5mj08g2pnzljhmvsn2b7x3y"; depends=[data_table Formula Rcpp RcppArmadillo]; }; bigGP = derive2 { name="bigGP"; version="0.1-6"; sha256="0fwm06rzx1qbh16ii93x26i4v4yb50jk67k3qmzyr3gr4z9b9xhg"; depends=[Rmpi]; }; bigIntegerAlgos = derive2 { name="bigIntegerAlgos"; version="0.1.2"; sha256="1cbcxwhb25ismiyr95pfgc7nq14p4srd9y8y3g3xz0ywjs0qnjy5"; depends=[gmp]; }; + bigKRLS = derive2 { name="bigKRLS"; version="3.0.5.1"; sha256="1za8pxij1nwpdz3lz51zqib99pc73s92lz0k01fkcgw5rj78kgs8"; depends=[BH bigalgebra biganalytics bigmemory ggplot2 Rcpp RcppArmadillo shiny]; }; bigMap = derive2 { name="bigMap"; version="2.1.0"; sha256="0bpnzz3acqn006jk8db5yyvbhl3sq807926igjcxj813i3r0x98r"; depends=[BH bigmemory colorspace RColorBrewer Rcpp RcppArmadillo]; }; bigQueryR = derive2 { name="bigQueryR"; version="0.4.0"; sha256="1b89yfa0gwd3frdh1z6ygxv2dfncb6g4lp67nh7hkm6r9xamfrxr"; depends=[assertthat googleAuthR googleCloudStorageR httr jsonlite]; }; bigReg = derive2 { name="bigReg"; version="0.1.2"; sha256="1hmvh5j40zpzz6c88hmikphps8rb741yvkg60dxmkfl8gxqsrp3w"; depends=[MASS Rcpp RcppArmadillo uuid]; }; @@ -5242,11 +5316,11 @@ in with self; { bigmemory = derive2 { name="bigmemory"; version="4.5.33"; sha256="0ycl9dzm3drpyas625h34rir5bnbjlncxlvawfsfmqwcbmwdjdvj"; 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]; }; - bigreadr = derive2 { name="bigreadr"; version="0.1.5"; sha256="1w9kk7kpa7g549dhr39md4qazgx94ss54an7sz0gq0frm3flg2sc"; depends=[data_table fpeek Rcpp]; }; - bigrquery = derive2 { name="bigrquery"; version="1.1.1"; sha256="1if39xkr231xmjq10fx2g7bgg4jgfd3wzx1p9g3pq4hbf2s6x0is"; depends=[assertthat bit64 curl DBI glue httr jsonlite prettyunits progress rapidjsonr Rcpp tibble]; }; + bigreadr = derive2 { name="bigreadr"; version="0.1.7"; sha256="0sdjdwdgw2jicdqrpyan4nma060yimd6wpxwvw06h4spljbp00yl"; depends=[data_table fpeek Rcpp]; }; + bigrquery = derive2 { name="bigrquery"; version="1.2.0"; sha256="1ggh2gngr5x0g6y7d55y6kvn94anf7qi1bkc28cjmw61hxjq38fb"; depends=[assertthat bit64 curl DBI gargle glue httr jsonlite prettyunits progress rapidjsonr Rcpp rlang tibble]; }; bigsplines = derive2 { name="bigsplines"; version="1.1-1"; sha256="1kf04p2lglzdi1fdryk27nmj2a2jca2ii7ki8vak93sq21isb179"; depends=[quadprog]; }; bigstatsr = derive2 { name="bigstatsr"; version="0.9.1"; sha256="0v0rxp45lbv5bmvyfkm1v4l2rr7g1rfymi547y10b2zysllbfbr0"; depends=[bigreadr cowplot doParallel foreach ggplot2 Rcpp RcppArmadillo rmio RSpectra tibble]; }; - bigstep = derive2 { name="bigstep"; version="1.0.1"; sha256="1x93g7nsndxdan42zpn1f155cnahbmw5l2zchq4j49g62db1n06x"; depends=[bigmemory magrittr matrixStats R_utils RcppEigen speedglm]; }; + bigstep = derive2 { name="bigstep"; version="1.0.3"; sha256="0ygp1vljqqn5vzpjxlv9d6fxxv3bi2kfyqfs1gf0jgxwb9417b82"; depends=[bigmemory magrittr matrixStats R_utils RcppEigen speedglm]; }; bigtabulate = derive2 { name="bigtabulate"; version="1.1.5"; sha256="1jvp3m0ms2cav9z8vvhh80gsa0kvc351brv2jq99rxv1mwvpa4xj"; depends=[BH biganalytics bigmemory Rcpp]; }; bigtcr = derive2 { name="bigtcr"; version="1.1"; sha256="1l03yc28afdm7glbw4ay0zsywjgqg5l90qz1hfhslsy8gg7d5wq5"; depends=[]; }; bigtime = derive2 { name="bigtime"; version="0.1.0"; sha256="136gy2i4qwa2drklllyzp3z0dbijlavgf3sxy73bf84df2yq1c9i"; depends=[corrplot lattice MASS Rcpp RcppArmadillo RcppEigen zoo]; }; @@ -5294,7 +5368,7 @@ in with self; { biogeo = derive2 { name="biogeo"; version="1.0"; sha256="14sqgg8b06gp5dajxvyj9s3ndsk7jpkfr0mkyl2l61kgp6qx53rh"; depends=[maptools raster sp stringr vegan]; }; biogram = derive2 { name="biogram"; version="1.4"; sha256="1kkim6dxmvvpby2ir280adl14jmrz7nsib3m8g2ki81d539km6il"; depends=[bit combinat entropy partitions slam]; }; bioimagetools = derive2 { name="bioimagetools"; version="1.1.3"; sha256="1xl5q45s4amvinfzysf5za0myq1f76xvqhyza0b191bky5vk8qq1"; depends=[EBImage httr tiff]; }; - bioinactivation = derive2 { name="bioinactivation"; version="1.2.2"; sha256="1rpza2a0chkg1r1bhc8wm24gmg5fwzxnxm9nlc040890xqdzpadg"; depends=[deSolve dplyr FME ggplot2 lazyeval MASS rlang]; }; + bioinactivation = derive2 { name="bioinactivation"; version="1.2.3"; sha256="0gz1bbakf6b23jsbvrr8314yxajxcr1akm5srgm883lrf1p5ax13"; depends=[deSolve dplyr FME ggplot2 lazyeval MASS purrr rlang]; }; biolink = derive2 { name="biolink"; version="0.1.6"; sha256="1szsplhzrn660aw442ad73rwhmyqjwqq6faaz4bw86khsvxh993y"; depends=[DBI glue memoise rentrez RMySQL xml2]; }; biomartr = derive2 { name="biomartr"; version="0.9.0"; sha256="0178y8m31rkzgrp7dnx9rbwvjfybvb342d5a3y67z6mkha90iiq2"; depends=[biomaRt Biostrings curl data_table downloader dplyr fs httr jsonlite philentropy purrr R_utils RCurl readr stringr tibble XML]; }; biomod2 = derive2 { name="biomod2"; version="3.3-7.1"; sha256="0g8knlkrxlwxbh1qzxhv2lf1zxrlqf7s6yhzvch18y8w021d8d9c"; depends=[abind dismo earth gbm ggplot2 MASS mda nnet PresenceAbsence pROC randomForest raster rasterVis reshape rpart sp]; }; @@ -5309,7 +5383,7 @@ in with self; { biotools = derive2 { name="biotools"; version="3.1"; sha256="15y3ccmj1gslzc0lp0gvc66hf0yigx3zkqnw46crgrizjm2kmjay"; depends=[boot lattice MASS rpanel SpatialEpi tkrplot]; }; bipartite = derive2 { name="bipartite"; version="2.13"; sha256="11l8lialvb02wwk6q81sq0i48v422rcvxxbkz74la820a2qzdwcx"; depends=[fields igraph MASS permute sna vegan]; }; bipartiteD3 = derive2 { name="bipartiteD3"; version="0.2.0"; sha256="1jvhlycmxii4vcm9qbj246qkwhd1bcggqq56b5rmbyqwd4vhqh8f"; depends=[downloader dplyr purrr r2d3 RColorBrewer stringr tibble tidyr]; }; - biplotbootGUI = derive2 { name="biplotbootGUI"; version="1.1"; sha256="0k92z9iavvq5v56x2hgkmrf339xl7ns1pvpqb4ban8r1j8glzawi"; depends=[cluster dendroextras MASS rgl shapes tcltk2 tkrplot]; }; + biplotbootGUI = derive2 { name="biplotbootGUI"; version="1.2"; sha256="07lrs2n6s54h97vjriszszhksdbi14s2i234kwfhg7aq47k6l0jl"; depends=[cluster dendroextras MASS matlib 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="2.1.2"; sha256="07ck59m5mw897a60vmdn1b3qrmqj20qpfsn3093haqbpn8z13dmn"; depends=[]; }; birtr = derive2 { name="birtr"; version="1.0.0"; sha256="0bcxvj30wzwclw1lcyhvwj3k7awd39lrvzia1nrg53hw90bfs811"; depends=[]; }; @@ -5327,7 +5401,7 @@ in with self; { bivariate = derive2 { name="bivariate"; version="0.4.1"; sha256="13qmwz8lwgxppjsq491f8grsg2myhwma4ikhx2k40lag98dpgc9f"; depends=[barsurf intoo KernSmooth mvtnorm]; }; bivgeom = derive2 { name="bivgeom"; version="1.0"; sha256="1cn8k7q011whr4f7zig85dsrkz04614z9ns2ky6k6i16s5n3glxy"; depends=[bbmle copula]; }; bivrp = derive2 { name="bivrp"; version="1.2"; sha256="1yrciaadxlkxzbgdsig80yjn9iqrv8a6ccz62hsnyb3knycpcln1"; depends=[MASS mrfDepth]; }; - biwavelet = derive2 { name="biwavelet"; version="0.20.17"; sha256="183h9mdlpizikg1xnrnd03hbij4fnf5ibsad4jcfmh6d73qcgn9b"; depends=[fields foreach Rcpp]; }; + biwavelet = derive2 { name="biwavelet"; version="0.20.19"; sha256="0pdjjjjiwnl7ihlwzjd9hwl5kzq5wbnbqfmm5pp8gvkcypj9k7rb"; depends=[fields foreach Rcpp]; }; biwt = derive2 { name="biwt"; version="1.0"; sha256="1mb3x8ky3x8j4n8d859i7byyjyfzq035i674b2dmdca6mn7paa14"; depends=[MASS rrcov]; }; bizdays = derive2 { name="bizdays"; version="1.0.6"; sha256="1av96rj4fllfais9xwh1p8601xvsj0awfh9n2n1x5kzca966h8fq"; depends=[jsonlite]; }; bjscrapeR = derive2 { name="bjscrapeR"; version="0.1.0"; sha256="18chbgiwify272iqf0w4vsqh73wbk12d8m2awc5hbnfqblz3phwd"; depends=[dplyr glue readr tibble]; }; @@ -5336,7 +5410,7 @@ in with self; { blaise = derive2 { name="blaise"; version="1.3.4"; sha256="14jk62sw4xs0yip8gh1w2795l8p0ybv83c24ijizxymg16h7i9g7"; depends=[dplyr readr stringr tibble]; }; blandr = derive2 { name="blandr"; version="0.5.1"; sha256="1rqas71hlf000b3z824d8ljshf8bx91bbrzaxxnx5n3chv19w6z6"; depends=[ggplot2 jmvcore knitr R6 rmarkdown stringr]; }; blastula = derive2 { name="blastula"; version="0.2.1"; sha256="1w9g858c6p7qzv86pfndycvpgv6k63r85wlq11249mi2zqzvh7rl"; depends=[commonmark downloader dplyr ggplot2 glue htmltools httr magrittr stringr tidyr]; }; - blavaan = derive2 { name="blavaan"; version="0.3-4"; sha256="01a5mf5gmkgxpa79hg3lhrg1ywlggpy07552dmjsai07j05wrc84"; depends=[coda lavaan loo MCMCpack mnormt nonnest2]; }; + blavaan = derive2 { name="blavaan"; version="0.3-5"; sha256="1hvv33wqa5c57bszds0jad4c7sh3c78glrppy3g64lj0awjk90p7"; depends=[BH coda lavaan loo MCMCpack mnormt nonnest2 Rcpp RcppEigen rstan rstantools StanHeaders]; }; blendedLink = derive2 { name="blendedLink"; version="1.0"; sha256="19d1pnjag89jjvkl5a6wx531qjqp4cv5jk95md6jby27yr52r8vp"; depends=[]; }; blender = derive2 { name="blender"; version="0.1.2"; sha256="1qqkfgf7fzwcz88a43cqr8bw86qda33f18dg3rv1k77gpjqr999c"; depends=[vegan]; }; blin = derive2 { name="blin"; version="0.0.1"; sha256="1h94azm7gli9i4v3li5c1p36p3rkcj2p5j6rqzlzf0pcqs0bsc09"; depends=[abind glmnet MASS Matrix mvtnorm]; }; @@ -5345,8 +5419,8 @@ in with self; { blm = derive2 { name="blm"; version="2013.2.4.4"; sha256="1w6c30cq38j4i1q4hjg12l70mhy5viw886l1lsnxyvniy113in4i"; depends=[]; }; blme = derive2 { name="blme"; version="1.0-4"; sha256="1ca2b0248k0fj3lczn9shfjplz1sl4ay4v6djldizp2ch2vwdgy2"; depends=[lme4]; }; blmeco = derive2 { name="blmeco"; version="1.3"; sha256="0yxwzx8s297mvvr5yspsl1dn3x1pnkxm0sagy7ivi98d2x9y8yn7"; depends=[arm lme4 MASS MuMIn]; }; - blob = derive2 { name="blob"; version="1.1.1"; sha256="0lsg91hk508dd95ivig2lwg62qafwnarjw68110kx63cfk4zkjxc"; depends=[prettyunits]; }; - blockForest = derive2 { name="blockForest"; version="0.2.0"; sha256="1cfbhhk2dyh1jqcsnndv8hmqs33bsmhh84mr6hsf7jm695w0dy17"; depends=[Matrix Rcpp RcppEigen survival]; }; + blob = derive2 { name="blob"; version="1.2.0"; sha256="08z071jzac4gasgfgab0y5g3ilfmlw08ln813wphxg07hsiczw8s"; depends=[prettyunits rlang vctrs]; }; + blockForest = derive2 { name="blockForest"; version="0.2.3"; sha256="19s1v3q489zns09lf00jsqlr5v9yi2drfykg2zh0gp0q4clpwmvj"; depends=[Matrix Rcpp RcppEigen survival]; }; blockRAR = derive2 { name="blockRAR"; version="1.0.0"; sha256="0f71azkjlaj6vcpjq77991vkfjr77nwifyxaqnli94svbbvf3yb6"; depends=[arm bayesDP dplyr ldbounds magrittr tibble]; }; blockTools = derive2 { name="blockTools"; version="0.6-3"; sha256="0023p0msfmp8swq4f5aff40m976np7y051x8hjizzw91hrfa4w2n"; depends=[MASS tibble]; }; blockcluster = derive2 { name="blockcluster"; version="4.4.3"; sha256="0al1v4r26rh4fx4g8gyk8mxfagn75xb9n4lwh3s6xvk87x33p20c"; depends=[Rcpp rtkore]; }; @@ -5356,11 +5430,12 @@ in with self; { blockrand = derive2 { name="blockrand"; version="1.3"; sha256="1090vb26w6s7iqjcal0xbb3qb6p6j46a5w25f1wjdppd1spvh7f9"; depends=[]; }; blocksdesign = derive2 { name="blocksdesign"; version="3.5"; sha256="04bsax0f3q332920xllbxawz49wr8k4cwlizp649gpz82a2rs7zd"; depends=[crossdes lme4 plyr]; }; blockseg = derive2 { name="blockseg"; version="0.5.2"; sha256="1i2c9prr51ak6vrdh5gzxlwkdmmky1sj71b4m12khrizigbqgysa"; depends=[ggplot2 Matrix Rcpp RcppArmadillo reshape2 shiny]; }; - blogdown = derive2 { name="blogdown"; version="0.13"; sha256="0sh0cl40062rsrcwr3cxn1j8rf87ny628k647555gs918yfsff9k"; depends=[bookdown htmltools httpuv knitr rmarkdown servr xfun yaml]; }; + blogdown = derive2 { name="blogdown"; version="0.14"; sha256="0g46wjji2bynhbmd7magkqnd6mfpwkbqvfnpdcjkvyiw5idgpxci"; depends=[bookdown htmltools httpuv knitr rmarkdown servr xfun yaml]; }; blorr = derive2 { name="blorr"; version="0.2.1"; sha256="1lvh5jr1jidrkwidpy6plzd58p8q3rxa23wl4xsf8milw180w69p"; depends=[car caret checkmate cli clisymbols crayon dplyr e1071 ggplot2 glue gridExtra magrittr purrr Rcpp rlang scales shiny tibble]; }; blrm = derive2 { name="blrm"; version="1.0-1"; sha256="0p0nmbxil4l89fcryrgsg9mxzb5fyg93p50aqkjy00ms05hwd0hx"; depends=[boot mvtnorm openxlsx reshape2 rjags]; }; blsAPI = derive2 { name="blsAPI"; version="0.2.1"; sha256="0p45g4qqaialh5m9bxgrvnc7nqmm0429syw0bml8h4h8vy4014a7"; depends=[httr rjson]; }; blscrapeR = derive2 { name="blscrapeR"; version="3.1.6"; sha256="0p1lwl3zlah0x9jwvd7qmh8q3ynqz48wj6xvzyj7c9rl0iq2ws5x"; depends=[dplyr ggplot2 httr jsonlite magrittr purrr stringr tibble]; }; + bltm = derive2 { name="bltm"; version="0.1.0"; sha256="1sx4ii65ddvdw45za8j320v1s9d1pz5k2gx979yymhyxi8fmq69z"; depends=[mvnfast Rfast]; }; bmass = derive2 { name="bmass"; version="1.0.3"; sha256="0dafixd996lamn5kfbqpiawblalhyw1gi394j46n2sij2r209d76"; depends=[]; }; 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]; }; @@ -5376,22 +5451,24 @@ in with self; { bnlearn = derive2 { name="bnlearn"; version="4.4.1"; sha256="1nb4m945650538d7w383j4f1d2h3ndy608mfr3amxjrpp7d9ys3k"; depends=[]; }; bnnSurvival = derive2 { name="bnnSurvival"; version="0.1.5"; sha256="1d9jmfx0id4lmw122zga7hb52vlfdfqn4amhzpsmhyck99rv92j4"; depends=[pec prodlim Rcpp]; }; bnormnlr = derive2 { name="bnormnlr"; version="1.0"; sha256="0l2r7vqikak47nr6spdzgjzhvmkr9dc61lfnxybmajvcyy6ymqs9"; depends=[mvtnorm numDeriv]; }; + bnpa = derive2 { name="bnpa"; version="0.3.0"; sha256="0qsxk47i7q4d8hbs2xj5k5sf8bqyzhq7rbj4y7w8ljprznlydgl9"; depends=[bnlearn fastDummies lavaan Rgraphviz semPlot xlsx]; }; bnpmr = derive2 { name="bnpmr"; version="1.2"; sha256="0vpqhs1h2mphn9w5yngb7lxvmzrhn7mkj7ca6hykhhg48s2ra98g"; depends=[]; }; bnpsd = derive2 { name="bnpsd"; version="1.1.1"; sha256="1vvs7rbnqfs1h4naff8rjvipm93v86ay65rmqpqhr2zf3d8ygc29"; depends=[]; }; - bnspatial = derive2 { name="bnspatial"; version="1.0.5"; sha256="01bqh8h9kbpnr9a3hr5p6ydzda5y2is2971ba7991mnk3f0g4pc1"; depends=[doParallel foreach gRain gRbase raster rgdal]; }; - bnstruct = derive2 { name="bnstruct"; version="1.0.4"; sha256="0xlq5y2pa7d36pj316idh84hkbgn0c8jjp0d2x1p92zfvd8xpxnw"; depends=[bitops igraph Matrix]; }; + bnspatial = derive2 { name="bnspatial"; version="1.1"; sha256="1mgqll65b1kngg89nf9vc4zlwr0qy2y3zzxd0wgqnywp31mhwpzi"; depends=[doParallel foreach gRain gRbase raster rgdal sf]; }; + bnstruct = derive2 { name="bnstruct"; version="1.0.6"; sha256="1vnjjv8ms8hvd21zsgyl056s266a1plp7ybdmnkl2cy3n8jpdwi1"; depends=[bitops igraph Matrix]; }; bnviewer = derive2 { name="bnviewer"; version="0.1.3"; sha256="0sr9wjm75gs6y9sbfz3vscwdrnsgfx0nxgps4mmxz976fq571y4c"; depends=[bnlearn igraph visNetwork]; }; boa = derive2 { name="boa"; version="1.1.8-2"; sha256="04lhqk5qfvaz1jk90glr2yi5vq7cdy0w8m6g2lnzk359l9y41zhp"; depends=[]; }; bodenmiller = derive2 { name="bodenmiller"; version="0.1"; sha256="0gqrjscgq4qgk7yl32w0965yscc1py9klr49s8q8hkzyihlwzim2"; depends=[]; }; boilerpipeR = derive2 { name="boilerpipeR"; version="1.3"; sha256="0467bjqhdmi3p02fp0r7rgm00x9ry464f2hniav990qzsw8i16q6"; depends=[rJava]; }; bold = derive2 { name="bold"; version="0.9.0"; sha256="0ppdhbpdffvs0sgh7ykkhr585nhk66w6vqw793wa4ia57yl49s25"; depends=[crul data_table jsonlite plyr reshape stringr tibble xml2]; }; - bomrang = derive2 { name="bomrang"; version="0.5.0"; sha256="16p6pd5is5gw31q5iw1s8ky4iw8zz12g72i18mdgdn444fh8nlig"; depends=[crayon curl data_table dplyr foreign hoardr httr janitor jsonlite lubridate magrittr raster readr rgdal rvest tidyr xml2]; }; - bookdown = derive2 { name="bookdown"; version="0.11"; sha256="0w4fkv5fqiaqgkx44p0s161imf29zir9742126xkz1pl1j25jn1r"; depends=[htmltools knitr rmarkdown tinytex xfun]; }; + bomrang = derive2 { name="bomrang"; version="0.6.0"; sha256="0lnrv274lhl4n9rngkwx63dgd765bv0bd0mq9gz0vh8msmxnih0z"; depends=[crayon curl data_table dplyr foreign hoardr httr janitor jsonlite lubridate magrittr raster readr rgdal rvest tidyr xml2]; }; + bookdown = derive2 { name="bookdown"; version="0.12"; sha256="1c2v0rpa1rrpbx8yb66sfvrf4gf57f6a8x7ydjqqbkbwhxdlrsrq"; depends=[htmltools knitr rmarkdown tinytex xfun]; }; bookdownplus = derive2 { name="bookdownplus"; version="1.5.7"; sha256="1y3iiw3grs6h3ppar1yjmha0nbp19naiirj0hvzgi4yhnibf7nid"; depends=[bookdown knitr magick xaringan]; }; boostmtree = derive2 { name="boostmtree"; version="1.3.0"; sha256="0q1lgjvbc15m2gygnmh63m0wy2c6x25iwrh9cbn0baq598hnr7j9"; depends=[nlme randomForestSRC]; }; boostr = derive2 { name="boostr"; version="1.0.0"; sha256="123ag8m042i1dhd4i5pqayqxbkfdj4z0kq2fyhxfy92a7550gib2"; depends=[foreach iterators stringr]; }; - boot = derive2 { name="boot"; version="1.3-22"; sha256="1z2dig1mi76b3b9ck6qlkh07l3hs478gaf70db5nv8x7w2qhq7yg"; depends=[]; }; + boot = derive2 { name="boot"; version="1.3-23"; sha256="0bx07zbb5nfz2xfgnzbspg7r5vxz4bjdz1ry4d1vk434vlcrxj1h"; depends=[]; }; bootES = derive2 { name="bootES"; version="1.2"; sha256="0hcaw1v80zspdsy4wr464lmgq33807i2f6n2dc3r7qqwa80g4zz0"; depends=[boot]; }; + bootImpute = derive2 { name="bootImpute"; version="1.0.0"; sha256="0y2iw1ryhl7zskv1glrfjg75y7r0wmll0ls4254digp3wykafll1"; depends=[mice smcfcs]; }; bootLR = derive2 { name="bootLR"; version="1.0.2"; sha256="1aj5l42d5y7czxzlg6r9ykdxyjf8m8bahl41xk4k6xpxckdnka14"; depends=[binom boot]; }; bootRes = derive2 { name="bootRes"; version="1.2.4"; sha256="1lzj154qqqxqg6q2bjnzba8hlcx473i9cpp8kkjkpy7k87fgpm7v"; depends=[]; }; bootSVD = derive2 { name="bootSVD"; version="0.5"; sha256="14xwbrpqj3j1xpsppgjxpn9ggsns2n1kmni9vn30vgy68zwvs2wy"; depends=[ff]; }; @@ -5406,6 +5483,7 @@ in with self; { boottol = derive2 { name="boottol"; version="2.0"; sha256="01dps9rifzrlfm4lvi7w99phfi87b7khx940kpsr4m9s168a2dzv"; depends=[boot plyr]; }; bor = derive2 { name="bor"; version="0.1.0"; sha256="1r5jacmin0cq9zipxa9nmp3jnh6wsddd4wnzw2n5sggnf24ryp8g"; depends=[]; }; boral = derive2 { name="boral"; version="1.7"; sha256="0li7jdzgq2ffhrf0nly96syp72vv3c6rbcni19kk2wgyv16mjwcm"; depends=[abind coda fishMod MASS mvtnorm R2jags]; }; + borrowr = derive2 { name="borrowr"; version="0.1.0"; sha256="0va4sp1xc91qfrzxlbqq499npn50azhw6cdr4ra3aamin54n9pgk"; depends=[BART mvtnorm Rcpp]; }; bossMaps = derive2 { name="bossMaps"; version="0.1.0"; sha256="0w4ks1xicvfm8ari4fr18wjm0qj2nxdsapl6lpfjz8l1id0y78cg"; depends=[doParallel foreach ggplot2 raster rgdal rgeos scales sp tidyr]; }; boussinesq = derive2 { name="boussinesq"; version="1.0.3"; sha256="1j1jarc3j5rby1wvj1raj779c1ka5w68z7v3q8xhzjcaccrjhzxk"; depends=[]; }; boxcoxmix = derive2 { name="boxcoxmix"; version="0.21"; sha256="0pav4nksh1zbic11l38jyyq8i58hfvwzkp88ra6nny3jn2axzipl"; depends=[npmlreg qicharts statmod]; }; @@ -5416,6 +5494,7 @@ in with self; { bpbounds = derive2 { name="bpbounds"; version="0.1.3"; sha256="1lqhrvd7hf8ryij5rf7zrcqc3k89bj1665x81m9rn7dixk7qlb6h"; depends=[]; }; bpca = derive2 { name="bpca"; version="1.3-0"; sha256="16a7b94nk5psnm435vrwilcsria9mhr5d31fwzxy53pzp8n78kcr"; depends=[rgl scatterplot3d]; }; bpcp = derive2 { name="bpcp"; version="1.3.4"; sha256="0l4x3n7lcwinnrh2sy386grisj1x7k1d5hll1k4bljg01p7lb475"; depends=[]; }; + bpgmm = derive2 { name="bpgmm"; version="1.0.5"; sha256="0dxyrcf1qyf3ymj36d9flaw8405m7c1cqxbv6yrqm2dhba0ymyxq"; depends=[gtools label_switching MASS mcmcse mvtnorm pgmm Rcpp RcppArmadillo]; }; bpkde = derive2 { name="bpkde"; version="1.0-7"; sha256="1ls6rwmbgb2vzsjn34r87ab8rnz3ls61g6f4x3jpglbk0j91f0h8"; depends=[]; }; bpnreg = derive2 { name="bpnreg"; version="1.0.0"; sha256="0mpwrhbbbw8m3cz0fl0x9j9m3n9zfdamnw83mmg4bjd0wmxkkm90"; depends=[BH haven MASS Rcpp RcppArmadillo]; }; bpp = derive2 { name="bpp"; version="1.0.0"; sha256="11fgn92vvl7kklv0xdisf8gnf2rbhq11qyckqsxvc5wa821lmnkm"; depends=[mvtnorm]; }; @@ -5443,7 +5522,7 @@ in with self; { brglm2 = derive2 { name="brglm2"; version="0.5.1"; sha256="1vjgy9vxcx1n8syb04ck5sa4wnc4klrpyl8pk4ywkxzjflayh8ca"; depends=[enrichwith lpSolveAPI MASS Matrix nnet numDeriv]; }; bridgedist = derive2 { name="bridgedist"; version="0.1.0"; sha256="0hqkpwpi3nv6mfhljl65zcflf4wy72ag36hdam6s7kynfj41qz6w"; depends=[]; }; bridger2 = derive2 { name="bridger2"; version="0.1.0"; sha256="0clp42nnbvd01n65azdi2ghp0mfqwsipzdl2d30q04lcvfkdpxrf"; depends=[BSDA data_table ggplot2 outliers plotly shiny shinydashboard]; }; - bridgesampling = derive2 { name="bridgesampling"; version="0.6-0"; sha256="1526lsqhgjh0v8jb2sb7rw9jxj2kkbidsqapqp309a2f05bsfb8p"; depends=[Brobdingnag coda Matrix mvtnorm scales stringr]; }; + bridgesampling = derive2 { name="bridgesampling"; version="0.7-2"; sha256="0kd4p5pz46vssjb8faxwy5nv6r403a89h8hylxhq50n2rj94x934"; depends=[Brobdingnag coda Matrix mvnfast scales stringr]; }; briqr = derive2 { name="briqr"; version="0.1.0"; sha256="073pdk1094ng4kggzdjvihl791r2qlja1j2w3pfmh2027kn520r8"; depends=[dplyr httr jsonlite magrittr tibble]; }; briskaR = derive2 { name="briskaR"; version="0.1.2"; sha256="1y9sabj7pfgyvv6s3bbvrb0xhjhwc4pcfsfx847kqdajid92qx8w"; depends=[deldir fftwtools fields MASS mvtnorm pracma raster rgdal rgeos sp]; }; brlrmr = derive2 { name="brlrmr"; version="0.1.5"; sha256="14dnmh062fw11bm236ilaqs6ss4ywajvsk3sxj0zwqk2bjf7y7vh"; depends=[boot brglm MASS profileModel Rcpp]; }; @@ -5456,12 +5535,12 @@ in with self; { broomExtra = derive2 { name="broomExtra"; version="0.0.4"; sha256="15732zpiy0dgbqaahqc2cpszk647fi3lmb9v5pgvfgv24k8d9d3p"; depends=[broom broom_mixed dplyr magrittr purrr rlang rsample tidyr]; }; brotli = derive2 { name="brotli"; version="1.2"; sha256="07rgdgxh9bvn0qavpclxmkglwyl6ndqasxcs6j12if698dkn976b"; depends=[]; }; brr = derive2 { name="brr"; version="1.0.0"; sha256="050ivnqcaxiyypd1sxfpy6ianhzzmvs6c77ga40g3440cvfigkgw"; depends=[gsl hypergeo pander stringr SuppDists TeachingDemos]; }; - brranching = derive2 { name="brranching"; version="0.4.0"; sha256="0jzwk7mn5wan0qg12zfk99s445r7gwsdb9xvih929q1xvmk19k48"; depends=[ape crul curl phylocomr phytools taxize]; }; + brranching = derive2 { name="brranching"; version="0.5.0"; sha256="07dxynk8pbpbsqwaxg9vhpjv4wx8mb1lqxy1nkczjayn1yrpjfm5"; depends=[ape conditionz crul curl phylocomr phytools taxize]; }; brt = derive2 { name="brt"; version="1.3.0"; sha256="13fn2mv66fys7w0xchh69sb6jggg5c2imk1psi3mlr1902m6ss5m"; depends=[ggplot2]; }; brunnermunzel = derive2 { name="brunnermunzel"; version="1.3.5"; sha256="0pam2a17vj62a8as7a9lhk29wpd0chan8g7rx296da481n5r5w6b"; depends=[]; }; - bs4Dash = derive2 { name="bs4Dash"; version="0.3.0"; sha256="10chkkryn7i6kx6jl6vg6dhahwjij661r8qxn2h5cailpn4sq5ga"; depends=[htmltools shiny]; }; + bs4Dash = derive2 { name="bs4Dash"; version="0.4.0"; sha256="192fpy4qbra264smv9xqdzmm9wx86gm0k7bpaapjlpb30lb4izh3"; depends=[htmltools shiny]; }; bsam = derive2 { name="bsam"; version="1.1.2"; sha256="1m2lpqm2i4i35hzr1iylrb8skx8rsys3w542xjyqw030bs7b1rdk"; depends=[coda dplyr ggplot2 gridExtra lubridate msm mvtnorm rjags rworldxtra sp tibble]; }; - bsamGP = derive2 { name="bsamGP"; version="1.2.1"; sha256="0b4a6ll11cykqq05ys1b0y9gdhbw6y60hjclz678vy5w8jia7a1m"; depends=[ggplot2 gridExtra MASS]; }; + bsamGP = derive2 { name="bsamGP"; version="1.2.2"; sha256="1r7jmrj91na9718digggsjqfqc2l0s0md68vr3s9xcb77c4bbhyi"; depends=[ggplot2 gridExtra MASS]; }; bsearchtools = derive2 { name="bsearchtools"; version="0.0.61"; sha256="11fqz8kdhqpc3jq34vgv3frzawgsl5y0s83rb2p54yb5yhd3p68w"; depends=[Rcpp]; }; bshazard = derive2 { name="bshazard"; version="1.1"; sha256="1kidypyqlilf794mksjvhja8bmnd9hdhz91ywy0mcddgc6wbar4h"; depends=[Epi survival]; }; bspec = derive2 { name="bspec"; version="1.5"; sha256="0jynvir7z4q1vrvhdn6wijdrjfrkk4544nlawabw2fnfxss91a91"; depends=[]; }; @@ -5476,7 +5555,6 @@ in with self; { btergm = derive2 { name="btergm"; version="1.9.4"; sha256="17bjd1d2yj1l98mbflklznxd3q7zi5nzj943nxzva7ij3hdsn6l4"; depends=[boot coda ergm ggplot2 igraph Matrix network ROCR RSiena sna speedglm statnet_common xergm_common]; }; bucky = derive2 { name="bucky"; version="1.0.5"; sha256="0xn92dnhrs8810f8kvn2dnig0icd1k4dkxljmldij6dn8xb7c85q"; depends=[lmtest sandwich]; }; buildmer = derive2 { name="buildmer"; version="1.1"; sha256="0ds48qnydwc3kngik2r78y70q50yca497xi83p643g4yl1kcybfy"; depends=[lme4 mgcv plyr]; }; - bujar = derive2 { name="bujar"; version="0.2-5"; sha256="1mdn9kisbgsz8bp9nb9kvqng1wsf3a32wqqc5z5lp1c32ry58sii"; depends=[bst earth elasticnet gbm mboost mda modeltools mpath rms survival]; }; bulletcp = derive2 { name="bulletcp"; version="1.0.0"; sha256="1k7lw8gflih47ncz8hgsj0sxbajnkhz1k7yb7rwbdnzcki3n3jln"; depends=[assertthat dplyr mvtnorm Rdpack]; }; bulletr = derive2 { name="bulletr"; version="0.1"; sha256="181rnrp62almf08gr41qnrnq8qnbqraqdvj4zixdh8fachsq2imp"; depends=[dplyr ggplot2 plotly plyr reshape2 robustbase smoother xml2 zoo]; }; bullwhipgame = derive2 { name="bullwhipgame"; version="0.1.0"; sha256="03nwf2v4zhgkxvkghpkbkxz0cnkqcwwl51ykrk25qciakfqkgfws"; depends=[shiny]; }; @@ -5484,7 +5562,7 @@ in with self; { bundesbank = derive2 { name="bundesbank"; version="0.1-9"; sha256="05sc6m2v8bfgdka7v28rxhq5a8c88gsxkv0zjk08rpw8k8zql0dk"; depends=[]; }; bundesligR = derive2 { name="bundesligR"; version="0.1.0"; sha256="0dnhbh9jh7dfbk7mfh8msq4ys5kakalr0kwkycycrb2q8rd049vp"; depends=[]; }; bupaR = derive2 { name="bupaR"; version="0.4.2"; sha256="0fg16lw3liwmp1y92ky32wq18lfzn8psn2sqfja0322q6b34fgjk"; depends=[data_table dplyr eventdataR forcats glue magrittr miniUI purrr rlang shiny tidyr]; }; - burnr = derive2 { name="burnr"; version="0.3.1"; sha256="0s6p106mq989k1al6dsx9qxi7gmmjc4lw1vnfhkkxzmhnbwi0r3k"; depends=[ggplot2 MASS plyr reshape2]; }; + burnr = derive2 { name="burnr"; version="0.4.0"; sha256="096z4bzmvalyihy45bdcvp1zsxvmwk3mkz7wj5x077z2pg8kfq38"; depends=[ggplot2 MASS plyr reshape2]; }; bursts = derive2 { name="bursts"; version="1.0-1"; sha256="172g09d1vmwl83xs6gr4gfblqmx3apvblpzdr5d7fcw1ybsx0kj6"; depends=[]; }; busdater = derive2 { name="busdater"; version="0.2.0"; sha256="0hib73zay9r7rv49zv1lx0l15jzjyli9f1vrk414l8apggvx4c6s"; depends=[lubridate]; }; bvarsv = derive2 { name="bvarsv"; version="1.1"; sha256="1bv4fbbi8bn7sqqpjlf8w5jpgydjr15wv5v9940wc42yk792yjrx"; depends=[Rcpp RcppArmadillo]; }; @@ -5496,16 +5574,16 @@ in with self; { bwimage = derive2 { name="bwimage"; version="1.0"; sha256="0qh5qhcp8fm2d39dk4637biphv6rc6i687h5pip7ydp5f5bvgz77"; depends=[jpeg png]; }; bysykkel = derive2 { name="bysykkel"; version="0.2.3"; sha256="1cbfmmmw7a37fwgwgfvc8yqxl4dh5n30qcnva9wsm903wccmb2cr"; depends=[glue httr jsonlite lubridate magrittr tibble]; }; bytescircle = derive2 { name="bytescircle"; version="1.1"; sha256="0c83d37kijcvr00pc4qqdci14cpbg6988izyjfjk1yliavyc6mwf"; depends=[]; }; - bzinb = derive2 { name="bzinb"; version="1.0.1"; sha256="0dl26xhfry8pb7gvnfv1670l13vh8lz5djclpgdyy7rn0ybx392w"; depends=[BH Rcpp]; }; + bzinb = derive2 { name="bzinb"; version="1.0.3"; sha256="1n5ga5v6v71cgrgga5jlhmxs0s62pz93lsp3x8qz6vg042m5dl0s"; depends=[BH Rcpp]; }; c060 = derive2 { name="c060"; version="0.2-4"; sha256="1yzy0p6041rygqfwzb8dpyc7jq12javmhlvdcmmc7p59bbk7wv3j"; depends=[glmnet lattice mlegp penalizedSVM peperr survival tgp]; }; - c14bazAAR = derive2 { name="c14bazAAR"; version="1.0.2"; sha256="03siiadhj8wp80jhm99lw7xb1p24yk9ycx2kp085a7xj82hl22jj"; depends=[crayon data_table dplyr magrittr pbapply RCurl rlang tibble tidyr]; }; + c14bazAAR = derive2 { name="c14bazAAR"; version="1.0.3"; sha256="1fnsaadnam8njj1gskz26j71jd3n229y61psk3scnbrr5fyawlhh"; depends=[crayon data_table dplyr httr magrittr pbapply rlang tibble tidyr]; }; c212 = derive2 { name="c212"; version="0.95"; sha256="1cgmldy2ysz3934fxh0mmzrb2vw33j3pmws53ng7yxg79mb9ixja"; depends=[coda]; }; c2c = derive2 { name="c2c"; version="0.1.0"; sha256="149np512wjnlr9glmqxpiamf6c31v0bh6ym95jpdhk0iw3ic9kvh"; depends=[]; }; c3 = derive2 { name="c3"; version="0.2.0"; sha256="1af4lrgck1bff8jjp9vwyw2rpq54d1ng13rpcqlf58asdja29s9h"; depends=[data_table dplyr htmlwidgets jsonlite lazyeval viridis]; }; c3net = derive2 { name="c3net"; version="1.1.1"; sha256="0m4nvrs41kmlakc6m203zlncqwgj94wns8kzcb31xngjcacmcq42"; depends=[igraph]; }; cAIC4 = derive2 { name="cAIC4"; version="0.8"; sha256="08616cbzwdl2yqjk2v9nlwzgky8fq16qpzahbay8sb9kjslqgiyg"; depends=[lme4 Matrix]; }; cIRT = derive2 { name="cIRT"; version="1.3.0"; sha256="0jbjkmzw3z935pq12k5kmy3vdpqlpm70siv8f0bnlw42sai1qcw1"; depends=[Rcpp RcppArmadillo]; }; - cNORM = derive2 { name="cNORM"; version="1.1.8"; sha256="0qwqwmy2awyaji93kz9jkhqxc2fh8h7n353z5hyqa20rrnm028nw"; depends=[lattice latticeExtra leaps]; }; + cNORM = derive2 { name="cNORM"; version="1.2.0"; sha256="1mhdagdbz02zcr4dggmm54h2pk2zkzn4hlwa0ngki55l14bhg6k2"; depends=[lattice latticeExtra leaps]; }; cOde = derive2 { name="cOde"; version="1.0.0"; sha256="12222wlsk9l6m9y477mjl8x279xhs8c1l1wsq92khwycm1j06jfy"; depends=[]; }; cPCG = derive2 { name="cPCG"; version="1.0"; sha256="1pfbsv2rcjsryn6nr56a7i4yb7k0m3gdfn4q9l1kpzhmv9lic7m1"; depends=[Rcpp RcppArmadillo]; }; cRegulome = derive2 { name="cRegulome"; version="0.3.1"; sha256="0j3rv7vakv27r1n1yxmd50nlnyc4y329w0dmrw56dwkdkk4zzbsg"; depends=[DBI ggplot2 ggridges httr igraph R_utils RSQLite UpSetR VennDiagram]; }; @@ -5518,7 +5596,7 @@ in with self; { cacIRT = derive2 { name="cacIRT"; version="1.4"; sha256="145j6isqa8yj2nvlqkxagd076zs10ng3n44khi5p4jj77fjc8gh6"; depends=[]; }; caesar = derive2 { name="caesar"; version="1.0.0"; sha256="0z1bb5cmjr97l3h9svy4r4bj58jkmq6kdkip577cvy2xf5q9n410"; depends=[binhf]; }; caffsim = derive2 { name="caffsim"; version="0.2.2"; sha256="00bkgmmqrydpji2pvhcchgl2p8w5ksby4g80i3h76q0bm2325w9h"; depends=[dplyr ggplot2 markdown mgcv shiny tibble tidyr]; }; - cairoDevice = derive2 { name="cairoDevice"; version="2.26"; sha256="0g1jfcm0xxaxvab21533dcrfwydpis7vl1ww7raj45g1i6vz3iiy"; depends=[]; }; + cairoDevice = derive2 { name="cairoDevice"; version="2.27"; sha256="0hhzndaqcpkdfbvrsfp54k8bl82wffmp0s0689vd7zhwxvp7l3wg"; depends=[]; }; calACS = derive2 { name="calACS"; version="2.2.2"; sha256="0a53k2rzyjksb0ypr5zrask4a6mgiyrqx0l2z3lm218y8pk2jf1w"; depends=[]; }; calcWOI = derive2 { name="calcWOI"; version="1.0.2"; sha256="09g96inaayp0brbxw75l7k1cqn50f7qw0glb2g04657zmlk16i52"; depends=[LS2W wavethresh]; }; calendar = derive2 { name="calendar"; version="0.0.1"; sha256="18ha6vpx2bpk8p08hajiq2d201fbqhzcycp8ks6wrr06fy04z689"; depends=[lubridate tibble]; }; @@ -5526,18 +5604,18 @@ in with self; { calibrate = derive2 { name="calibrate"; version="1.7.2"; sha256="010nb1nb9y7zhw2k6d2i2drwy5brp7b83mjj2w7i3wjp9xb6l1kq"; depends=[MASS]; }; calibrateBinary = derive2 { name="calibrateBinary"; version="0.1"; sha256="1k6sl4bg05piyczpk6wsva914gcmy8viyz4423gx9i6ddflb7xdb"; depends=[gelnet GPfit kernlab randtoolbox]; }; calibrator = derive2 { name="calibrator"; version="1.2-8"; sha256="1m9g1pmnr6d9jkg5ab0l0cbqfj7kmx7sdmcdqdhn9ifyhhn7812y"; depends=[cubature emulator mvtnorm]; }; - callr = derive2 { name="callr"; version="3.2.0"; sha256="1s5h2k7c1vgbry90xczin66q89cbkc6mvh4679l5rsz83087pd2b"; depends=[processx R6]; }; + callr = derive2 { name="callr"; version="3.3.1"; sha256="0rvrlg86fxr5nadvqa0dr1iifqjs4d1rc32v76m3ccvx6m3xlq5z"; depends=[processx R6]; }; calmate = derive2 { name="calmate"; version="0.12.1"; sha256="07sjbq7bcrhal52pdzsb5pfmk6a8a44wg8xn79sv4y5v74c5xaqz"; depends=[aroma_core MASS matrixStats R_filesets R_methodsS3 R_oo R_utils]; }; calpassapi = derive2 { name="calpassapi"; version="0.0.2"; sha256="0i81ffdfw3m15cfbag3l9s245dyhapqhy7adb3228vam3qp3n59b"; depends=[digest dplyr httr jsonlite stringr]; }; camsRad = derive2 { name="camsRad"; version="0.3.0"; sha256="06gar6qan1ka01ngjvbpcv649yvfga697mplwn1x6qnfr4ngb7cs"; depends=[httr xml2]; }; camtrapR = derive2 { name="camtrapR"; version="1.1"; sha256="1lmci62r6igz3yqlh59ca3p6msf8v2wn1wz5jh6mcdh5b8k50gas"; depends=[overlap rgdal ritis secr sp taxize]; }; - cancensus = derive2 { name="cancensus"; version="0.1.8"; sha256="12mhnx9bx8wdhz7cb3lz0r0i6hgq6v401hl9v3bng27pz3va2fad"; depends=[digest dplyr httr jsonlite rlang]; }; + cancensus = derive2 { name="cancensus"; version="0.2.0"; sha256="1vggqpv7l472dc889fh2ldsijgwpv9s6ai8jhqhz2q2xdg099v7c"; depends=[digest dplyr httr jsonlite rlang]; }; cancerGI = derive2 { name="cancerGI"; version="1.0.0"; sha256="1chkcyf9m98gbn6b3vmb1baw7kii4g5vxvg2xfi7i6wwdn8sqr65"; depends=[igraph qvalue reshape2 survival systemfit]; }; cancerTiming = derive2 { name="cancerTiming"; version="3.1.8"; sha256="1sfi8q2f5ag7iak0sf9pmqncb89w3gnxdiwjwpivkwhr28ais4mq"; depends=[gplots LearnBayes]; }; candisc = derive2 { name="candisc"; version="0.8-0"; sha256="0hq5bwvq791rhff2c29xdjbbkcyydii1lbsy05c1fapyn88ir0mi"; depends=[car heplots]; }; canprot = derive2 { name="canprot"; version="0.1.2"; sha256="0lc31vw49sc2zsrn52aqqljcc4n79j4i4845sr201ga67w07vrrb"; depends=[CHNOSZ xtable]; }; - cansim = derive2 { name="cansim"; version="0.2.3"; sha256="1486fz24dl47kv545zbx2swh7p396rcydzlnwd8g2g3dap93qk59"; depends=[dplyr httr jsonlite purrr readr rlang rvest stringr tibble xml2]; }; - canvasXpress = derive2 { name="canvasXpress"; version="1.23.9"; sha256="14b9l49b3a46b55a5dfa83qq7qs8b5vfby2v1c05xradwj89sjsi"; depends=[htmlwidgets httr]; }; + cansim = derive2 { name="cansim"; version="0.3.0"; sha256="0byyrwwsx4msfj7nmsp8s5gibvkf05rjajl5a3a92jj41qhw6hy4"; depends=[dplyr httr jsonlite purrr readr rlang rvest stringr tibble xml2]; }; + canvasXpress = derive2 { name="canvasXpress"; version="1.24.8"; sha256="1sxhxddl9fdvxs1hdn5b03jg0sp8wgpfli9v0p2n381lq1z30m3s"; depends=[htmlwidgets httr]; }; cap = derive2 { name="cap"; version="1.0"; sha256="1pv8hskxjbp589dn7rx80yaa1ld76x1w37bss2fyrys1p3qr78aa"; depends=[MASS multigroup]; }; cape = derive2 { name="cape"; version="2.0.2"; sha256="0ngm9scd3f2zcy7gy0lqk05cgbfrhhcss3mj5g6bj0byhgwd7msn"; depends=[corpcor doParallel evd fdrtool foreach HardyWeinberg igraph Matrix qpcR RColorBrewer regress shape]; }; caper = derive2 { name="caper"; version="1.0.1"; sha256="0md0sngj7wsv2d4d7fmyyz9qqismk3ps9l3qk1blqz1yi19pq124"; depends=[ape MASS mvtnorm]; }; @@ -5574,13 +5652,14 @@ in with self; { caseMatch = derive2 { name="caseMatch"; version="1.0.7"; sha256="1xd7mlnknjrilxcp0w0b36aaiql6jdqgyin1823r2x8vl9r4aqns"; depends=[]; }; casebase = derive2 { name="casebase"; version="0.1.0"; sha256="0216qzyxv44cl9f806lal9lx4n0zzr9csx8ggyjva04h5iiqrq6w"; depends=[data_table ggplot2 survival VGAM]; }; casino = derive2 { name="casino"; version="0.1.0"; sha256="07fphn46718gr1zm0xr43mwv7yk697xrc40lxxin315cf3gm0cka"; depends=[crayon dplyr ggplot2 magrittr purrr R6 tibble tidyr]; }; - castor = derive2 { name="castor"; version="1.4.1"; sha256="084bfdacxdpvhfn9y9gbhmg6g4npyzgyjk9cdpfsqh3dkllnp1kg"; depends=[naturalsort nloptr Rcpp]; }; + cassandRa = derive2 { name="cassandRa"; version="0.1.0"; sha256="0rwqzxbflxn1iyggm3mq6pkbl61mhk4vdwqwzlwrhrvvr2ib236r"; depends=[bipartite boot dplyr ggplot2 magrittr purrr reshape2 tidyr vegan]; }; + castor = derive2 { name="castor"; version="1.4.2"; sha256="02z000ngy63nk4hq6cv0drn5jcm4il4c4pbrc39byaq9ihf0iy3c"; depends=[naturalsort nloptr Rcpp]; }; 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.16"; sha256="1w39dxfzqk065v64qzmfamx8p1njsv13a461s6clagbqmhysmzbx"; depends=[]; }; catSurv = derive2 { name="catSurv"; version="1.0.3"; sha256="1qjmjdmc81inim5kpwh4k2r3cffmkyp2wpcqqzv731hciqrad8a8"; depends=[BH ltm Rcpp RcppArmadillo RcppGSL RcppParallel]; }; catch = derive2 { name="catch"; version="1.0"; sha256="16gdjrmlsnpyc38fihggj6c7wpgpmf4phcwrimnncdhwlk038yn8"; depends=[MASS Matrix tensr]; }; - catchr = derive2 { name="catchr"; version="0.2.0"; sha256="132mldi195xx0ywmms6fc9dgj2s9nyb1i1b39yry3kl5gvxmd07s"; depends=[purrr rlang]; }; + catchr = derive2 { name="catchr"; version="0.2.1"; sha256="00h7gizv90zq78a80pqvp78f2l55xxnmya2g275pj84dqj1g9pfb"; depends=[purrr rlang]; }; catcont = derive2 { name="catcont"; version="0.5.0"; sha256="0ix6ipm3nn9aq5vxirjga2kwwfnxn4v8ggfjlg5v9027v2r8rb96"; depends=[dplyr]; }; catdap = derive2 { name="catdap"; version="1.3.4"; sha256="0i877l61f6c75pczi235rzci67w29zv1d7z5zn5p5ymndclvlpl2"; depends=[]; }; catdata = derive2 { name="catdata"; version="1.2.1"; sha256="0fjylb55iw8w9sd3hbg895pzasliy68wcq95mgrh7af116ss637w"; depends=[MASS]; }; @@ -5621,13 +5700,15 @@ in with self; { ccmm = derive2 { name="ccmm"; version="1.0"; sha256="0855nr74xxpy7in2vrw15g8pv7nm1374irc1c5hikr5hadk5pf8v"; depends=[MASS]; }; ccrs = derive2 { name="ccrs"; version="0.1.0"; sha256="1nyw4ip9v7y6yfbfdz3bwhy4r6hpp1hiip3ycldxlkl9wrxkxgrw"; depends=[cds colorspace dplyr limSolve lsbclust msm]; }; cctools = derive2 { name="cctools"; version="0.1.2"; sha256="03lp9pa9qr2hi584ivvmswxmwjw1c3a6xqladpqldjhzvzpxvcwi"; depends=[qrng Rcpp RcppArmadillo]; }; - cdata = derive2 { name="cdata"; version="1.1.0"; sha256="1h11g3cj53a1m8ra8j0brlbxg95h2x2x63fg4zcr20jvx2zlwsg8"; depends=[rquery wrapr]; }; + cdata = derive2 { name="cdata"; version="1.1.1"; sha256="03kfhpi5cbj2rwjmhrd8h95frz68p82as1wi4js0pgb0vj7hjq6h"; depends=[rqdatatable rquery wrapr]; }; cdb = derive2 { name="cdb"; version="0.0.1"; sha256="1rdb4lacjcw67apdyiv7cl1xvv9d1mrzck1qk605n6794k7wf2ys"; depends=[bitops]; }; cdcfluview = derive2 { name="cdcfluview"; version="0.9.0"; sha256="0i6jipzpfcqs48w0cwjyynf3lpdppa7xh27q1rwv3jsqd246880v"; depends=[dplyr httr jsonlite MMWRweek purrr readr sf units xml2]; }; + cdcsis = derive2 { name="cdcsis"; version="2.0.3"; sha256="0hv52valyig3zzywm3058c5nxb2n7y3j2vfibxdbfg8414wwapd9"; depends=[ks mvtnorm Rcpp]; }; + cder = derive2 { name="cder"; version="0.1-0"; sha256="1cbvb8va9if520a5wg568cd06dyf3p477ma534ygapckajy9mbv1"; depends=[curl dplyr glue lubridate readr rlang stringr tibble]; }; cdfquantreg = derive2 { name="cdfquantreg"; version="1.2.2"; sha256="094mk2hvxww2lndx5wkw368ynqx6klbdwl30d1yv7kqmr2yy7388"; depends=[Formula MASS pracma]; }; cdlTools = derive2 { name="cdlTools"; version="0.14"; sha256="0zf00y8qcklz2yp7vx6mjvx2h2p4kq44r51z4qy88kq9v62rqz3k"; depends=[httr raster]; }; cdom = derive2 { name="cdom"; version="0.1.0"; sha256="00xqqqhskjlkz8ii7kqyabxk8995w7g9jiz1isyqjpwg8nsa3x28"; depends=[broom ggplot2 minpack_lm tidyr]; }; - cdparcoord = derive2 { name="cdparcoord"; version="1.0.0"; sha256="0a08rpc7chqbix10jimjh46dy6val97mrzqk972pq446b6ci95sn"; depends=[data_table freqparcoord magrittr partools plotly]; }; + cdparcoord = derive2 { name="cdparcoord"; version="1.0.1"; sha256="0ym2ypw4bsvmx9q4vskrq4pdd92y47vs8pay8san40rgzwqr2agb"; depends=[data_table freqparcoord partools plotly]; }; cds = derive2 { name="cds"; version="1.0.3"; sha256="1h34k96h7ajkaqsw4dlqri63hrbnshaqwrdl74wlgycdlbvrqj05"; depends=[clue colorspace copula limSolve MASS]; }; ceRtainty = derive2 { name="ceRtainty"; version="1.0.0"; sha256="01wgvjpxqwhgh6vx9vbmiv4d88bps790l6ij3gw5w69hbrrd9ixi"; depends=[dplyr RColorBrewer tidyr]; }; cec2005benchmark = derive2 { name="cec2005benchmark"; version="1.0.4"; sha256="0bwv63l31hiy63372nvnyfkpqp61cqjag0gczd2v2iwsy3hyivpd"; depends=[]; }; @@ -5646,6 +5727,7 @@ in with self; { censusGeography = derive2 { name="censusGeography"; version="0.1.0"; sha256="1ncgd05ml571g3vy1g4p5xxg2bm08hbb6d5r3hpz7frn7w3l8l1d"; depends=[qdapTools]; }; censusapi = derive2 { name="censusapi"; version="0.6.0"; sha256="03h1np7v539mgnxlmwp1d5jv3nlm2fsylw53hqxd736q3h2rjz0s"; depends=[httr jsonlite]; }; censusr = derive2 { name="censusr"; version="0.0.4"; sha256="1n9571fyr46wj1dcxc2xgns9865655yzlq7yfz8im014wh0ycwqc"; depends=[dplyr httr stringr]; }; + censusxy = derive2 { name="censusxy"; version="0.1.1"; sha256="16mk90xksk0v5zbrlkd91ddqjca97n2vv11h1sr18ay8208l5vji"; depends=[dplyr httr readr rlang sf tibble tidyr]; }; censys = derive2 { name="censys"; version="0.1.0"; sha256="0r0yvaidn0qn96hx461415hywsjfgaz9wvvdssx7w97v2ndnk9sy"; depends=[httr jsonlite purrr stringi]; }; centiserve = derive2 { name="centiserve"; version="1.0.0"; sha256="1m6gqz2rk7023340laa5pc0ncbfka2qi9ajvh65fwijd7xvv3n5c"; depends=[igraph Matrix]; }; centralplot = derive2 { name="centralplot"; version="0.1.0"; sha256="1slzvbm1vvgj1gkcx9pb46fz8q55vfyqrxsvx4qzi5kp7d9h4dy2"; depends=[ggplot2]; }; @@ -5653,6 +5735,7 @@ in with self; { cepR = derive2 { name="cepR"; version="0.1.0"; sha256="1yqny6vgsjbrfxlk965pyk38n87ylf4513kbaljmgggrlyaz0qap"; depends=[dplyr httr magrittr purrr tibble]; }; cepp = derive2 { name="cepp"; version="1.7"; sha256="01hvm6586xnb1crvk7brqh3dm2j44ia5lrl5swnf6pb682yskbq0"; depends=[randtoolbox trust]; }; cepreader = derive2 { name="cepreader"; version="1.1-3"; sha256="0jqmz3gm6fprfjjzw22qdk055csvy1np7vm0mjjsnpim7js5xvc2"; depends=[]; }; + ceramic = derive2 { name="ceramic"; version="0.6.0"; sha256="0n0l1b7gb05kqjrh696faq868q3nbwlg34y6wgr0w205kdq6qs17"; depends=[curl dplyr fs glue jpeg magrittr png purrr rappdirs raster reproj rlang slippymath sp spex tibble]; }; cernn = derive2 { name="cernn"; version="0.1"; sha256="0gz2x20pgsiq85hwkkpg4s1cdlw9plygx0446djc7qsymp469p2w"; depends=[]; }; cetcolor = derive2 { name="cetcolor"; version="0.2.0"; sha256="0kygdcr9ldanr0z4qpygwh0padki7s2ad0j6myky601g4228z79q"; depends=[]; }; ceterisParibus = derive2 { name="ceterisParibus"; version="0.3.1"; sha256="1vysa4yq5qjvhpl0x3snaqa45ywsn8hhpnc657v02kvvzlgx508j"; depends=[DALEX ggplot2 gower knitr]; }; @@ -5670,7 +5753,7 @@ in with self; { cgmanalysis = derive2 { name="cgmanalysis"; version="2.4"; sha256="17njw0abcmfwaqhglfnmgmbyp4zxjmxbchjiabsv6nan1scl9z43"; depends=[gdata ggplot2 lubridate pastecs pracma readr zoo]; }; cgraph = derive2 { name="cgraph"; version="4.0.3"; sha256="0q3zfwa910h1y8hgm5pam8jnqak9zvkq55bkary0h3kglmg25p67"; depends=[]; }; cgwtools = derive2 { name="cgwtools"; version="3.0.1"; sha256="15qllfcgls6hpj51xa7mklr5ppxrs2avbiwq3y4bqbb20fld78w3"; depends=[]; }; - chandwich = derive2 { name="chandwich"; version="1.1.1"; sha256="0dpd1b9bq9i8a9wlmid6rvhpmvxj8dilv9xppmzr0jrh0nrcj9yx"; depends=[numDeriv]; }; + chandwich = derive2 { name="chandwich"; version="1.1.2"; sha256="196k13qg9kl94yki989ncx2mrvvj82vv8mi453s8lqmv9s875841"; depends=[numDeriv]; }; changedetection = derive2 { name="changedetection"; version="0.2.0"; sha256="0j8x7qyna7qgjhx56yxav1g3wj3r47zvx2hivybsjis2gqbl82hr"; depends=[glmnet L1pack Rdpack]; }; changepoint = derive2 { name="changepoint"; version="2.2.2"; sha256="1jbki95pck10phpxna0b4i79hhl912zqi5ii9mjqb673y64dszkj"; depends=[zoo]; }; changepoint_mv = derive2 { name="changepoint.mv"; version="1.0.1"; sha256="1cv7gkfzzb8qmm49ygrkcsvlj3hx41wj8h2msa9rrawj33awj1c6"; depends=[assertive ggplot2 Rcpp Rdpack reshape2 tbart zoo]; }; @@ -5684,8 +5767,8 @@ in with self; { chebpol = derive2 { name="chebpol"; version="2.1"; sha256="0dvmdcrdk7mc2gxbmz645x42rras8iqdp8yzg1kslcynaj665arb"; depends=[geometry]; }; checkLuhn = derive2 { name="checkLuhn"; version="1.1.0"; sha256="1s1ix5n98bcbzcvrz5h19sk9pchdvrhpy3ppmw96ys8vylzm58mv"; depends=[dplyr stringr]; }; checkarg = derive2 { name="checkarg"; version="0.1.0"; sha256="0rkdjs2c4yx9laqgayxz57bwxhwgdh6ndrr4i3b1kh31lcmk1xc6"; depends=[]; }; - checkmate = derive2 { name="checkmate"; version="1.9.3"; sha256="15ccwvmw73c2zz1k10k5zdn8px0rrbnvs1b4nzvlb0iwj7cimhp4"; depends=[backports]; }; - checkpoint = derive2 { name="checkpoint"; version="0.4.5"; sha256="0ml6lr8vmnrj2d073mr6dxsy0sqf50vyc956j9pnmzan2k7qv2wc"; depends=[]; }; + checkmate = derive2 { name="checkmate"; version="1.9.4"; sha256="08ddpgs4mv5d5y4j054pm8drmxkn7yvhfpbghwxlizjpnxa5g8ps"; depends=[backports]; }; + checkpoint = derive2 { name="checkpoint"; version="0.4.6"; sha256="1cpb0dm5f0y08zlv8w1fyqpgw431avg9dcbbs9z0v95ibkdmw6px"; depends=[]; }; checkr = derive2 { name="checkr"; version="0.5.0"; sha256="14hkpfbw5ibdwz2jygir2f2bb2qgrj62gn3449n4dif31nswaj2f"; depends=[err]; }; cheddar = derive2 { name="cheddar"; version="0.1-633"; sha256="09mw8rr5xb06gw3hbk7zv2nnx6mwhs6i19ffbp9pv3yv2945cjlf"; depends=[]; }; cheese = derive2 { name="cheese"; version="0.0.1"; sha256="0yjb68qlz62vmvjf6c8qfblihkkigfbhxpw42mm6qdy4f483mpr2"; depends=[dplyr forcats kableExtra knitr magrittr purrr rlang stringr tibble tidyr tidyselect]; }; @@ -5736,7 +5819,7 @@ in with self; { civis = derive2 { name="civis"; version="2.0.0"; sha256="1hbwbpwbnlg08gh8fg15fa254m7ibnq7x020yd4q75pzbdwlj4v2"; depends=[future httr jsonlite memoise]; }; cjoint = derive2 { name="cjoint"; version="2.1.0"; sha256="1bs380ji9vsc1d77wqhl0ij9xblww3g9x3hiwpcpz26wihqcx7ac"; depends=[DT ggplot2 lmtest Matrix sandwich shiny shinyBS shinyjs survey]; }; ck37r = derive2 { name="ck37r"; version="1.0.0"; sha256="0nn2sfsfs8mhgjrz0ghn041ybhj2qim4rs3lkci7s4n95c8hbgdi"; depends=[caret cvAUC doParallel doSNOW foreach ggplot2 pryr randomForest RANN reader RhpcBLASctl ROCR snow stringr SuperLearner tmle]; }; - ckanr = derive2 { name="ckanr"; version="0.1.0"; sha256="1cvn0cih763f0ppl1y90vnwj3cgqyb7az89sn12nyn2qb6igiqyl"; depends=[httr jsonlite magrittr]; }; + ckanr = derive2 { name="ckanr"; version="0.3.0"; sha256="0qbsq40yxy9j7q49k5712gk8iv0c7rcr8w0hnv410035i1rddlfj"; depends=[DBI dbplyr dplyr httr jsonlite magrittr]; }; clValid = derive2 { name="clValid"; version="0.6-6"; sha256="1l9q7684vv75jnbymaa10md13qri2wjjg7chr1z1m0rai8iq3xxw"; depends=[class cluster]; }; cladoRcpp = derive2 { name="cladoRcpp"; version="0.15.1"; sha256="0msay6yvm6wc964gwrz31ky5w4mizakji3j6rpkydz0zlrl52v1j"; depends=[Rcpp RcppArmadillo]; }; clam = derive2 { name="clam"; version="2.3.2"; sha256="1za0njc10mcvdmyyy4yy6sgzl6kk2kix319w84d5mcs2zrfb83j4"; depends=[]; }; @@ -5750,7 +5833,8 @@ in with self; { classifly = derive2 { name="classifly"; version="0.4"; sha256="0mw1vcas0gr1r4yvh0j02zhk7kp5342r0bhhg776hqgqdczgh5zj"; depends=[class plyr]; }; classyfireR = derive2 { name="classyfireR"; version="0.2.1"; sha256="0a3di6agn6vvyzx1w8c3wcij6l313hnaxdbhpfa72rlsfdj68mqn"; depends=[clisymbols crayon dplyr httr jsonlite magrittr purrr stringr tibble]; }; cld2 = derive2 { name="cld2"; version="1.2"; sha256="03ffg1nxdlmg66sgg0w2jdx2s5jzdp8qhja24z0il2qy3qsa915k"; depends=[Rcpp]; }; - cld3 = derive2 { name="cld3"; version="1.1"; sha256="00jbncap8h0s26iw5i0891rag5gpf1n3s9imn6n0zbwdn1791ayr"; depends=[Rcpp]; }; + cld3 = derive2 { name="cld3"; version="1.2"; sha256="11bjkbhjxaf6lc96qm8zk4k1i66b69f8dmc303i1560b2jj2zah3"; depends=[Rcpp]; }; + clean = derive2 { name="clean"; version="1.0.0"; sha256="09nm205hszcmhs227ia1lhigrnkkwh45rjrxp31gmxipz5gbw32p"; depends=[crayon knitr rlang]; }; cleanEHR = derive2 { name="cleanEHR"; version="1.0"; sha256="0i8q7y4izc7q1pshdajy0n9wyihj4wlzzkd52ykam3dxqnwlnyh4"; depends=[data_table ggplot2 knitr pander Rcpp XML yaml]; }; cleanNLP = derive2 { name="cleanNLP"; version="2.3.0"; sha256="0d3v87ylp5vxkg6x5wfc1v482a3wcy02bb5xl3k2s8jpsawf2vxd"; depends=[dplyr Matrix stringi]; }; cleancall = derive2 { name="cleancall"; version="0.1.0"; sha256="0g52nvr8fnwlhfzx0ja87xkg4ff3jafj08qz9xkwc790zfszc6z1"; depends=[]; }; @@ -5779,7 +5863,7 @@ in with self; { clinUtiDNA = derive2 { name="clinUtiDNA"; version="1.0"; sha256="0x3hb09073gkh60fc8ia0sfk948sm6z6j8sqkz275k4m8ryrabas"; depends=[]; }; clinfun = derive2 { name="clinfun"; version="1.0.15"; sha256="0cv1kdxj911scri82ms21lk9frsdp4251fawdsbqinby7k6hhmkc"; depends=[mvtnorm]; }; clinsig = derive2 { name="clinsig"; version="1.2"; sha256="1wgfl9kks57yizrf8z6x7dhmbl3a80q8nnj3a5n2hpc9yr8l9ijf"; depends=[]; }; - clipr = derive2 { name="clipr"; version="0.6.0"; sha256="0k9kimkmmj9k7290sxiqn4kd1vvm4w7q9a44wp0w30b7yjpavx2m"; depends=[]; }; + clipr = derive2 { name="clipr"; version="0.7.0"; sha256="1qn2p13d0c1bpqss6mv9hk60980rzhznfqpyaf5x0fy65svy9903"; depends=[]; }; clisymbols = derive2 { name="clisymbols"; version="1.2.0"; sha256="1q7gi2zmykhzas9v8fdnbpdq7pzdcpbhim1yxvd2062l777g4j86"; depends=[]; }; clogitL1 = derive2 { name="clogitL1"; version="1.5"; sha256="0y6a6s5l98i0vrj66biwr17g6pzpmm5kfz4c57af0yhv7c4s4was"; depends=[Rcpp]; }; clogitLasso = derive2 { name="clogitLasso"; version="1.1"; sha256="1j2kscd6d1jham6yqx5rp78x5vfj2faylkxkbcjaqbynlnqbbxd0"; depends=[foreach lassoshooting]; }; @@ -5789,7 +5873,7 @@ in with self; { cloudUtil = derive2 { name="cloudUtil"; version="0.1.12"; sha256="18g946j00anlk20d0fh01w0xyj1kwyy7jhlgz5a85wmp6s2gkz74"; depends=[]; }; cloudml = derive2 { name="cloudml"; version="0.6.0"; sha256="0p34wrrs06c17lbjlkjhm04ffg3l3zfkxb7swikjbim0j5aww2kh"; depends=[config jsonlite packrat processx rprojroot rstudioapi tfruns withr yaml]; }; clpAPI = derive2 { name="clpAPI"; version="1.2.11"; sha256="0xwwv4ccflrrapqlzwccblyhda5bmbhs7agwwwjriwxnhxghlpbm"; depends=[]; }; - clr = derive2 { name="clr"; version="0.1.1"; sha256="1vg9c8w25ac3l9wh8prv8h6ghxfslag301bbrsy6zcsfg4rjm0y8"; depends=[dplyr lubridate magrittr]; }; + clr = derive2 { name="clr"; version="0.1.2"; sha256="088ks9lrhlyvg3yvlfmb0091yp6qp5bzg9h5r6ryv3bk6y56sajx"; depends=[dplyr lubridate magrittr]; }; clrdag = derive2 { name="clrdag"; version="0.6.0"; sha256="1py5x1783c9d83hgar3g70qgbsakgs6n5ckpx87fiw32l040abwa"; depends=[Rcpp RcppArmadillo]; }; clttools = derive2 { name="clttools"; version="1.3"; sha256="0va9k1b4xsb2sgpxzvid6sa8m6b8i3r4kgghclmb78nnrs480cwi"; depends=[]; }; clubSandwich = derive2 { name="clubSandwich"; version="0.3.5"; sha256="03mxfvh2h4gigis7wzq9hwzfaanpx66h1c16xx11pqfkvdfwal49"; depends=[sandwich]; }; @@ -5817,13 +5901,13 @@ in with self; { clusterfly = derive2 { name="clusterfly"; version="0.4"; sha256="0mxpn7aywqadyk43rr7dlvj0zjcyf4q7qbqw5ds38si7ik34lkrg"; depends=[e1071 plyr reshape2 rggobi RGtk2]; }; clusterhap = derive2 { name="clusterhap"; version="0.1"; sha256="1ic6588mqp146jsvrxlxk449zw4n81xixgrny9r29497z7hg5a1m"; depends=[]; }; clustering_sc_dp = derive2 { name="clustering.sc.dp"; version="1.0"; sha256="0cppka7613cbjjf1q2yp6fln511wbqdhh8d4gs6p0fbq379kzmvc"; depends=[]; }; - clusterlab = derive2 { name="clusterlab"; version="0.0.2.6"; sha256="0c0br3nf5zgq5d4119sr4cmm1hq9f1ayphi0j4n5dzpwc8kq4518"; depends=[ggplot2 reshape]; }; + clusterlab = derive2 { name="clusterlab"; version="0.0.2.7"; sha256="18np2laaarv2iarlyq71ddazkpchfv6bylfxlxhvg3jbb68vrwj5"; depends=[ggplot2 reshape]; }; clustermq = derive2 { name="clustermq"; version="0.8.8"; sha256="0znyfrsnzrvizpazk8630szln3gxqm5c47x1z1749bqciy39g25m"; depends=[narray progress purrr R6 rzmq]; }; clusternomics = derive2 { name="clusternomics"; version="0.1.1"; sha256="05nkw6h2dvky07fj50myzw5xlkqyiflbn4vwqw8a1q2idv4awi7b"; depends=[magrittr MASS plyr]; }; clusternor = derive2 { name="clusternor"; version="0.0-3"; sha256="0qf1k5y9i60skdqz7glq7czwg84gafnxfg0npx772xydvivan210"; depends=[Rcpp]; }; clustertend = derive2 { name="clustertend"; version="1.4"; sha256="1aqg8cy1hk3lmzvyqh9qc1mcknrva2i0c77hyd0yff9whz80ik4j"; depends=[]; }; clusteval = derive2 { name="clusteval"; version="0.1"; sha256="1ld0bdl4fy8dsfzm3k7a37cyxc6pfc9qs31x4pxd3z5rslghz7rj"; depends=[mvtnorm Rcpp]; }; - clustrd = derive2 { name="clustrd"; version="1.3.1"; sha256="0a354lfcc8sky4ijxq3vynh169fgb4if4v80i8m7nyni5gs7w4kw"; depends=[ca cluster corpcor dplyr dummies fpc GGally ggplot2 ggrepel plyr rARPACK tibble]; }; + clustrd = derive2 { name="clustrd"; version="1.3.2"; sha256="06i8rny2fbpk32mj0r1br9dymf2y98xjzbj7cikyp7k481693a0m"; depends=[ca cluster corpcor dplyr dummies fpc GGally ggplot2 ggrepel plyr rARPACK tibble]; }; clustree = derive2 { name="clustree"; version="0.4.0"; sha256="0lcky7sacp2m3mrxcp7h6xs8x7l97w6qi3277wddvs4q3v0q8hkb"; depends=[checkmate dplyr ggplot2 ggraph ggrepel igraph rlang tidygraph viridis]; }; clustringr = derive2 { name="clustringr"; version="1.0"; sha256="07f0ywpkf8igic7ijvvrjlngq3smjcv9nqnah41fp6wfgvh49ifq"; depends=[assertthat dplyr forcats ggplot2 ggraph igraph magrittr rlang stringdist stringi stringr tidygraph]; }; clustsig = derive2 { name="clustsig"; version="1.1"; sha256="0n5nf712vsa8zb0c2lv4gjqsgva62678vjngr9idgswb73shxm8v"; depends=[]; }; @@ -5835,7 +5919,7 @@ in with self; { cmenet = derive2 { name="cmenet"; version="0.1.0"; sha256="19cqd3ppama2g4a7mwnq4fry0nzkyny1z1irln3xqd22gb8lz38r"; depends=[glmnet hierNet MASS Rcpp RcppArmadillo]; }; cmm = derive2 { name="cmm"; version="0.12"; sha256="0q6hs56hhi9vaanx7i7gg7ncv0h29lndla66g9chzmh3lchq3r20"; depends=[]; }; cmmr = derive2 { name="cmmr"; version="0.1.2"; sha256="0nik1pzd1rckalvn7xh6s699kkdjnra3q3bn5x16c1lmpz5bp2s4"; depends=[httr progress RJSONIO]; }; - cmna = derive2 { name="cmna"; version="1.0.0"; sha256="1x4w47j39p2f2n4jxrp4r1vw6gvpqzkgr5h158s18z26zllpvrnr"; depends=[]; }; + cmna = derive2 { name="cmna"; version="1.0.2"; sha256="18vbqa258m0g5pvfhqi2vbr8n2bil07n9spgz1wh2axw1c3bcf76"; depends=[]; }; cmocean = derive2 { name="cmocean"; version="0.2"; sha256="0v1bm2qgvjb82ynakglr61swx5jy41ngn6vml5gllv3r7skqr1is"; depends=[]; }; cmpprocess = derive2 { name="cmpprocess"; version="1.0"; sha256="0gqfmbm86bfi2l81pf2dn70rxg58h1y8hiyrp8sv9v84cx20422v"; depends=[compoisson numDeriv]; }; cmprsk = derive2 { name="cmprsk"; version="2.2-8"; sha256="1nacbzx950ygaqgnj0949skhwpzar5i3xlscd44jsimk2gsppx6z"; depends=[survival]; }; @@ -5848,20 +5932,20 @@ in with self; { cncaGUI = derive2 { name="cncaGUI"; version="1.0"; sha256="1v55kvrc05bsm1qdyfw3r3h64wlv3s6clxbr8k512lfk99ry42kn"; depends=[MASS plotrix rgl shapes tcltk2 tkrplot]; }; cnmlcd = derive2 { name="cnmlcd"; version="1.2-0"; sha256="1vpn926wf8vkifscnb35y4c74721iar2wykrl50fcv0fg16yggnd"; depends=[lsei]; }; coRanking = derive2 { name="coRanking"; version="0.1.4"; sha256="03wvy19jrb3q31yfpmakji25zwc6zx26irj4rwkad81iwdqihq3s"; depends=[]; }; - coala = derive2 { name="coala"; version="0.5.2"; sha256="1rj9my20ba79alkhszh5lfvb9gjr6vcgiwqk2szawkpd1np3lpsr"; depends=[assertthat digest R6 Rcpp RcppArmadillo rehh scrm]; }; + coala = derive2 { name="coala"; version="0.5.3"; sha256="02gfw20lhwdz9mbdwgla6kcvi84sjy916vxb9zwdgair493z3cay"; depends=[assertthat digest R6 Rcpp RcppArmadillo rehh scrm]; }; coalescentMCMC = derive2 { name="coalescentMCMC"; version="0.4-1"; sha256="0xxv1sw5byf84wdypg5sfazrmj75h4xpv7wh4x5cr9k0vgf80b3s"; depends=[ape coda lattice Matrix phangorn]; }; - coalitions = derive2 { name="coalitions"; version="0.6.5"; sha256="0s91yg60cpnn2fd185m7bww93kls4qlcq6bcy5nr5kmgiscril3p"; depends=[checkmate dplyr forcats gtools jsonlite lubridate magrittr purrr RCurl reshape2 rlang rvest stringr tidyr xml2]; }; + coalitions = derive2 { name="coalitions"; version="0.6.10"; sha256="1yfibzkg4psmghfwpv5rivaxzizilbd8frgpd0z05hx519lmx9h7"; depends=[checkmate dplyr forcats ggplot2 gtools jsonlite lubridate magrittr purrr RCurl reshape2 rlang rvest stringr tidyr xml2]; }; coarseDataTools = derive2 { name="coarseDataTools"; version="0.6-4"; sha256="1y6msvcr1j9cvnc1v87p6wkwvnn7iszwsr9sl6ixjjwgnpc05ayc"; depends=[MCMCpack]; }; cobalt = derive2 { name="cobalt"; version="3.7.0"; sha256="02d7p242kz95j41cqcjhrs2bsfwpjf7512rn0g1smwn78axq30f0"; depends=[backports crayon ggplot2 ggstance]; }; cobiclust = derive2 { name="cobiclust"; version="0.1.0"; sha256="068cqrhx7lxsvcjb62rgrca7y20cybz4445bl1qc6k16ca4bh0m9"; depends=[cluster]; }; cobs = derive2 { name="cobs"; version="1.3-3"; sha256="1pqvz7czcchri4x79g78hbwyagb3bqzdqb047zkbdinyz067c7kb"; depends=[quantreg SparseM]; }; - cocktailApp = derive2 { name="cocktailApp"; version="0.2.0"; sha256="05jw72v7gayyfflyy5g249d4sl689a55bf7ycijiks2s5gbj68b6"; depends=[dplyr DT forcats ggplot2 magrittr shiny shinythemes Ternary tibble tidyr]; }; + cocktailApp = derive2 { name="cocktailApp"; version="0.2.1"; sha256="1aq7m3qb4s5v59ym8p5vh7lr5s1xfp8b04x64a014k47gakgiw1d"; depends=[dplyr DT forcats ggplot2 ggtern magrittr shiny shinythemes tibble tidyr]; }; cocor = derive2 { name="cocor"; version="1.1-3"; sha256="106zyrrypil8jyg0pva5zj4hgb53z81nca3d0mh2q3j55zq3wl12"; depends=[]; }; cocoreg = derive2 { name="cocoreg"; version="0.1.1"; sha256="0jrrkak964pl1vih592jgqgl6bw08j0fa1rh3j85x64bqq4m7278"; depends=[abind CCAGFA combinat e1071 ggplot2 glmnet gridExtra MASS multiway pls reshape RGCCA]; }; cocorresp = derive2 { name="cocorresp"; version="0.4-0"; sha256="1z9wiqqx1jzmyfvmiag49vqf4cq6ayrwsv52h6jvnr9hgwnzrrzv"; depends=[vegan]; }; cocron = derive2 { name="cocron"; version="1.0-1"; sha256="0dl14y9v9kndy5gzhhbhq3f31ja724y1hra40givy6bij7h2cj30"; depends=[]; }; - coda = derive2 { name="coda"; version="0.19-2"; sha256="03fs3sdrrym3is92dgpa6ydk3m63gaihwy7bva4k0wm2hxm7x2k7"; depends=[lattice]; }; - coda_base = derive2 { name="coda.base"; version="0.1.12"; sha256="00cijr1x6w7frd7qrfyir29rh2747m926rf3h2izmx08kxjnsgc8"; depends=[MASS Rcpp RcppArmadillo]; }; + coda = derive2 { name="coda"; version="0.19-3"; sha256="1mn50bshky968gn4nf6vnkaa768fnvm1xmhkms7szwdw9341zpyk"; depends=[lattice]; }; + coda_base = derive2 { name="coda.base"; version="0.2.1"; sha256="1ammzzh4w8g5d6c1wfqg7pglrc5lq8sr3qzgf1bjsrm9p5ysw1li"; depends=[MASS Rcpp RcppArmadillo]; }; codadiags = derive2 { name="codadiags"; version="1.0"; sha256="1x243pn6qnkjyxs31h1hxy8x852r0fc952ww77g40qnrk8qw79xg"; depends=[coda]; }; codebook = derive2 { name="codebook"; version="0.8.1"; sha256="0rsrw5333wrmkqqgqbf7b7y91sjw7jyrzdsiaxa2y993s0nl4y2j"; depends=[dplyr DT future ggplot2 glue haven htmltools jsonlite knitr labeling labelled likert lubridate miniUI pander psych purrr rio rlang rmarkdown rstudioapi shiny skimr stringr tibble tidyr userfriendlyscience]; }; codemetar = derive2 { name="codemetar"; version="0.1.8"; sha256="1zqpxh0hx7jh1xki1sx9bs5a30hv4gfaqqlnd630a5n68hghjmg2"; depends=[commonmark crul curl desc gh git2r glue jsonlite magrittr memoise pingr pkgbuild purrr readr sessioninfo stringi stringr tibble usethis whisker xml2]; }; @@ -5883,6 +5967,7 @@ in with self; { coinmarketcapr = derive2 { name="coinmarketcapr"; version="0.2"; sha256="1r3r5ifl663pdmkvkrf6yhdg1kwmwdjg9kvp0ykbdvpbvqjcjhkv"; depends=[curl ggplot2 jsonlite]; }; cointReg = derive2 { name="cointReg"; version="0.2.0"; sha256="0n4s809avhlrmrjdqzc2s752m7x96c4432gnjd4qv77r2nns7dw4"; depends=[checkmate MASS matrixStats]; }; cointmonitoR = derive2 { name="cointmonitoR"; version="0.1.0"; sha256="0rsacvib9prgb199m5ndi0zlgfsvf1giqc5s41wp0yvxdxjdq5lw"; depends=[cointReg matrixStats]; }; + cold = derive2 { name="cold"; version="2.0-0"; sha256="10kn2kycyc6di30ji6lk5agsczh1zdv65s8ryj6q2f40v0y0zlck"; depends=[cubature]; }; colf = derive2 { name="colf"; version="0.1.3"; sha256="1av82yrp6csw7700ymipd02j73cmzn0apv7ykachjw09nzk86kvj"; depends=[nlsr]; }; collUtils = derive2 { name="collUtils"; version="1.0.5"; sha256="0gbk3lrb2lwq2ixrpcngng6qz6axjb4iyqy5606x1zmjm71c060p"; depends=[Rcpp rJava]; }; collapsibleTree = derive2 { name="collapsibleTree"; version="0.1.7"; sha256="0b65pbp1wnpsrayqi630ds4r98jvcvynnlp6wxdqrnnr9nzw5343"; depends=[data_tree htmlwidgets]; }; @@ -5890,7 +5975,7 @@ in with self; { collectArgs = derive2 { name="collectArgs"; version="0.4.0"; sha256="0fz5w1xsxiddzrwahrg50px4igyhd4plq655jaix6grancs7kvix"; depends=[magrittr]; }; collections = derive2 { name="collections"; version="0.1.6"; sha256="1wd2wz6xg7nk54kwb142fw8qi0zbwk3j07v0kj7myradhcs6a29b"; depends=[R6]; }; collector = derive2 { name="collector"; version="0.1.2"; sha256="02w4rlxqmag43qb424hpnqpb8rnkgkx7rz2g8hnp9iyj7h125p94"; depends=[dplyr EnvStats evaluator flextable ggplot2 ggpubr magrittr officer purrr quanteda readr rlang rmarkdown stringr tibble tidyr xaringan]; }; - collidr = derive2 { name="collidr"; version="0.1.0"; sha256="1mdwy7fw2sy5gv2skw5vxz0xnnmh0v4jd7xn2dkrvrnclz5sl4ah"; depends=[dplyr stringr]; }; + collidr = derive2 { name="collidr"; version="0.1.1"; sha256="08rmasvm9c01li29c1k8hbmcjnks6k9himxc6j6789iz48pzccpj"; depends=[dplyr jsonlite stringr]; }; collpcm = derive2 { name="collpcm"; version="1.0"; sha256="15k6khsgikjpsasyz02bhgd43nij2n7nl0m0sgxvjlcn0nv95y2n"; depends=[latentnet network vegan]; }; colmozzie = derive2 { name="colmozzie"; version="1.1.1"; sha256="0sn7dqg7rnddnmdb10c6scws6kgi1lz4lw8nc698x63z431ah1p8"; depends=[]; }; coloc = derive2 { name="coloc"; version="3.2-1"; sha256="0sm2mji8bihvcshkh9g18sgbwznhh8j4hip50rk7ckac3vc8y75h"; depends=[BMA data_table ggplot2 reshape snpStats]; }; @@ -5925,7 +6010,7 @@ in with self; { commandr = derive2 { name="commandr"; version="1.0.1"; sha256="1d6cha5wc1nx6jm8jscl7kgvn33xv0yxwjf6h3ar3dfbvi4pp5fk"; depends=[]; }; commentr = derive2 { name="commentr"; version="1.0.4"; sha256="0anlcbk8rj0yr8i23qmr6v5ws0695nkc3mvgr6pnq1fg2d4c4brj"; depends=[stringr]; }; commonmark = derive2 { name="commonmark"; version="1.7"; sha256="024iz1qp2kv6iz6y69ir0jk3qhjps86rhkzlcmhqsxx97rx7cjni"; depends=[]; }; - commonsMath = derive2 { name="commonsMath"; version="1.2.2"; sha256="0vayi4s3nbja3lxx1y98ld6mrn6zpvydf5acvd43v6jc18qa821n"; depends=[]; }; + commonsMath = derive2 { name="commonsMath"; version="1.2.4"; sha256="12hwl3xjm7kl5y36v3y4jyr2gk4l87mff237qms2hy8y41nwwagr"; depends=[]; }; comorbidity = derive2 { name="comorbidity"; version="0.4.1"; sha256="0dgbhbm5jjxqy6spm0sw9gmx6v0b426m6aj6gr9jjnd06vraw6pc"; depends=[checkmate stringi]; }; compHclust = derive2 { name="compHclust"; version="1.0-3"; sha256="0agay7rn5mrw07imz4l547b7m9pfcg3rhz4krfxrvg1q2z2kryvj"; depends=[]; }; compactr = derive2 { name="compactr"; version="0.1"; sha256="0f2yds6inmx0lixj08ibqyd2i61l2cbg1ckgpb8dl2q7kcyyd6mx"; depends=[]; }; @@ -5947,7 +6032,7 @@ in with self; { complmrob = derive2 { name="complmrob"; version="0.6.2"; sha256="0r8yz1zsqd030k0qqsfvqh9z5vx632cwynnz5ch6ndg6g89baxmf"; depends=[boot ggplot2 robustbase scales]; }; compoisson = derive2 { name="compoisson"; version="0.3"; sha256="0v5dl7xydqi4p97nipn4hyhpq2gghmx81ygvl0vc8b65jhq89y0p"; depends=[MASS]; }; compositions = derive2 { name="compositions"; version="1.40-2"; sha256="12mp05yi7jkdqg9iwh6bc9sx6sdxagcnrirznxy9hq8502p7238i"; depends=[bayesm energy robustbase tensorA]; }; - compound_Cox = derive2 { name="compound.Cox"; version="3.17"; sha256="04fgxs522gqm28lbsa0qr8mlpnlzpxfdisax3l1mpy7j8kxy22ys"; depends=[numDeriv survival]; }; + compound_Cox = derive2 { name="compound.Cox"; version="3.18"; sha256="1ksgh94k2qqq6xs9fdar88564pkdgsvbqs4yrkah6q60n406qh7r"; depends=[numDeriv survival]; }; comprehenr = derive2 { name="comprehenr"; version="0.6.7"; sha256="0c0wid4lch7yrz41b8n773hy4zj80sfb1lhy4pclvlsjdr5zryk6"; depends=[]; }; compstatr = derive2 { name="compstatr"; version="0.1.1"; sha256="0lamnhch443rz01gpjyyva7k7fcxg4ca7szxzxvwpmln5vvpsagr"; depends=[dplyr fs lubridate purrr readr rlang sf stringr tibble tidyr]; }; compute_es = derive2 { name="compute.es"; version="0.2-4"; sha256="1b5i8z66zbag0vdv98mmpwmizpm68vc3ajh0n3q94zdcmhcbx12d"; depends=[]; }; @@ -5960,7 +6045,7 @@ in with self; { 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.6"; sha256="1ncs9cpviv5kd49hahlhi7wn2yk70msi22qv8fw91hf81ccimlp2"; depends=[survival]; }; - concurve = derive2 { name="concurve"; version="1.0.6"; sha256="05xflwjn2w9v3xr02kas1l70hk4i4pyvbry8lzid0f40iv8h7b4a"; depends=[ggplot2 metafor]; }; + concurve = derive2 { name="concurve"; version="2.0"; sha256="090j7fv9c1m13xynq5sdrdrl0g2c1lamlb2nwg5xsjlv93ckm3az"; depends=[dplyr ggplot2 metafor scales survival survminer tibble]; }; cond = derive2 { name="cond"; version="1.2-3.1"; sha256="1j0gf28mg2j6ahs83nk662bix1lb2c9184vn8sblw433zxqaa2ny"; 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]; }; @@ -5973,7 +6058,7 @@ in with self; { condvis = derive2 { name="condvis"; version="0.5-1"; sha256="1ngxqfa0mr86cv610da4ljypxpdvx0n5pfgj3zfksnwxlwc0dvbj"; depends=[MASS]; }; condvis2 = derive2 { name="condvis2"; version="0.1.0"; sha256="1xvxqr311wwi8ns31zqnxxb7bji3vl296j3qfq7vh0alxlhd4n4r"; depends=[cluster DendSer ggplot2 kmed plyr RColorBrewer scales shiny]; }; coneproj = derive2 { name="coneproj"; version="1.14"; sha256="0km7njsxjgrv4d8bx709nci59ngm00jg1r55702yapyjl0f2zg93"; depends=[Rcpp RcppArmadillo]; }; - conf = derive2 { name="conf"; version="1.6.0"; sha256="16qyhydxwz4wdgckvrqcypdybb4rcyh99f3w3xghxjai20qskadj"; depends=[fitdistrplus SDMTools STAR statmod]; }; + conf = derive2 { name="conf"; version="1.6.1"; sha256="07fhdk5ccak3pv3rf0ail46v822m8ycq8la1qivhl6jzi7ga45x9"; depends=[fitdistrplus SDMTools STAR statmod]; }; conf_design = derive2 { name="conf.design"; version="2.0.0"; sha256="06vdxljkjq1x56xkg041l271an1xv9wq79swxvzzk64dqqnmay51"; depends=[]; }; confSAM = derive2 { name="confSAM"; version="0.2"; sha256="1l67ndya07hh0yqfbabfhsvp3hryklx0022grpr0cb7ff88d1zam"; depends=[]; }; confidence = derive2 { name="confidence"; version="1.1-2"; sha256="0m6iz59n5jpi0ig3za3nir4d4bdsysf5g47d2nakfmaz03wk520z"; depends=[ggplot2 knitr markdown plyr xtable]; }; @@ -5994,11 +6079,12 @@ in with self; { constellation = derive2 { name="constellation"; version="0.2.0"; sha256="1d49rnyf2z3bvx158nsmgmb0x7xcgxl9f8y98pwg5wlqck7af99q"; depends=[data_table]; }; constrainedKriging = derive2 { name="constrainedKriging"; version="0.2.4"; sha256="1a91s0b7yka37fb5pm172fmlqrhm6da370cqb9knvkg5n8vi4hys"; depends=[RandomFields rgeos sp spatialCovariance]; }; container = derive2 { name="container"; version="0.3.0"; sha256="128fj97mx52kap299fmhn3whnaismsd4cq3zqpbfvwxx2ii4fd33"; depends=[R6]; }; - contextual = derive2 { name="contextual"; version="0.9.8.1"; sha256="1phcbqsa01qz2m5zd4s3nzf06szwyhh231hlqnarqvhn38lynsa9"; depends=[data_table doParallel foreach Formula iterators itertools R_devices R6 rjson]; }; + contextual = derive2 { name="contextual"; version="0.9.8.2"; sha256="03123mghmixy9v2c5lqg0df5ycxa09mir94rkjgs8lp62ncq170r"; depends=[data_table doParallel foreach Formula iterators itertools R_devices R6 rjson]; }; contfrac = derive2 { name="contfrac"; version="1.1-12"; sha256="0sq5c7ny235yrkv2xc4insgxby6rvzc1qsj8h301cd2if3lwbgwm"; depends=[]; }; conting = derive2 { name="conting"; version="1.7"; sha256="08f271j3gxcp4shda08kkv0v9ayaadvxgcglfsn6hjmw4hn298zg"; depends=[BMS coda gtools mvtnorm tseries]; }; contoureR = derive2 { name="contoureR"; version="1.0.5"; sha256="1izq1alkf24zd2sf2ir2adyrkwhdj7n89cv6z0dfh5mfqld5bkdn"; depends=[geometry plyr Rcpp reshape]; }; contrast = derive2 { name="contrast"; version="0.21"; sha256="1fgm6qm3svqg8ryq2kd1h9z6f3ni8kki7gl3izvjw6wir97ph8nw"; depends=[geepack Hmisc MASS nlme rms sandwich]; }; + contribution = derive2 { name="contribution"; version="0.1.0"; sha256="06y6qa7c0zifg6fqfpwry4z367ckiyk9v09n8cqc6q98c3ddkwj3"; depends=[dplyr ggplot2 gh magrittr rlang tidyr]; }; control = derive2 { name="control"; version="0.2.5"; sha256="02s8h5kwpzfrivx3ign84gwlybkcs03ibawyxdny9zz5yhb7x3bs"; depends=[expm Matrix pracma signal]; }; controlTest = derive2 { name="controlTest"; version="1.1.0"; sha256="19r8nvi35ldzgayifskjj706fv76hv6sj68yvggybp27rgyqbjfl"; depends=[survival]; }; convertGraph = derive2 { name="convertGraph"; version="0.1"; sha256="1jsrygj6ydzc0nzyzaq95j4blqavj7dqz182vgm1ckv8an3if0jx"; depends=[]; }; @@ -6012,7 +6098,7 @@ in with self; { coop = derive2 { name="coop"; version="0.6-2"; sha256="052n2h7yhjj88x87sd3ci9ahhhn5r5rvsm79kh3r2zqbxsr8zzrh"; depends=[]; }; coopProductGame = derive2 { name="coopProductGame"; version="2.0"; sha256="1348pgqfvvysdixsjibgkvwjsmqasnlmwf9kyr39lw8jb81z25h0"; depends=[dplyr GameTheory ggplot2 gtools kappalab lpSolveAPI]; }; cooptrees = derive2 { name="cooptrees"; version="1.0"; sha256="0izvwna1jsqik3v5fz1r4c86irvma42clw0p4rdvwswv5pk698i1"; depends=[gtools igraph optrees]; }; - copBasic = derive2 { name="copBasic"; version="2.1.2"; sha256="0h73lnxjf2mji8x2jl0r9559a4sgj1pxivp89hmmnj8zl4b4c3gl"; depends=[lmomco randtoolbox]; }; + copBasic = derive2 { name="copBasic"; version="2.1.4"; sha256="0bcnpqc54lxgnxr6zgp2rz8vcbsicnjcs3vs3lsdhymlxifps7la"; depends=[lmomco randtoolbox]; }; copCAR = derive2 { name="copCAR"; version="2.0-2"; sha256="032gphv64v2mmy63q86qgpa31i36ix6fkjsdxmzgqyxcyzgb0jcy"; depends=[mcmcse numDeriv Rcpp RcppArmadillo spam]; }; cope = derive2 { name="cope"; version="0.2.3"; sha256="1r02nb6wy25ixhdcbqqz167s7ny3hydpxfxry5ar4136qvcamgyy"; depends=[abind fields maps MASS Matrix mvtnorm nlme]; }; coppeCosenzaR = derive2 { name="coppeCosenzaR"; version="0.1.3"; sha256="1chwsfyaf5rmlsypr43n7px8b2220dfa5mzcriq1swylgbx4181l"; depends=[]; }; @@ -6039,14 +6125,14 @@ in with self; { corpora = derive2 { name="corpora"; version="0.5"; sha256="0b4yw37msx9h8hf5mjs4h10gdmc1qc2gv5bzyj1r90n4gcli042d"; depends=[]; }; corpus = derive2 { name="corpus"; version="0.10.0"; sha256="0c984rsnbai2qrm2s10lkdfgx31m0ax46zhl74bns2bxfmagcn3l"; depends=[utf8]; }; corpustools = derive2 { name="corpustools"; version="0.3.3"; sha256="1hgcwnjhqfyylvqcy2j5f2k6chwyybnx38vzzvq62s6qf6p9p7by"; depends=[data_table Matrix memoise plyr R6 Rcpp SnowballC stringi udpipe wordcloud]; }; - corr2D = derive2 { name="corr2D"; version="0.3.0"; sha256="1dx3mjcbpwmq9iy7rwxn3fghaw9g1m8ksa9gj4yqkagw6k4hjnin"; depends=[colorspace doParallel fields foreach mmand profr rgl xtable]; }; + corr2D = derive2 { name="corr2D"; version="1.0.0"; sha256="12k6vbqyb33kfj2xdg8rbydnp2yk15kv4b0m4lid4gf2lqmy3jwz"; depends=[colorspace doParallel fields foreach mmand profr rgl xtable]; }; corrDNA = derive2 { name="corrDNA"; version="1.0.1"; sha256="1mfjrzpcb63ydyj1yxa0wd3vh4z0rdwsqv09w0a0l4l7mhb5jz2k"; depends=[mvtnorm]; }; correctedAUC = derive2 { name="correctedAUC"; version="0.0.3"; sha256="0c2kq7asq5mp48p8niqb84wnw4q2q2985wxbrywrhsszm9p3xspb"; depends=[ICC mnormt]; }; corregp = derive2 { name="corregp"; version="2.0.2"; sha256="1v048dibn2x3y5mi2damcsr9i5kdig5n53g5j9gf31lqkzzjmnh3"; depends=[data_table diagram ellipse gplots rgl]; }; correlbinom = derive2 { name="correlbinom"; version="0.0.1"; sha256="1ix3ccxzr7vqblbda5awsva3h95b69v7kc6adz622bbi8r36xxcq"; depends=[Rmpfr]; }; corrgram = derive2 { name="corrgram"; version="1.13"; sha256="1g5159vihsz5a2cfmg4g4i1lildn2x2wzck5sd0vml5810rxjpma"; depends=[seriation]; }; corrplot = derive2 { name="corrplot"; version="0.84"; sha256="1k03qd8db7pwg1v318xapx5mpiypiz2n07qr19c4b45diri5xkhd"; depends=[]; }; - corrr = derive2 { name="corrr"; version="0.3.2"; sha256="1xscrbdhpy3nkm66pb5dg7mrpa2kjy3d2fs1z8q7mm66qr70pnds"; depends=[dplyr ggplot2 ggrepel lazyeval magrittr purrr rlang seriation tibble tidyr]; }; + corrr = derive2 { name="corrr"; version="0.4.0"; sha256="0zjqkgsnwgcyi8hdskr7in0liqhpj9qml96agawzj11iy0bf6387"; depends=[dplyr ggplot2 ggrepel purrr rlang seriation tibble]; }; corrsieve = derive2 { name="corrsieve"; version="1.6-8"; sha256="0ak3j9khcwv5rxbicck2sr260wpmd3xj254y7pdavx2fk0b72yxs"; depends=[]; }; corset = derive2 { name="corset"; version="0.1-4"; sha256="0ladyqvkys4cldvbhkii9jwn1k5p1ym2g5bgdlz1hq1sv30ixn2f"; depends=[]; }; cosa = derive2 { name="cosa"; version="1.2.2"; sha256="10cfpzrccqg9i6pb2z1m57lxr7yf7bfdhvcxhmamdn1ps9mjkmlw"; depends=[nloptr]; }; @@ -6055,7 +6141,7 @@ in with self; { cosmoFns = derive2 { name="cosmoFns"; version="1.0-1"; sha256="0a6xhbgxxnymlvicg99yhgny2lscxcbmvqmy17kxmahdi797dsg6"; depends=[]; }; cosso = derive2 { name="cosso"; version="2.1-1"; sha256="1wyq27qak0kz4bbzynm24r5ksvb6ddd43h2ykh6m935xck16blyb"; depends=[glmnet quadprog Rglpk]; }; costat = derive2 { name="costat"; version="2.4"; sha256="0c47bklqjgjmdglw3mi9lvygwjr5w6i1zv91ll3vpnl5dnay0692"; depends=[wavethresh]; }; - costsensitive = derive2 { name="costsensitive"; version="0.1.2.1"; sha256="0q50q39wngyqfg4vxhxdb8v64v0ws7njs2zzf6qhlhipqhhxq55n"; depends=[]; }; + costsensitive = derive2 { name="costsensitive"; version="0.1.2.10"; sha256="192q55123yzcjjh4047ppxa3h7gk9afqnvm1nlhzs4ccqz71g411"; depends=[]; }; cotrend = derive2 { name="cotrend"; version="1.0.1"; sha256="14yzfq5a3wi26gn45mp2zm2yn6gic90csk9by66m08fgpzznz4dq"; depends=[xts]; }; couchDB = derive2 { name="couchDB"; version="1.4.1"; sha256="1n99amvnsjp88y091603hjsvp243c5i6dbrsvdjfmzgj5dsrv70m"; depends=[bitops httr RCurl rjson]; }; countHMM = derive2 { name="countHMM"; version="0.1.0"; sha256="12z0nz7in2msb5wa5yyjxx19ih8psw06m7xwlapvjksslippp6gs"; depends=[]; }; @@ -6081,23 +6167,23 @@ in with self; { covreg = derive2 { name="covreg"; version="1.0"; sha256="0v19yhknklmgl58zhvg4szznb374cdh65i7s8pcj2nwrarycwzaq"; depends=[]; }; covsep = derive2 { name="covsep"; version="1.1.0"; sha256="19dvwhl85yx9ddwxvnq5sdd534s6llcw61gckrav48hq49x1bqld"; depends=[mvtnorm]; }; cowbell = derive2 { name="cowbell"; version="0.1.0"; sha256="1zz0g30zvqfk5lh09y90iq3s7x2wwbs852i3d56mfp926gxdxc2y"; depends=[ggplot2 misc3d rgl]; }; - cowplot = derive2 { name="cowplot"; version="0.9.4"; sha256="0yvalwalvyddyqk0q66y8361nxlh2cvp3ssazax9g5q89lghjmzv"; depends=[ggplot2 gtable plyr scales]; }; + cowplot = derive2 { name="cowplot"; version="1.0.0"; sha256="19cqdhgfyr1wj0fz0c5ly8f0aiy9sfgzq6lzb78hkx0hdp2agybh"; depends=[ggplot2 gtable rlang scales]; }; cowsay = derive2 { name="cowsay"; version="0.7.0"; sha256="1f5hc1sj79yd3l2c6vrcj6xx2hdfxb16c3d2sgr7yps8j5fyrb9h"; depends=[crayon fortunes rmsfact]; }; - coxed = derive2 { name="coxed"; version="0.2.4"; sha256="147rrr72s55lk18snljy1i66wr9chv2s3mqwxn35gg20nqxjwki4"; depends=[dplyr ggplot2 gridExtra mgcv PermAlgo rms survival tidyr]; }; + coxed = derive2 { name="coxed"; version="0.3.0"; sha256="01fwkw6ba8zj09a7mzm7rja188rapd6knwjq247pm4panqih8m5l"; depends=[dplyr ggplot2 gridExtra mgcv PermAlgo rms survival tidyr]; }; coxinterval = derive2 { name="coxinterval"; version="1.2"; sha256="0vb7vmzbb2dsihx04jbp2yvzcr033g435mywmwimqhfqdrmjx3fi"; depends=[Matrix survival timereg]; }; - coxme = derive2 { name="coxme"; version="2.2-10"; sha256="12p41qc3ryxdcw2zljgvw2gk1wl1pj7h61naqbyc1h0l3dqy8dg2"; depends=[bdsmatrix Matrix nlme survival]; }; + coxme = derive2 { name="coxme"; version="2.2-14"; sha256="0pcmf44c3v1hvr8031lwgib58j6la5hsphsbc57mcgz09ppw30zg"; depends=[bdsmatrix Matrix nlme survival]; }; coxphMIC = derive2 { name="coxphMIC"; version="0.1.0"; sha256="0lmma5wzcczr762xqa4yamvwvyviqxk8gdrps3sydg3n14hckp6d"; depends=[numDeriv survival]; }; coxphSGD = derive2 { name="coxphSGD"; version="0.2.1"; sha256="17ga33v7a89dsygk5yypkz03x7dvjhibnwlvwfvgb2p7djd8w465"; depends=[survival]; }; coxphf = derive2 { name="coxphf"; version="1.13"; sha256="16bman8xv5xx7gg8s54sj3hc4isqxk4h3q93h4q3h3j0bdvww2yy"; depends=[survival]; }; coxphw = derive2 { name="coxphw"; version="4.0.1"; sha256="116dp6zispa8k7y6jrn4v9ipf0jqdhj68w9qqc2qwcapawvrd0nh"; depends=[survival]; }; coxrobust = derive2 { name="coxrobust"; version="1.0"; sha256="08hp0fz5gfxgs3ipglj6qfr6v63kzxkrzg650bmzabq8dvrxd97q"; depends=[survival]; }; - coxrt = derive2 { name="coxrt"; version="1.0.1"; sha256="0srlpbxzqgbwhdj1fr4lkfxyf7zn6sm2aim2xmabri41zzl77mhx"; depends=[BB ggplot2 gss inline Rcpp RcppArmadillo survival]; }; + coxrt = derive2 { name="coxrt"; version="1.0.2"; sha256="0sj99jfnbd20k81pax3f614z0kafmvmglkykh10nadyc0g2sv5mm"; depends=[BB ggplot2 gss inline Rcpp RcppArmadillo survival]; }; coxsei = derive2 { name="coxsei"; version="0.1"; sha256="1agr0gmyy1f2x6yspj04skgpi1drpbc1fcbwhhhjsz1j6c64xagy"; depends=[]; }; cp4p = derive2 { name="cp4p"; version="0.3.6"; sha256="1zddkkj0ynvfck3kw1682wffbxw0d3dc4flmxxp03lclq70fc8bd"; 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=[]; }; + cpcens = derive2 { name="cpcens"; version="0.1.0"; sha256="18hv659021wmw4v69xf0k5bq4dvyjkz9gmad0a8fr1ym1qr0ip8i"; depends=[cents Rdpack tbart]; }; cpd = derive2 { name="cpd"; version="0.1.0"; sha256="1qcyb7n69ppa0py7w31msim7gf2wdh94hmsilsdk8ivxljc1gv8n"; depends=[fAsianOptions Rdpack]; }; - cpgen = derive2 { name="cpgen"; version="0.1"; sha256="1cp3d6riy65lc1mfrxh92lc6f1qal7amhjilfzz0r529j5fipd2v"; depends=[Matrix pedigreemm Rcpp RcppEigen RcppProgress]; }; cpk = derive2 { name="cpk"; version="1.3-1"; sha256="1njmk2w6zbp6j373v5nd1b6b8ni4slgzpf9qxn5wnqlws8801n73"; depends=[]; }; cplexAPI = derive2 { name="cplexAPI"; version="1.3.6"; sha256="1yj0ighr64v1wdz40ml8dmypa01r6r9lr59fc0mfq4n1l0df62gw"; depends=[]; }; cplm = derive2 { name="cplm"; version="0.7-8"; sha256="0gvl3xwqbyqgqd42l97ryy8qsf23njqfgvc16w21124s77wsixaw"; depends=[biglm coda ggplot2 Matrix minqa nlme reshape2 statmod tweedie]; }; @@ -6111,25 +6197,26 @@ in with self; { cptcity = derive2 { name="cptcity"; version="1.0.4"; sha256="1agknys80m16xq0x285sdf1452a6dmghysrhy7s6zfcb59acb1nf"; depends=[]; }; cptec = derive2 { name="cptec"; version="0.1.0"; sha256="1sh6vs9qfxxlhlg6y2qchikjg8sh64zg3j8x5b9dpba9lhbhzzqj"; depends=[magrittr rvest xml2]; }; cqrReg = derive2 { name="cqrReg"; version="1.2"; sha256="1sn8pkbqb058lbysdf2y1s734351a91kwbanplyzv3makbbdm4ca"; depends=[quantreg Rcpp RcppArmadillo]; }; - cquad = derive2 { name="cquad"; version="2.0"; sha256="0y2vwlbplp8b9xpv3byy3nah3xa3jwv57jaqqmjjwaw8m3q8ss9v"; depends=[MASS plm]; }; + cquad = derive2 { name="cquad"; version="2.1"; sha256="1cq57qd33cbzhgnnw4fk36xch0prwr9a404sxi7b4ijwgzw84d0h"; depends=[MASS plm]; }; cr17 = derive2 { name="cr17"; version="0.1.0"; sha256="1zyq77gxycbwyqhv5w0zw4n7v3ipjs6rcbja43g0k5q8h0gjnnn1"; depends=[cmprsk dplyr ggplot2 gridExtra gtable scales survival]; }; cramer = derive2 { name="cramer"; version="0.9-3"; sha256="1kdad8nndhics4282gfy9ncllk2kpawdy8ybq71vcd7hc7kf0zq5"; depends=[boot]; }; crank = derive2 { name="crank"; version="1.1-2"; sha256="0wwbdh5sfi2bg13nrlkxxij4k053kjx9afm4gjpgs6iir6pml711"; depends=[]; }; cranlike = derive2 { name="cranlike"; version="1.0.2"; sha256="06xgxgwpmfrwmcd0gnr9prjjbhd1y0ky1zb8yh09v0bvsf6ixnyx"; depends=[DBI debugme desc RSQLite]; }; cranlogs = derive2 { name="cranlogs"; version="2.1.1"; sha256="02d9qrqyjj33naq3g7ykaw9dzzl1dq8qf13id6h7kfx1fvx9b7zd"; depends=[httr jsonlite]; }; - cranly = derive2 { name="cranly"; version="0.3"; sha256="1kv2281awvd4xc657wprbsy13smx6779msnczby7sw0x87y5k0x1"; depends=[colorspace countrycode ggplot2 igraph magrittr stringr visNetwork]; }; + cranly = derive2 { name="cranly"; version="0.5.3"; sha256="15ngklyqjp0yxz42ijhfpvraxd549fidj1k4b1s1v3iilwvsd7q4"; depends=[colorspace countrycode ggplot2 igraph magrittr stringr tm visNetwork wordcloud]; }; crantastic = derive2 { name="crantastic"; version="0.1"; sha256="0y2w9g100llnyw2qwjrib17k2r2q9yws77mf6999c93r8ygzn4f5"; depends=[]; }; + crassmat = derive2 { name="crassmat"; version="0.0.6"; sha256="1c4ii34vh8y5b3z2maby4cafb3n2m9bnxv3762cy0z12mbg7zk1s"; depends=[svMisc]; }; crawl = derive2 { name="crawl"; version="2.2.1"; sha256="18mr7vp72jj5msj9mbq45jy3f6qhn45azsmkq07i2d30gwdj0c3a"; depends=[dplyr gdistance lubridate magrittr mvtnorm purrr raster Rcpp RcppArmadillo rmapshaper sf shiny sp tibble]; }; crayon = derive2 { name="crayon"; version="1.3.4"; sha256="0s7s6vc3ww8pzanpjisym4jjvwcc5pi2qg8srx7jqlz9j3wrnvpw"; depends=[]; }; crblocks = derive2 { name="crblocks"; version="1.0-0"; sha256="0y101kgi7ryjv18fyjp0ralp4qj7kgshmbd4mf7n3hdjay0znss5"; depends=[]; }; crch = derive2 { name="crch"; version="1.0-3"; sha256="0f1kby790symj5r3z1dhmnzjs6xbfirsbkzapkmn1hs8i5la2rqr"; depends=[Formula ordinal sandwich scoringRules]; }; credentials = derive2 { name="credentials"; version="1.1"; sha256="0izwskymymkxdwsdj7zapqpkc6g37c0m6c2na0y00s1kwr73d2qd"; depends=[askpass curl jsonlite openssl sys]; }; - creditmodel = derive2 { name="creditmodel"; version="1.1.0"; sha256="1xcd4ias6wb9k759h7cqzri83153dmgdx1brjlcrpa3gr2gqhjv4"; depends=[car data_table doParallel dplyr foreach gbm ggcorrplot ggplot2 glmnet gridExtra pmml randomForest rpart sqldf stringr xgboost XML]; }; + creditmodel = derive2 { name="creditmodel"; version="1.1.1"; sha256="06nxbvwlg0j7z3x31jm767faqdfnppbzxzsn3razv35s69sq1k83"; depends=[car data_table doParallel dplyr foreach gbm ggcorrplot ggplot2 glmnet gridExtra pmml randomForest rpart sqldf stringr xgboost XML]; }; credsubs = derive2 { name="credsubs"; version="1.0.1"; sha256="0n3684fxknvvs57g2vjqykgdjfbpl6242nd23sm9nv2fn57q8k2c"; depends=[]; }; credule = derive2 { name="credule"; version="0.1.3"; sha256="1vciqkxkf93z067plipvhbks9k9sfqink5rhifzbnwc2c5gxp5mx"; depends=[]; }; cregg = derive2 { name="cregg"; version="0.3.0"; sha256="08dhn4i5i27zw3ayqp7lkw5z8dzckv8fhflpvz0mphax34pm3z72"; depends=[ggplot2 ggstance lmtest sandwich scales survey]; }; crfsuite = derive2 { name="crfsuite"; version="0.3"; sha256="10mify8y1f6iwfckfrhhhw6j01p1cd9bq5xwcyz121wkfhnny6rx"; depends=[data_table Rcpp]; }; - cricketr = derive2 { name="cricketr"; version="0.0.20"; sha256="19aih3246mzq7b2cz6gpkyy7y6k480qvnvz1h8f3smdj6c0qnmgj"; depends=[dplyr forecast ggplot2 lubridate plotrix scatterplot3d XML]; }; + cricketr = derive2 { name="cricketr"; version="0.0.22"; sha256="10dfzm297knwcqnznsprrwgrfa83hxqvr3px9mdgqj9q97c2bn3b"; depends=[dplyr forecast ggplot2 lubridate plotrix scatterplot3d XML]; }; crimCV = derive2 { name="crimCV"; version="0.9.6"; sha256="14ckk88i7jk8a7kl51d7qfdis44jng6zz9zd72cdp80a57dvrvzq"; depends=[]; }; crimedata = derive2 { name="crimedata"; version="0.2.0"; sha256="073zlk9b4saz72d33z73mc9qzfk49bxwjhph6zbw27nl38k74j7d"; depends=[digest dplyr httr magrittr purrr readr sf stringr tibble]; }; crimelinkage = derive2 { name="crimelinkage"; version="0.0.4"; sha256="1zzk50kyccvnp51vzp28c9yi23hsp25arrgdn88lwfwa0m43rlar"; depends=[geosphere igraph]; }; @@ -6141,6 +6228,7 @@ in with self; { crochet = derive2 { name="crochet"; version="2.2.0"; sha256="1cbv79nyycxk6f8ldcsnn2pvgxqlnrj0qs19nhafnq2clxy863k6"; depends=[]; }; cromwellDashboard = derive2 { name="cromwellDashboard"; version="0.5.1"; sha256="0d57c1wdd1ds9fr7p256la63qbv8mirljgrvl1k8fp5gcnkps5wb"; depends=[dplyr DT httr shiny shinydashboard stringr]; }; cronR = derive2 { name="cronR"; version="0.4.0"; sha256="0ydlwhlzb57vbr8ya6hdsw2mhsjkb01jspn0jw081anrxfy5m2jw"; depends=[digest]; }; + crone = derive2 { name="crone"; version="0.1.0"; sha256="02k9n6ajfgxkpkssac788dvr4fwjakggh9dim9dzmw2nvir23cc8"; depends=[]; }; crop = derive2 { name="crop"; version="0.0-2"; sha256="1yjpk7584wrz9hjqs21irjnrlnahjg8lajra9yfdp6r927iimg1l"; depends=[]; }; cropdatape = derive2 { name="cropdatape"; version="1.0.0"; sha256="19bn0apx4p8hnz388zg7sq59qv89vv8k5php317kcv7ai2k2gh34"; depends=[]; }; crossReg = derive2 { name="crossReg"; version="1.0"; sha256="1866jhfnksv9rk89vw7w4gaxi76bxfjvqxx7cfa8nlrcsmaqd7rf"; depends=[]; }; @@ -6153,7 +6241,6 @@ in with self; { crossword_r = derive2 { name="crossword.r"; version="0.3.6"; sha256="1s31613s4qxxspka9bhgq3rq8xraf48mwfv6phvz6v06gijh64lr"; depends=[dplyr jsonlite magrittr R6 r6extended stringr]; }; crov = derive2 { name="crov"; version="0.1.3"; sha256="0gvrki9ldm3yrnp6zx2awqg4p3pqjzv1088gn3nbg00j0i3s9m5h"; depends=[gtools VGAM]; }; crp_CSFP = derive2 { name="crp.CSFP"; version="2.0.2"; sha256="0gazmhf5bv994x441m2xm0w18h9lw3y68qzdf6gmyqimj4wjqjgf"; depends=[MASS]; }; - crplyr = derive2 { name="crplyr"; version="0.3.1"; sha256="0h6kdi9h16m5n344y59jk2cwrqczhs0gl2a1zg20bxy015jma6hn"; depends=[crunch dplyr ggplot2 lazyeval purrr rlang scales stringr tibble viridisLite]; }; crqa = derive2 { name="crqa"; version="1.0.9"; sha256="1k6jgkmgbjab78dynng1hlxdbnqrpwmiiw54rgyfhx6v3lcir75d"; depends=[fields Matrix plot3D pracma tseriesChaos]; }; crqanlp = derive2 { name="crqanlp"; version="0.3"; sha256="1ndd5k44w232x6k564r84lyahljgcnldfwgih3iiar3il94drbdg"; depends=[corpus crqa gutenbergr RCurl tm]; }; crrSC = derive2 { name="crrSC"; version="1.1"; sha256="171cw56q2yv1vb4qd0va75i2q89jcw1126q8pcbv0235g7p2a86z"; depends=[survival]; }; @@ -6163,9 +6250,10 @@ in with self; { crseEventStudy = derive2 { name="crseEventStudy"; version="1.1"; sha256="0xq8shwdiri8v35s016g1wfpgbpal4j8psazgwmi9h220rh5b6p5"; depends=[sandwich]; }; crskdiag = derive2 { name="crskdiag"; version="1.0.1"; sha256="0100wbyvchx6jwlrwc6rwhdjanips5c0f5zqzs2c0dgwygpqw30w"; depends=[cmprsk]; }; crsnls = derive2 { name="crsnls"; version="0.2"; sha256="0rv0xrdl9ix6bhaf554gma8zf923w47f8j1dkbs8g6xjqjr1c40a"; depends=[]; }; + crso = derive2 { name="crso"; version="0.1.1"; sha256="1r10vz8z5y52a5v5phw22fhqwv9p7g66xfsx0906bcx74dn3f2b3"; depends=[foreach]; }; crsra = derive2 { name="crsra"; version="0.2.3"; sha256="1rkqm88zmvp9gw442cby6qpvfw4pfw65wz0gyl2h37w87c3wwvrw"; depends=[digest dplyr knitr purrr rcorpora readr tibble tidytext]; }; crtests = derive2 { name="crtests"; version="0.2.1"; sha256="0z8idz37dgwvi1q2vryldii7fn9yxd32gds77ml76jfplxbkikpd"; depends=[caret plyr stringr]; }; - crul = derive2 { name="crul"; version="0.8.0"; sha256="0y8n1iy759ln7dvw6v7zz79apkz9yxdy75qx2cagzwayn04h0c25"; depends=[curl httpcode mime R6 urltools]; }; + crul = derive2 { name="crul"; version="0.8.4"; sha256="12scs09qk9d7jrgs4fn98v4bvjdmphd5nqamb5d2wh387fnm1nfv"; depends=[curl httpcode jsonlite mime R6 urltools]; }; crunch = derive2 { name="crunch"; version="1.26.1"; sha256="01ajcvn31nb8cdmqmalmxvp1pvh7nmd9fyg2fc1zm7yy3a2klp9l"; depends=[crayon curl httpcache httr jsonlite]; }; crunchy = derive2 { name="crunchy"; version="0.3.1"; sha256="1qvwzym2hj61zjlm7j34j8jl5kfpkpx35xfjjyl5y35a5y50sz8g"; depends=[crunch httpcache miniUI rstudioapi shiny]; }; cruts = derive2 { name="cruts"; version="0.5"; sha256="08mklbmwgaq6cf3hd40mingplwjss5im30l5j6nmy7lijp15nq7k"; depends=[lubridate ncdf4 raster sp stringr]; }; @@ -6192,9 +6280,9 @@ in with self; { ctmm = derive2 { name="ctmm"; version="0.5.6"; sha256="04jpmjlpnh8zmk6l14sll945s5bjgkcwnj11yq5297nbggl4wmsx"; depends=[data_table expm fasttime Gmedian gsl manipulate MASS numDeriv pbivnorm pracma raster rgdal shape]; }; ctqr = derive2 { name="ctqr"; version="1.0"; sha256="1q4icv8qicgwr664cbrmkh2x9xmlrc80yvz8gnaqh86248kn4yp3"; depends=[pch survival]; }; ctrdata = derive2 { name="ctrdata"; version="0.18.2"; sha256="1nnqfg7x6wq5lzb4xxb52fb8ljxgnbwswfywv1d4ibcn7m5y0947"; depends=[clipr curl httr jsonlite mongolite rvest xml2]; }; - ctrlGene = derive2 { name="ctrlGene"; version="1.0.0"; sha256="0gz2js2n990sfwxwigp4dxqcf94f9bzcinyzjign5yvyr53fakvk"; depends=[psych]; }; + ctrlGene = derive2 { name="ctrlGene"; version="1.0.1"; sha256="0x7j11v7jj4k1jml6lrnjq79awhrvsm3pig1yxsd337jlfml3ra9"; depends=[psych]; }; cts = derive2 { name="cts"; version="1.0-22"; sha256="0kcbppfsx1hvnsz6nmj8frrqrglcr6cmasd1ma34qkqb9f6q0xry"; depends=[]; }; - ctsem = derive2 { name="ctsem"; version="2.9.6"; sha256="01vabpy96a9124nwxrb8l9hhddimj9cqb2fv017kzcvxxqzxa22w"; depends=[BH data_table GGally ggplot2 KernSmooth MASS Matrix mvtnorm OpenMx pkgbuild plyr Rcpp RcppEigen rstan rstantools shiny StanHeaders ucminf]; }; + ctsem = derive2 { name="ctsem"; version="3.0.0"; sha256="1w8rw7wsgv6vdc1mvpan4yz0rx4nnrizv7n4371pkrnx1j7vj23j"; depends=[BH cOde data_table Deriv ggplot2 MASS Matrix mize mvtnorm OpenMx pkgbuild plyr Rcpp RcppEigen rstan rstantools StanHeaders]; }; ctv = derive2 { name="ctv"; version="0.8-5"; sha256="0kl6z8dbbjgm29q0c5xy6lihjgf5cdihrllm27x0zbcvy8lyl51p"; depends=[]; }; cubature = derive2 { name="cubature"; version="2.0.3"; sha256="0wvs80i4axj7pdcy9gjl08qzjbcjkldha94xy4gdxc34vgmh7gvr"; depends=[Rcpp]; }; cubeview = derive2 { name="cubeview"; version="0.1.0"; sha256="1gy023qnkxmkfmcrihjlwd504z7n3c4a8baxa2wkz0l45pf4y2c1"; depends=[base64enc htmltools htmlwidgets lattice raster viridisLite]; }; @@ -6204,7 +6292,7 @@ in with self; { cumSeg = derive2 { name="cumSeg"; version="1.2"; sha256="0ix8g3w04n799pppyhyd365bdx9cwrgn7k7qljs1fdiq8s135wzk"; depends=[lars]; }; cumplyr = derive2 { name="cumplyr"; version="0.1-1"; sha256="07sz1wryl3kxbk67qyvnkrkdrp4virlsaia0y6rf9bqdw7rc6vi2"; depends=[]; }; cumstats = derive2 { name="cumstats"; version="1.0"; sha256="119w751z9dg6pjyk389pbl8ab8pirf9sqndi4nxi89ix2bby4xz8"; depends=[]; }; - curl = derive2 { name="curl"; version="3.3"; sha256="1gd5i25anzi28lg1f8p7g63z9d46xi0qaw4lxpml5p0f52lvkc0c"; depends=[]; }; + curl = derive2 { name="curl"; version="4.0"; sha256="0wb1j87fa2nd4a9x1w2nmc453nzvx6qiq8dviwc4jr36hsf9ra89"; depends=[]; }; currentSurvival = derive2 { name="currentSurvival"; version="1.0"; sha256="0bqpfwf4v4pb024a98qwg81m6zd7ljg1ps42ifhxpqx7b9gdyi6c"; depends=[cmprsk survival]; }; curry = derive2 { name="curry"; version="0.1.1"; sha256="1ps9hvbnb02m0b8hlw4admwbziyjvswj08ldi2dk3ymnrpawcc29"; depends=[]; }; curstatCI = derive2 { name="curstatCI"; version="0.1.1"; sha256="0igqdv0fzzji10gz3j3ir8qxpy7vdjfl137067rc28qzbrl2sy2c"; depends=[Rcpp]; }; @@ -6220,11 +6308,13 @@ in with self; { cutpointr = derive2 { name="cutpointr"; version="0.7.6"; sha256="0mwpl807h8mdzlw710jngwimwgq4hns79mv2pd5lh36pd9s5qx6b"; depends=[dplyr foreach ggplot2 gridExtra purrr Rcpp rlang tibble tidyr]; }; 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]; }; + cvGEE = derive2 { name="cvGEE"; version="0.3-0"; sha256="085qjm520l2441nakfxy851s6bfy5832b5fy54z5fp4xr1jn6snm"; depends=[]; }; cvTools = derive2 { name="cvTools"; version="0.3.2"; sha256="0b7xb6dmhqbvz32zyfbdvm9zjyc59snic6wp1r21ina48hchn3sj"; depends=[lattice robustbase]; }; cvar = derive2 { name="cvar"; version="0.4-0"; sha256="1rfsmw2a639pkj8l5g2xm6z48jrxsywbysk7c0czpdvrh4h9h84f"; depends=[fGarch gbutils Rdpack]; }; cvcrand = derive2 { name="cvcrand"; version="0.0.4"; sha256="1150vn753m95gpc1clyf4xzzgwmnzdh83prw8a3ikps0l6grvrps"; depends=[tableone]; }; cvequality = derive2 { name="cvequality"; version="0.2.0"; sha256="1im839vzfqylphp2vr20avnzkyl02n88fngbs63d4ik7c72d9992"; depends=[]; }; cvmgof = derive2 { name="cvmgof"; version="1.0.0"; sha256="0rnd7icqjprhbpmn383ah4fi5nz0hmg88fa612fmivkvnpn79v6j"; depends=[lattice]; }; + cvms = derive2 { name="cvms"; version="0.1.1"; sha256="11kszmhibds0axy0ha78bc6y1bwj19k93zirfp7a00c5hwvd3jnf"; depends=[AICcmodavg broom caret data_table dplyr ggplot2 lme4 mltools MuMIn plyr pROC purrr rlang stringr tibble tidyr]; }; cvq2 = derive2 { name="cvq2"; version="1.2.0"; sha256="19k95xg2y3wd4mx3wvbrc1invybd446g13vsp3dv05nw2kx4f6w8"; depends=[]; }; cvxbiclustr = derive2 { name="cvxbiclustr"; version="0.0.1"; sha256="00k75zy8v6qd5fg0h258i5z8ljjkfgkxz45cspysl1ap89d5n7df"; depends=[igraph Matrix]; }; cvxclustr = derive2 { name="cvxclustr"; version="1.1.1"; sha256="0idmx4wgz4d0b1xzmlq5bsk2f2q38lpf9c117hg97xsfndzn7vqj"; depends=[igraph Matrix]; }; @@ -6247,17 +6337,17 @@ in with self; { d3Tree = derive2 { name="d3Tree"; version="0.2.0"; sha256="0xjr36hdd00dy8s8z1a1s44dn2wg0nm6yqc1rri2l0dqrbh4nrbn"; depends=[dplyr htmlwidgets magrittr plyr stringr]; }; d3heatmap = derive2 { name="d3heatmap"; version="0.6.1.2"; sha256="1ici8j0wzzklhmw94qlxm292qs562vc32wq8mnjsas2n1p35vkmk"; depends=[base64enc dendextend htmlwidgets png scales]; }; d3plus = derive2 { name="d3plus"; version="0.1.0"; sha256="0kadz83pals03n0v3zqhmhf6visigk52yn58xckhb57fid4xzj5w"; depends=[htmlwidgets magrittr]; }; - d3r = derive2 { name="d3r"; version="0.8.5"; sha256="061226iwmir3d1crh449mrbrrqfccknyflqhnbmzn9by5pmq1qf7"; depends=[dplyr htmltools tidyr]; }; + d3r = derive2 { name="d3r"; version="0.8.6"; sha256="0vcmiyhd000xyl28k6rm7ba50x5sz5b2cpllxnq36q13qhdnqw6k"; depends=[dplyr htmltools tidyr]; }; dChipIO = derive2 { name="dChipIO"; version="0.1.5"; sha256="1xrafw5h071d8rfqaic3gifc80jpiddjz5x6l2cr8kgjvph60gqh"; depends=[]; }; dCovTS = derive2 { name="dCovTS"; version="1.1"; sha256="1pd50nfmfcqpi8zj20ngl0hc23qa4rabqhc1xci3ivyhs0valhsl"; depends=[doParallel energy foreach]; }; dGAselID = derive2 { name="dGAselID"; version="1.2"; sha256="0da7fi872i3ycb3j5v4isr4x2z39a68w4mdq859zslmqhiqd43b6"; depends=[ALL Biobase genefilter MLInterfaces]; }; dHSIC = derive2 { name="dHSIC"; version="2.1"; sha256="1c1xz1f1fp937w4rlylvqv3ii0p9dafvmn4fqq8rzxhcg5rn9j4l"; depends=[Rcpp]; }; - dLagM = derive2 { name="dLagM"; version="1.0.12"; sha256="1x0r0r7sspk4wjz0lag93030r4caxna9i85cbfbnc4dj2vjvc801"; depends=[AER dynlm formula_tools lmtest nardl plyr strucchange wavethresh]; }; + dLagM = derive2 { name="dLagM"; version="1.0.15"; sha256="188hm82f6g0n3asj560kbxlqbhikvnn4a375ph1kd13zdijjyj3i"; depends=[AER dynlm formula_tools lmtest nardl plyr strucchange wavethresh]; }; dMod = derive2 { name="dMod"; version="1.0.0"; sha256="1mj2a9hpfldxbsiggi27nz3w0klp7qwpplpwh4bi9ik25vll25a0"; depends=[cOde deSolve doParallel dplyr foreach ggplot2 plyr rootSolve stringr]; }; dSVA = derive2 { name="dSVA"; version="1.0"; sha256="0vy0flyg82x0n9vw6jf9f76qy84sp0wnis91faj37ac5hdv3pvsb"; depends=[sva]; }; daarem = derive2 { name="daarem"; version="0.3"; sha256="006sm1npxi812x3yd8cnd1hrz85j44wn5vz3kid8hw5yxm10l6nn"; depends=[]; }; - dabestr = derive2 { name="dabestr"; version="0.2.1"; sha256="1j4n4976dw9vv76c1d5ih52a9ln5wbni71fbk4gpnacpkzj15m2m"; depends=[boot cowplot dplyr forcats ggbeeswarm ggforce ggplot2 magrittr rlang simpleboot stringr tibble tidyr]; }; - dad = derive2 { name="dad"; version="3.2.0"; sha256="1qg60jwfl8c2ak2989zcm7ab7hcbs78hxzpm4yavn37av2ajbymp"; depends=[e1071 lattice]; }; + dabestr = derive2 { name="dabestr"; version="0.2.2"; sha256="10vzp28bx4vf9jc3l9jjw94wir75j8h60lcncafbdwvxjh5alpfs"; depends=[boot cowplot dplyr ellipsis forcats ggbeeswarm ggforce ggplot2 magrittr rlang simpleboot stringr tibble tidyr]; }; + dad = derive2 { name="dad"; version="3.3.0"; sha256="1154jk4j1h5wr3c68pj0slh90jxccia28wpmygn9mz0mlvx9km9l"; depends=[DescTools e1071 lattice]; }; dae = derive2 { name="dae"; version="3.0-32"; sha256="0syv6kjnicb0x7sxbaavxhiv9mcqvc2zzbf4wyar933q3hzrxnrd"; depends=[ggplot2 plyr]; }; daewr = derive2 { name="daewr"; version="1.1-7"; sha256="01n9g3adjk66wx9lm9gl6wa3y9ba5w0w0p5ayj8rx5ywxnm8fnvi"; depends=[BsMD FrF2 lattice]; }; daff = derive2 { name="daff"; version="0.3.5"; sha256="00zcdf215m7p3xm9yv571v09znhdqacxg69hb5b5j749mp4wdsyj"; depends=[jsonlite V8]; }; @@ -6266,7 +6356,7 @@ in with self; { dagitty = derive2 { name="dagitty"; version="0.2-2"; sha256="11jpjr2l89glr9962mbhy4dfbdjs80nf603w90xx16s4qcmcsghc"; depends=[boot jsonlite MASS V8]; }; dalmatian = derive2 { name="dalmatian"; version="0.3.0"; sha256="06j7ampp0hwjqgw2agplfc8mngxnb6g4yv3l08plg35769jxxz7f"; depends=[coda dglm gdata ggmcmc rjags]; }; dam = derive2 { name="dam"; version="0.0.1"; sha256="1b0fi3l8jxgpr9fwvi03giq7wm39msbh0c82ffgkh54a3bbf5blc"; depends=[]; }; - damr = derive2 { name="damr"; version="0.3.3"; sha256="1r3d937m28zz2afkflp3601wvqhqka6g2qqcp018a912whlsp3sf"; depends=[behavr data_table readr]; }; + damr = derive2 { name="damr"; version="0.3.4"; sha256="19rffdrgx9c03f66qgj1gwp5vra89n3jrrb54i9xl2rxsf28ry3h"; depends=[behavr data_table readr]; }; dams = derive2 { name="dams"; version="0.2"; sha256="0hf5s8i61r5q4h3s8dfmdl3vkj7v15ha59pjvpjqx3yihsgziqz9"; depends=[RCurl]; }; dang = derive2 { name="dang"; version="0.0.10"; sha256="1q4378wvn0fmvm3gqb0si9x5sq0dh6mkxzhxbh570npjhb15p272"; depends=[]; }; dani = derive2 { name="dani"; version="0.1-0"; sha256="05npr3i49wn01rbcsr1pfbb0d5l8c0pz48q961v28s6kdxp0vwr3"; depends=[Epi]; }; @@ -6280,9 +6370,9 @@ in with self; { data_tree = derive2 { name="data.tree"; version="0.7.8"; sha256="05svd1h70dn92imadw2djqqvchx30md74d4z6a00grkajj16cchb"; depends=[DiagrammeR R6 stringr]; }; data_world = derive2 { name="data.world"; version="1.2.2"; sha256="1d9hh4965f2d0lwh2xxhnxzc948ailkjzdax3d3z9l8lakqfrx0h"; depends=[dwapi httr ini miniUI shiny stringi]; }; dataCompareR = derive2 { name="dataCompareR"; version="0.1.2"; sha256="0n10dqnrlpwafxys68b3ly156235lhqby71qay0vb0r6bvl2g349"; depends=[dplyr knitr markdown stringi]; }; - dataMaid = derive2 { name="dataMaid"; version="1.3.0"; sha256="169ih8y09ws1xs77fi0w6b5gb7q94d8iag216dd8v7kd968401dx"; depends=[DT ggplot2 gridExtra haven htmltools magrittr pander robustbase stringi whoami]; }; + dataMaid = derive2 { name="dataMaid"; version="1.3.2"; sha256="10c5b1xp1mca5h0vdqikfn549jf981xk7c2rcpq71rf0fng93qz6"; depends=[ggplot2 gridExtra haven htmltools magrittr pander robustbase stringi whoami]; }; dataMeta = derive2 { name="dataMeta"; version="0.1.1"; sha256="13xxayqxbps07h0xr5b7sb7q30gy5zm7jzzaq4k20fskkjrzhzcm"; depends=[dplyr]; }; - dataPreparation = derive2 { name="dataPreparation"; version="0.4.0"; sha256="1zr6qx934vw6rxmx2bi6d9i1ykaxdc5x568djnhvjc7vz7dfcb6r"; depends=[data_table lubridate Matrix progress stringr]; }; + dataPreparation = derive2 { name="dataPreparation"; version="0.4.1"; sha256="0jxfvsx7wvsnhvlxb65a041pd3va7slryrblpbpj5xbnbdpyi4i7"; depends=[data_table lubridate Matrix progress stringr]; }; dataQualityR = derive2 { name="dataQualityR"; version="1.0"; sha256="0f2410sd6kldv7zkqsmbz1js0p5iq7zwlnfwmmnlbrd303p35p3j"; depends=[]; }; dataRetrieval = derive2 { name="dataRetrieval"; version="2.7.5"; sha256="0aagj04x5792rp73h5lwvrx63nh739jn3cmhhrzchm9symq8x8mx"; depends=[curl httr jsonlite lubridate readr xml2]; }; datacheck = derive2 { name="datacheck"; version="1.2.2"; sha256="1i3n5g1b6ix8gpn4c74s7ll1dbrllrzgpb1f3hk449d6p4kmisq6"; depends=[Hmisc shiny stringr]; }; @@ -6301,7 +6391,7 @@ in with self; { datapackage_r = derive2 { name="datapackage.r"; version="0.1.1"; sha256="1f5mm3cb2yz3dzxj26pp7w1rb8jccyj7zjl602d3mcfxc9d99643"; depends=[config future httr iterators jsonlite jsonvalidate purrr R_utils R6 readr rlist stringr tableschema_r urltools V8]; }; datapasta = derive2 { name="datapasta"; version="3.0.0"; sha256="022ci7iy683lh3fh13a4b3szzqp6j4fchil695bifhi0a34bnxyr"; depends=[clipr readr rstudioapi]; }; datarium = derive2 { name="datarium"; version="0.1.0"; sha256="1v98yxsxhfqlalz5qy3x5axb7fy067vf3y0qg7ngixphmy9qybym"; depends=[]; }; - datarobot = derive2 { name="datarobot"; version="2.13.0"; sha256="0q3nj0sffphi8zhlxpsjx08b377cgnq7xgkrmcjq6zbjdf2j0m77"; depends=[curl httr jsonlite yaml]; }; + datarobot = derive2 { name="datarobot"; version="2.14.1"; sha256="1k5rrwhbxa7x8j6mr35f7245ljxnvs219f2zhi5di4iljzy4phvy"; depends=[curl httr jsonlite yaml]; }; datasauRus = derive2 { name="datasauRus"; version="0.1.4"; sha256="1w1yhwwrmh95bklacz44wjwynxd8cj3z8b9zvsnzmk18m5a4k0fl"; depends=[]; }; dataseries = derive2 { name="dataseries"; version="0.2.0"; sha256="11wc2p5m8qbdmkpbd21lpwl28a1dpab88c3gqyrhsn0298lpnip4"; depends=[]; }; datasets_load = derive2 { name="datasets.load"; version="0.3.0"; sha256="13ywnqln831i5hlf1cpqcyc77blg99w8jvy8jic17z86fjxh4gim"; depends=[DT miniUI shiny]; }; @@ -6317,20 +6407,20 @@ in with self; { datoramar = derive2 { name="datoramar"; version="0.1.0"; sha256="0zq6vhq6dmsyagmqrmb85z6fy9qhwra3s3iasr3jgc4ryr009pml"; depends=[httr jsonlite tibble]; }; datos = derive2 { name="datos"; version="0.1.0"; sha256="01pfvdz9vy4dqjb90j8bz39nvnk5ql6yags1nip4049999w1lswk"; depends=[tibble yaml]; }; datr = derive2 { name="datr"; version="0.1.0"; sha256="0sqwhn6zdaq8i45ry207mpbda1djjaxp9mcn13hi5wkry6z0bmlr"; depends=[devtools]; }; + datrProfile = derive2 { name="datrProfile"; version="0.1.0"; sha256="1bhyk3xjgwf92i765z3bkdnzkxg8fshriz9r6m371q1c75xysfil"; depends=[dplyr odbc RSQLite]; }; dave = derive2 { name="dave"; version="2.0"; sha256="1rraphpp34czyjj15xzvj1ihlnqzcppqls9n2g85n49zv0n1ngn8"; depends=[cluster labdsv nnet tree vegan]; }; dawai = derive2 { name="dawai"; version="1.2.3"; sha256="18dg81d1018f8ibm4p43ih6fjgm6r0qs5phqbp7pqrixjj3ydk58"; depends=[boot ibdreg mvtnorm]; }; daymetr = derive2 { name="daymetr"; version="1.4"; sha256="1xrkdjarkkikjbsxcjvhfba1dzrxh2nq7c04rvl0rkxh513sfqn1"; depends=[httr raster sp tibble tidyr]; }; dbConnect = derive2 { name="dbConnect"; version="1.0"; sha256="1vab5l4cah5vgq6a1b9ywx7abwlsk0kjx8vb3ha03hylcx546w42"; depends=[gWidgets RMySQL]; }; dbEmpLikeGOF = derive2 { name="dbEmpLikeGOF"; version="1.2.4"; sha256="0vhpcxy702cp3lvlif2fzmvccys8iy7bv1fbg6ki2l8bvn2f7c5p"; depends=[]; }; dbEmpLikeNorm = derive2 { name="dbEmpLikeNorm"; version="1.0.0"; sha256="0h5r2mqgallxf9hin64771qqn9ilgk1kpsjsdj2dqfl3m8zg967l"; depends=[dbEmpLikeGOF]; }; - dbarts = derive2 { name="dbarts"; version="0.9-12"; sha256="0jc2gp42hyd0bqkvcdps7kh78wkyxx2g5i989ns6riw8n2pn1xxf"; depends=[]; }; dbfaker = derive2 { name="dbfaker"; version="0.1.0"; sha256="00n2z4q5drpg26pw826i16rg07m7w66a0r466q2lrl14hxs4rcaq"; depends=[assertive DBI dplyr foreach parsedate RPostgreSQL tidyr]; }; dbhydroR = derive2 { name="dbhydroR"; version="0.2-7"; sha256="1yp3n8hw2dc1ar3nz5k5zvj7s8f1bjckxrd0jnbxv73il75gx4k0"; depends=[httr reshape2 XML]; }; dblcens = derive2 { name="dblcens"; version="1.1.7"; sha256="02639vyaqg7jpxih8cljc8snijb78bb084f4j3ns6byd09xbdwcw"; depends=[]; }; dblr = derive2 { name="dblr"; version="0.1.0"; sha256="0wzmhmp706mw0pkh81nsb7qzclwyhm6f2mjvpvz043ng5xrxwvvw"; depends=[CatEncoders data_table Metrics xgboost]; }; dbmss = derive2 { name="dbmss"; version="2.7-0"; sha256="0fhvbn5v4b5n447hwljdzwfb68bpmrskwd7ni1vpqwcbix903rm4"; depends=[cubature ggplot2 Rcpp RcppParallel reshape2 spatstat spatstat_utils]; }; - dbparser = derive2 { name="dbparser"; version="1.0.1"; sha256="1g79qayw24bwdccwbsskp8grsb5zj8gi9svwa6c03m86c5j1v19q"; depends=[DBI dplyr ggplot2 odbc purrr tibble tidyr XML]; }; - dbplot = derive2 { name="dbplot"; version="0.3.1"; sha256="1mx87cr08xliqz09qmrx8pcxxj2jm9aml5wp9p41ns210wc9mjdy"; depends=[dplyr ggplot2 purrr rlang]; }; + dbparser = derive2 { name="dbparser"; version="1.0.3"; sha256="1yv4nbaigc9x0p8s68i4nkmvrp23qpd2awraks4d3pnmwc2jy94b"; depends=[DBI odbc purrr tibble tidyr XML]; }; + dbplot = derive2 { name="dbplot"; version="0.3.2"; sha256="0xw1zjvf1fa092kyryq2pk7dd4y60ka8yczaxk0f231mmsm1741p"; depends=[dplyr ggplot2 purrr rlang]; }; dbplyr = derive2 { name="dbplyr"; version="1.4.2"; sha256="1q2dflr88s5a1amzfld3087q422vf70052qn84zyd8895kdg10xp"; depends=[assertthat DBI dplyr glue purrr R6 rlang tibble tidyselect]; }; dbscan = derive2 { name="dbscan"; version="1.1-3"; sha256="1q0vlrp0abzci2zsjgh7jp3sk1wflcvwjmy9fp0gsay8sgdcixgk"; depends=[Rcpp]; }; dbstats = derive2 { name="dbstats"; version="1.0.5"; sha256="0pr80mx8y87l96hhg0rp3ajxl7yx2f8qr0y1zrjkbzxavjmp9k34"; depends=[cluster pls]; }; @@ -6347,15 +6437,16 @@ in with self; { ddalpha = derive2 { name="ddalpha"; version="1.3.9"; sha256="1vzs0cvl6xw3h9i00rg3hs02xwgxcnh8326y10kxmhs3qq4m7nb2"; depends=[BH class geometry MASS Rcpp robustbase sfsmisc]; }; dde = derive2 { name="dde"; version="1.0.0"; sha256="0fsj7n66j0dhp65c6f9k0dsrkklj1hy4w376j150f91jc7m3wliv"; depends=[ring]; }; ddiv = derive2 { name="ddiv"; version="0.1.0"; sha256="1r2sxlkw1vxf2svdi1nary3hb7c5k1b4j820mj268r9swmy632ch"; depends=[MASS segmented]; }; + ddpca = derive2 { name="ddpca"; version="1.0"; sha256="02dfpx696canbdyiz6fn9qk5qrn53ghv2asa6737l59xs92rzdm2"; depends=[MASS Matrix quantreg RSpectra]; }; ddpcr = derive2 { name="ddpcr"; version="1.11"; sha256="0slfgxp223mnn0f9k72p58m2frnp4c1dvdwsv5fwxw0h022wcrwr"; depends=[dplyr DT ggplot2 lazyeval magrittr mixtools plyr readr shiny shinyjs]; }; ddsPLS = derive2 { name="ddsPLS"; version="1.0.61"; sha256="18q2mzpn0h93bxx1igms379nfs1d28jdngd8y5gcsjyway5yi392"; depends=[doParallel foreach MASS RColorBrewer Rdpack]; }; ddst = derive2 { name="ddst"; version="1.4"; sha256="1y0immm337adkd2bjx8c5pf02w9wysv3gj26f4qf0jiba0f2wk8n"; depends=[evd orthopolynom]; }; deBInfer = derive2 { name="deBInfer"; version="0.4.2"; sha256="108vijk71sgsj14hwfv78r4lnn68cybvnpr92zvrvl0d82b7qxfd"; depends=[coda deSolve MASS mvtnorm PBSddesolve plyr RColorBrewer truncdist]; }; deGradInfer = derive2 { name="deGradInfer"; version="1.0.0"; sha256="1wl1pw1rwins4gr47a8ii4diw6wd6cx8ib4l5bhri5f3crbw7l86"; depends=[deSolve gdata gptk]; }; - deSolve = derive2 { name="deSolve"; version="1.23"; sha256="0wv11az0gx0r8n0pyxrvh8i5gz795dfdai73ggmskks5h2bvn6cg"; depends=[]; }; + deSolve = derive2 { name="deSolve"; version="1.24"; sha256="0hkvspq0fp8j64l9zayab2l2nazazhwfgfym0jllh0xv5a12r99s"; depends=[]; }; deTS = derive2 { name="deTS"; version="1.0"; sha256="08yq7vfcd8fv8qw2w0f1rnj3rzys9kslmkqspmiz6prmzqvj1zf1"; depends=[pheatmap RColorBrewer]; }; deTestSet = derive2 { name="deTestSet"; version="1.1.5"; sha256="07wbgniwkpp0yry6wvchvszr8isxs1i9k6km951r5c009w1iviwk"; depends=[deSolve]; }; - deaR = derive2 { name="deaR"; version="1.0"; sha256="0wmkqcv4cwlfrwzr4j4g8myhq0lj0p742p2w6h5w6y0bjxzkf9aj"; depends=[dplyr ggplot2 gridExtra igraph lpSolve plotly tidyr writexl]; }; + deaR = derive2 { name="deaR"; version="1.1.0"; sha256="0q36cfjb1vypn2d581rpfilzspvxmfb97phcnvp2w6l98kx8gcvj"; depends=[dplyr ggplot2 gridExtra igraph lpSolve plotly tidyr writexl]; }; deadband = derive2 { name="deadband"; version="0.1.0"; sha256="02pq3d0l0wy8bdlyfir3zf46j1ascx4qajyq5cf28yl62q6ngq5d"; depends=[TTR]; }; deal = derive2 { name="deal"; version="1.2-39"; sha256="0sw0v1mm004ky1gjw3dmvf2vb7nf2j9s9386bhqxijw63j7xnjd3"; depends=[]; }; deamer = derive2 { name="deamer"; version="1.0"; sha256="1xbxr78n6s1yhf192ab4syi1naqlwl9z4cxzchrkw80q7bxqfiz8"; depends=[]; }; @@ -6385,7 +6476,7 @@ in with self; { deformula = derive2 { name="deformula"; version="0.1.1"; sha256="0h85yzl8kvjwrn1mkzyblvknf7gg8kx8y85qnvkwfbr9ik42ngn1"; depends=[]; }; degreenet = derive2 { name="degreenet"; version="1.3-3"; sha256="07mkj2sdp09624mmb1x3djjypnrzn43qn2j4m93blli51j6zchm3"; depends=[igraph network]; }; deisotoper = derive2 { name="deisotoper"; version="0.0.7"; sha256="0lpmx3qy44xjlil4nsbvcbczxq22vr8xn6v9a5bdx7cd31qwm2l3"; depends=[rJava]; }; - deldir = derive2 { name="deldir"; version="0.1-21"; sha256="03392pl6j8rm3n32xrfkyfx866k1vm5sj87pva70yyiwh70vrnmr"; depends=[]; }; + deldir = derive2 { name="deldir"; version="0.1-23"; sha256="0790dwxb2mz1ffz8gd5vwdr0if2q76dzy3vab5rsykf9kz72n4g0"; depends=[]; }; delt = derive2 { name="delt"; version="0.8.2"; sha256="06g03wy9r2qvly0lnv5fv4k366mhlk56qkvak0xaxy99p1i34kmv"; depends=[denpro]; }; deltaPlotR = derive2 { name="deltaPlotR"; version="1.6"; sha256="15vjg3viyfrxvvh34p8i7j8p0vpg5628g8198adhi0i2ri3ygz9a"; depends=[MASS]; }; deltar = derive2 { name="deltar"; version="1.0.0"; sha256="1ki89ysz4qlq5z094ybg3aqfcb6g633ccvpj1cg6nri9z5qjwpm1"; depends=[Bchron]; }; @@ -6397,7 +6488,7 @@ in with self; { demography = derive2 { name="demography"; version="1.22"; sha256="1m15capbfknr4rqxmfgj1vb7rmgambk6r9ic37149525sg7wn3j6"; depends=[cobs forecast ftsa mgcv rainbow RCurl strucchange]; }; demu = derive2 { name="demu"; version="0.2.0"; sha256="0prfl2i3q2n5f4qpvkksyi8qvwj2fd9v82cr6val7abvcvbn9276"; depends=[ClusterR fields Matrix Rcpp RcppArmadillo spam]; }; dendextend = derive2 { name="dendextend"; version="1.12.0"; sha256="0mgsc9qkr5p6hss3wychdjvk263ay48yx543wawj72l7q7cgx1xl"; depends=[ggplot2 magrittr viridis]; }; - dendroTools = derive2 { name="dendroTools"; version="1.0.5"; sha256="060zrhwgsqd2z0jvdrprjhv7pp6jp3gjmfhbmvfsmmdsbn1rspbi"; depends=[brnn Cubist dplyr ggplot2 gridExtra knitr lubridate magrittr MLmetrics oce plotly psych randomForest reshape2 scales]; }; + dendroTools = derive2 { name="dendroTools"; version="1.0.6"; sha256="0y323sa1ccp6sr95rs9chm4mwxxja9dhjvg67lac2lf41a6yg5yb"; depends=[boot brnn Cubist dplyr ggplot2 gridExtra knitr lubridate magrittr MLmetrics oce plotly psych randomForest reshape2 scales]; }; dendroextras = derive2 { name="dendroextras"; version="0.2.3"; sha256="0hb7crbgsnbcwvbk05iz5ik45n7zgysmwjj6xc46131yd8l0i1qx"; 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=[]; }; @@ -6409,9 +6500,10 @@ in with self; { densityClust = derive2 { name="densityClust"; version="0.3"; sha256="1zry0vafajzmr37aylglxfvwplhdygbkb9cvzvh8cy0xgnjrnx13"; depends=[FNN ggplot2 ggrepel gridExtra RColorBrewer Rcpp Rtsne]; }; densratio = derive2 { name="densratio"; version="0.2.1"; sha256="0x333kfx5mdzzjsqy37j4bmv9iddlgp3wi4774lx8d159lbr6irp"; depends=[]; }; denstrip = derive2 { name="denstrip"; version="1.5.4"; sha256="0hzxphj740q6pfa1q42knr7n12bmnawg7b2fs74msxn83dka5cmq"; depends=[lattice]; }; + denvax = derive2 { name="denvax"; version="0.1.0"; sha256="0r8w5b80abrbf0qyvlhl0byv3d8lic9jydlisk5yyccfv8wrh1xf"; depends=[]; }; depend_truncation = derive2 { name="depend.truncation"; version="3.0"; sha256="1jym52qxx8v4kbq2578d03q2593q96jccr85if47djikw0aaxmcr"; depends=[mvtnorm]; }; depmix = derive2 { name="depmix"; version="0.9.15"; sha256="1dnps6s5bfa834akjgx4zbg49danpy54mhiz1kjb4nmrnlb0zq7q"; depends=[MASS]; }; - depmixS4 = derive2 { name="depmixS4"; version="1.3-5"; sha256="155bxfyhkmwz3asx1q8myvn3qjb3i2aq7pnw0r7kxygxzn071hkq"; depends=[MASS nnet Rsolnp]; }; + depmixS4 = derive2 { name="depmixS4"; version="1.4-0"; sha256="0v8hvkg7ia7c6a0x7rw5fddm06vv1n0kwjk7g0kj3g18chvpnvw2"; depends=[MASS nlme nnet Rsolnp]; }; depth = derive2 { name="depth"; version="2.1-1"; sha256="17fxv4a5fbb65p7kmb4iakik5ng6401y7gmknkfr66fmjq65i1sm"; 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=[]; }; @@ -6420,6 +6512,7 @@ in with self; { desc = derive2 { name="desc"; version="1.2.0"; sha256="1s6s13fk6sxwcj8wzkwxl9vr33153xx11p5wi9avqx3rzkabavz6"; depends=[assertthat crayon R6 rprojroot]; }; descomponer = derive2 { name="descomponer"; version="1.5"; sha256="1dxnvignd3hwagkghvdiqfrkxlhyvxndprcyh8n9pmq8zgask5qk"; depends=[]; }; descr = derive2 { name="descr"; version="1.1.4"; sha256="05maviw8l8qhmy7p80gs3dlyy6pqk5k1686ny4xla4psj8mr7lbk"; depends=[xtable]; }; + describedata = derive2 { name="describedata"; version="0.1.0"; sha256="10ryy886jr2gwi6h90girl82ivwrmhz1vcwi4f6khmmpwsy95hav"; depends=[broom dplyr forcats ggplot2 haven lmtest purrr rlang stringr tibble tidyr]; }; describer = derive2 { name="describer"; version="0.2.0"; sha256="1pjyihmn4gkaamixsc3qwynsc02pwv9bgn6s7z7acmmsybhhs6xn"; depends=[]; }; descriptr = derive2 { name="descriptr"; version="0.5.0"; sha256="0bbd3h07s4mfhryh6yyvgs4xs0nshxngyapz89jsc1drl3dn6plh"; depends=[cli dplyr forcats ggplot2 gridExtra magrittr purrr rlang scales tibble tidyr vistributions xplorerr]; }; descstatsr = derive2 { name="descstatsr"; version="0.1.0"; sha256="1pz5lww1dkkqvsq6h0vkch39bj76qffmmag3zlag5in75s4wj0wl"; depends=[moments zoo]; }; @@ -6435,15 +6528,15 @@ in with self; { detect = derive2 { name="detect"; version="0.4-2"; sha256="03xzv13y2l15afyp00lgvbh51vxg1jaakxjcbnsxzdgb11039x2g"; depends=[Formula Matrix pbapply]; }; detectRUNS = derive2 { name="detectRUNS"; version="0.9.5"; sha256="0w4pz7waaabgsb47xcmgiz8bzlrs2a83y3v6j7bqb5125y1wn8hw"; depends=[data_table ggplot2 gridExtra iterators itertools plyr Rcpp reshape2]; }; detector = derive2 { name="detector"; version="0.1.0"; sha256="010i063b94hzx7qac8gpl67gmk7hzgqm9i1c7pbbw4la3wcd9lz7"; depends=[stringr]; }; - detpack = derive2 { name="detpack"; version="1.1.2"; sha256="0vrzg4h80jkkghgm86jfqxshfb4pwqv66d7sndkxh3ji9gfd7d84"; depends=[]; }; + detpack = derive2 { name="detpack"; version="1.1.3"; sha256="1mk2k9akagz7knd4n5p8nxkmnm2mdv9izk4i5yl2v9nv5v39mc4h"; depends=[]; }; detrendeR = derive2 { name="detrendeR"; version="1.0.4"; sha256="1z10gf6mgqybb9ml6z3drq65n7g28h2pqpilc2h84l6y76sy909c"; depends=[dplR]; }; - detrendr = derive2 { name="detrendr"; version="0.6.3"; sha256="1ww6ipj314890q0ca0zmwyfq6qs073gwx5vq19n46zpbdd0g6xf1"; depends=[assertthat autothresholdr checkmate doParallel dplyr filesstrings foreach fs glue ijtiff iterators magrittr matrixStats plyr purrr Rcpp RcppParallel rlang sigmoid stringi stringr withr]; }; - detzrcr = derive2 { name="detzrcr"; version="0.2.5"; sha256="0pv8m9p3j2n1myn2y7mfcv4j59cj4d84gl42fwmyha7hmi0fs8m0"; depends=[ggplot2 MASS shiny]; }; + detrendr = derive2 { name="detrendr"; version="0.6.4"; sha256="0n7mrh05y5jg2y77xv25yadw01lr8ms5ki32i32k38zlc635c1sl"; depends=[assertthat autothresholdr checkmate doParallel dplyr filesstrings foreach fs glue ijtiff iterators magrittr matrixStats plyr purrr Rcpp RcppParallel rlang sigmoid stringi stringr withr]; }; + detzrcr = derive2 { name="detzrcr"; version="0.2.6"; sha256="0ip4fywrpq8gf4xy0h302l5hpbgg0f9xi3lrnbzqm3701bas3c7m"; depends=[ggplot2 MASS shiny]; }; devEMF = derive2 { name="devEMF"; version="3.6-3"; sha256="1zyap005md3ylg0d84fkjj3m024j8gmaz310dymgv9zw7hwfb7x7"; depends=[]; }; devFunc = derive2 { name="devFunc"; version="0.1"; sha256="0f2s5gssk9napmah7zcss1rnh7pzlq90gzwcnvyr9rrq6k118n8q"; depends=[plyr stringr]; }; devRate = derive2 { name="devRate"; version="0.1.10"; sha256="0c5hg98w83d02lvb7rbgx8c24li58vpxjy71if337p7cyzzd1lqg"; depends=[]; }; devoid = derive2 { name="devoid"; version="0.1.0"; sha256="1aq7yyfpid3r41c6v5v92im2iq9m3d7gnisc9rkc9zpjfpbpzpx8"; depends=[]; }; - devtools = derive2 { name="devtools"; version="2.0.2"; sha256="028pppj39ng7q17k27531s8k00lmw982vz5krn74n9b8f2azm8lr"; depends=[callr cli digest git2r httr jsonlite memoise pkgbuild pkgload rcmdcheck remotes rstudioapi sessioninfo usethis withr]; }; + devtools = derive2 { name="devtools"; version="2.1.0"; sha256="0393v7nr22gr5g9afgrhq4ab3lwbqy6fd3shnmlhdpqam5357xy1"; depends=[callr cli digest git2r httr jsonlite memoise pkgbuild pkgload rcmdcheck remotes roxygen2 rstudioapi sessioninfo testthat usethis withr]; }; dexter = derive2 { name="dexter"; version="0.8.5"; sha256="0q7b6ffmz5hfyr0m4b942rxn4xvmdmi84w92d6r8k6m85cgxdy1b"; depends=[colorspace DBI dbplyr dplyr DT fastmatch RColorBrewer rlang rprintf RSQLite shiny shinyBS shinydashboard tibble tidyr]; }; dexterMST = derive2 { name="dexterMST"; version="0.1.1"; sha256="0i9y5qngg85x6h9zm4rf8p7fydl3s72rmc2bh3qpb9vc8js99m35"; depends=[crayon DBI dbplyr dexter dplyr fastmatch igraph Rcpp rlang RSQLite tibble tidyr]; }; dextergui = derive2 { name="dextergui"; version="0.1.6"; sha256="1brkkq140z3dv0xflw0dinww2nja9c6iajqv0a0l0m13r1c5caja"; depends=[Cairo DBI dexter dplyr DT ggExtra ggplot2 ggridges htmltools htmlwidgets igraph jsonlite networkD3 RColorBrewer RCurl readODS readxl rlang shiny shinyBS shinyFiles shinyjs tibble tidyr writexl]; }; @@ -6480,7 +6573,7 @@ in with self; { dials = derive2 { name="dials"; version="0.0.2"; sha256="1ip8hdv293lcj0jiycinc66fib1q1vsnb3px26zsmlw49nb32q5h"; depends=[dplyr glue purrr rlang scales tibble withr]; }; diaplt = derive2 { name="diaplt"; version="1.3.0"; sha256="1kkqhkv3s8rrpqd05jidjdnqmlnb3s9f8rr34rfqj7k4nh0qzzcz"; depends=[]; }; dice = derive2 { name="dice"; version="1.2"; sha256="0gic7lqnsdmwv3dbzwwmcwdfyfqlq8kpr2pciqphd1j2ligzwl3s"; depends=[gtools]; }; - diceR = derive2 { name="diceR"; version="0.5.2"; sha256="10bpm5bbfgnm3qnqhrwra0c8bdym3xham7dhsrikwwr18wsi5rqw"; depends=[abind apcluster assertthat blockcluster caret class cli clue cluster clusterCrit clValid dbscan dplyr e1071 flux ggplot2 gplots Hmisc infotheo kernlab klaR kohonen magrittr mclust NMF progress purrr quantable RankAggreg RColorBrewer Rcpp Rtsne sigclust stringr tibble tidyr]; }; + diceR = derive2 { name="diceR"; version="0.6.0"; sha256="1jwgngvajnm80g079z4jks5f3y2hy7hz3h9cf7c6wlb8spmaffxr"; depends=[abind apcluster assertthat blockcluster caret class cli clue cluster clusterCrit clValid dbscan dplyr e1071 flux ggplot2 gplots Hmisc infotheo kernlab klaR kohonen magrittr mclust NMF poLCA progress purrr quantable RankAggreg RColorBrewer Rcpp Rtsne sigclust stringr tibble tidyr]; }; dichromat = derive2 { name="dichromat"; version="2.0-0"; sha256="1l8db1nk29ccqg3mkbafvfiw0775iq4gapysf88xq2zp6spiw59i"; depends=[]; }; dicionariosIBGE = derive2 { name="dicionariosIBGE"; version="1.6"; sha256="1rss1ydhcn6sma2lmlpq6s0h3dglwc20w499x1jzkcjnzc1rc7gl"; depends=[]; }; did = derive2 { name="did"; version="1.2.2"; sha256="0slc0rdajwri1zrlxaw251b2xlkc002f67bq5v68iirys3hlm37n"; depends=[BMisc ggplot2 gridExtra knitr MASS pbapply]; }; @@ -6499,7 +6592,7 @@ in with self; { diffdf = derive2 { name="diffdf"; version="1.0.3"; sha256="0nz0jwa02yc16cx51z5hp5zaw40gbcyqli3jpxgrnzw76f8jhkah"; depends=[tibble]; }; diffeR = derive2 { name="diffeR"; version="0.0-6"; sha256="0ivdcfirs3jbd6m3rryq590szkhplm2kr9chjgcgd88ar5nrqfg7"; depends=[ggplot2 raster reshape2 rgdal]; }; diffee = derive2 { name="diffee"; version="1.1.0"; sha256="01lb1prz70mxgymhhsvx48kbfy69xyyaabsmfhf28af9wfb89662"; depends=[igraph pcaPP]; }; - diffeqr = derive2 { name="diffeqr"; version="0.1.1"; sha256="1zvjl2i38nyhk63bncqc5cva1m40sm692w7a36qc455s2jnskfh8"; depends=[JuliaCall stringr]; }; + diffeqr = derive2 { name="diffeqr"; version="0.1.2"; sha256="17h76myfzl4xxd5wrhyd6b0h78dz42j5zac7fb5j0xq2qj6k7l7d"; depends=[JuliaCall stringr]; }; diffobj = derive2 { name="diffobj"; version="0.2.3"; sha256="17wq3haj2i8x5cy1xx2c8hj2p65hasrjyiqxcq61kzvxd0zyjxzw"; depends=[crayon]; }; diffpriv = derive2 { name="diffpriv"; version="0.4.2"; sha256="12q2v93369bshid83rsy1csbr9ay6rfpd8zdxm12zi7py3f9sjs8"; depends=[gsl]; }; diffr = derive2 { name="diffr"; version="0.1"; sha256="0ydwnpyzirynffsnvip667y0jqzy7yfqlfpqhb38xvmd9rmwfbp8"; depends=[htmlwidgets]; }; @@ -6508,7 +6601,7 @@ in with self; { diffusion = derive2 { name="diffusion"; version="0.2.7"; sha256="1j9s9vw5sc4k956bk4yp3bf4fnp7lhhkwcvlzvsh1w4dyaj8l35h"; depends=[dfoptim nloptr systemfit]; }; diffusionMap = derive2 { name="diffusionMap"; version="1.1-0.1"; sha256="11l4kbciawvli5nlsi4qaf8afmgk5xgqiqpdyhvaqri5mx0zhk5j"; depends=[igraph Matrix scatterplot3d]; }; diffusr = derive2 { name="diffusr"; version="0.1.4"; sha256="1f3h387kblw1xzdnxphwgfl1n7f6i07kk7kfslvbfxkalbish6ii"; depends=[igraph Rcpp RcppEigen]; }; - digest = derive2 { name="digest"; version="0.6.19"; sha256="1x6cbj9qvkk7pxv9xdqibazw3x8psjp6x0m0ildx1jwyb2ymkl98"; depends=[]; }; + digest = derive2 { name="digest"; version="0.6.20"; sha256="1irhk2jaj9cg57cxprgyn1if06x121xwcxh1fzzn3148bl5lnrq5"; depends=[]; }; digitalPCR = derive2 { name="digitalPCR"; version="1.1.0"; sha256="0hwqq84yr1hnvf4bygc5425887dhqjjjyy1ils71iavcal04s8pb"; depends=[]; }; digitize = derive2 { name="digitize"; version="0.0.4"; sha256="1qw4x4z9vrs79sd9b2daw668nc6nvjl4qhayfqmd87yxa2ydv6x0"; depends=[readbitmap]; }; dils = derive2 { name="dils"; version="0.8.1"; sha256="1q6ba9j14hzf7xy895mzxc6n9yjgind55jf350iqscwzxf7ynp33"; depends=[igraph Rcpp]; }; @@ -6548,8 +6641,10 @@ in with self; { disposables = derive2 { name="disposables"; version="1.0.3"; sha256="0q5wacjclspn2fh7z1pg2l67ll51n75wck5h2fdq2vxy3qn3vwis"; depends=[]; }; dissUtils = derive2 { name="dissUtils"; version="1.0"; sha256="00fzlmkdfw2s3k824wp2pk3v7cvxnywi1hfp86g4mm95z2qlw9br"; depends=[]; }; dissever = derive2 { name="dissever"; version="0.2-3"; sha256="1lgs5nmv3lpm4gsryxvcwiwibvvg9flv23q8maisp77x49c18qcp"; depends=[boot caret dplyr foreach magrittr plyr raster sp viridis]; }; + distTails = derive2 { name="distTails"; version="0.1.1"; sha256="0i0xajdsbd03jrf0y2vx3hm830n5xy1g0md1bl576g6rdxsvln2l"; depends=[ercv gsl MASS]; }; distance_sample_size = derive2 { name="distance.sample.size"; version="0.0"; sha256="0hlf3kp34rg1gnkxp4k3rnv0shv4fpgb0rhx3a6x5692lhyigbcs"; depends=[MASS]; }; distances = derive2 { name="distances"; version="0.1.7"; sha256="1xhv7mf5753d6jnbrmmy6k670li5h2gd8c789mm5w9hxb40rwald"; depends=[]; }; + distantia = derive2 { name="distantia"; version="1.0.0"; sha256="13klrjqw4xfn4qh1xs2wlcccdrjcihz0zc9mxnf7q5dd1ffwpryw"; depends=[doParallel fields foreach plyr RColorBrewer viridis viridisLite]; }; distcomp = derive2 { name="distcomp"; version="1.0-1"; sha256="0f69bxw52ai39dmkmfvrs0lbibcgmv6n849xa9xgd2jm5mvbc58f"; depends=[digest httr jsonlite R6 shiny stringr survival]; }; distcrete = derive2 { name="distcrete"; version="1.0.3"; sha256="0sa6z2mpmk51ig1r7bmpbyv2jd8z6z7mixki2vlq1kybg8cx3wmi"; depends=[]; }; distdichoR = derive2 { name="distdichoR"; version="0.1-1"; sha256="0v19m3n1jgipg65yrv75rm4v27b5aq58cbsmbp7lxvfxmj5ra328"; depends=[boot emmeans nlme sn]; }; @@ -6560,6 +6655,7 @@ in with self; { disto = derive2 { name="disto"; version="0.2.0"; sha256="09pafy8y1ifgglqmal32dy34acx06ypsq2bgwsn6fjiqr9kw401j"; depends=[assertthat broom dplyr factoextra fastcluster fastmatch ggplot2 pbapply proxy tidyr]; }; distory = derive2 { name="distory"; version="1.4.3"; sha256="1mszk8fv1z46d7y1q37mhq9b5yk39w2i9rq6mgdf03afdslrmrip"; depends=[ape]; }; distr = derive2 { name="distr"; version="2.8.0"; sha256="1dyff4m33xmw6hxb3jxzr8vvajg3qz3rfcrfxjxwsswlddfz0zdv"; depends=[MASS sfsmisc startupmsg]; }; + distr6 = derive2 { name="distr6"; version="1.0.1"; sha256="142kqbnnl8d80vggmbpg363sqdkhni6rbk25dqkwhryl1y712pib"; depends=[checkmate crayon data_table expint extraDistr GoFKernel pracma R6 R62S3]; }; distrDoc = derive2 { name="distrDoc"; version="2.8.0"; sha256="1iq2gbfbsf3h279yh3fnqsi39gdw15vc6r1g33xcb8kgmmqmvf0p"; depends=[distr distrEx distrMod distrSim distrTeach distrTEst MASS RandVar startupmsg]; }; distrEllipse = derive2 { name="distrEllipse"; version="2.8.0"; sha256="1ymfa8xpgs8zjp4psiwmll5z0vji496fivxmcavspzxy31cw70wx"; depends=[distr distrEx distrSim mvtnorm setRNG startupmsg]; }; distrEx = derive2 { name="distrEx"; version="2.8.0"; sha256="1gwhsnlrnzyp2x97d9wfdy5pa9z3q5il934wjv4kxs9wsvkwsr5h"; depends=[distr startupmsg]; }; @@ -6598,18 +6694,17 @@ in with self; { dmm = derive2 { name="dmm"; version="2.1-5"; sha256="1i94bsgc12ysivpy9mdmzcdfki1f84x036danki7ynrbym2b3c7a"; depends=[MASS Matrix nadiv pls robustbase]; }; dmt = derive2 { name="dmt"; version="0.8.20"; sha256="0rwc8l9k2y46hslsb3y8a1g2yjxalcvp1l3v7jix0c5kz2q7917w"; depends=[MASS Matrix mvtnorm]; }; dmutate = derive2 { name="dmutate"; version="0.1.2"; sha256="06gr49j5jz6ns1zydwsqysgkigi2sbm4hdd2jbb82f05rd9spyf3"; depends=[dplyr MASS]; }; - dna = derive2 { name="dna"; version="1.1-1"; sha256="0gw70h1j67h401hdvd38d6jz71x1a6xlz6ziba6961zy6m3k5xbm"; depends=[]; }; dnet = derive2 { name="dnet"; version="1.1.4"; sha256="0xccb50a85d9fcxfg0shxf430hzgjyh4qgb3js4sgzi02iagim58"; depends=[graph igraph Matrix Rgraphviz supraHex]; }; dng = derive2 { name="dng"; version="0.2.1"; sha256="0yi1fs4yvlsy3j128l7s5kwq8mhdd5fr74y2bzj7cjrxi7wgz2hg"; depends=[Rcpp]; }; dnr = derive2 { name="dnr"; version="0.3.4"; sha256="0hzaa308pppq2cqpb067f3y3nyv1p2xdmgy3dykf90psnn5v011p"; depends=[arm ergm glmnet igraph network sna]; }; doBy = derive2 { name="doBy"; version="4.6-2"; sha256="02vbv9nfgywg6lsiialkmfnax5z3rkyb9nr8j9l2cp8xi6ml95mb"; depends=[dplyr magrittr MASS Matrix plyr]; }; - doFuture = derive2 { name="doFuture"; version="0.8.0"; sha256="17xxykxcn7z11xd401a3z93vj6z08469x9lpib4vjhlskdfjcwsh"; depends=[foreach future globals iterators]; }; - doMC = derive2 { name="doMC"; version="1.3.5"; sha256="1vfrykvfvsyq12mypd266867ml1dcwc3rj5k9c3wrn5bddcm88kr"; depends=[foreach iterators]; }; + doFuture = derive2 { name="doFuture"; version="0.8.1"; sha256="1akjzzqsa768y6d4ligr4mrcb107g5jwcl0rm34hbnqm81qms0bz"; depends=[foreach future globals iterators]; }; + doMC = derive2 { name="doMC"; version="1.3.6"; sha256="1cn9gxavhvjswip8pwvkpi7q6wpzdllcsdjabga8akf55nggqxr9"; depends=[foreach iterators]; }; doMPI = derive2 { name="doMPI"; version="0.2.2"; sha256="0ahwm17p3gq1yvc8v6sr6sb8z7i6zws8d1pf46qynl0gd4amg938"; depends=[foreach iterators Rmpi]; }; - doParallel = derive2 { name="doParallel"; version="1.0.14"; sha256="01qjs4iw9f1kgymcypj0m2s4pvgqhxaycpli0fb8lq3dc0vpzfyb"; depends=[foreach iterators]; }; + doParallel = derive2 { name="doParallel"; version="1.0.15"; sha256="0vnqbha3gig3awbfvsfx3ni5jir398md1n7xmsb8jihnjsk7xbbi"; depends=[foreach iterators]; }; doRNG = derive2 { name="doRNG"; version="1.7.1"; sha256="1sb75aqkliprglfxc4x4wds6alqgzhvl2n812g1d32a88ra3slr7"; depends=[foreach iterators pkgmaker rngtools]; }; doRedis = derive2 { name="doRedis"; version="1.1.1"; sha256="10ldfzq6m83b9w24az9bf5wbfm6y9gi233s8qgsk4dnr84n3nizx"; depends=[foreach iterators rredis]; }; - doSNOW = derive2 { name="doSNOW"; version="1.0.16"; sha256="13ir4a8252h4yvp5ir9xnwack1kn58i4ny6sf2qdc12zspn3850n"; depends=[foreach iterators snow]; }; + doSNOW = derive2 { name="doSNOW"; version="1.0.18"; sha256="0rj72z5505cprh6wykhhiz08l9bmd966srqh2qypwivf321bvrvh"; depends=[foreach iterators snow]; }; dobson = derive2 { name="dobson"; version="0.4"; sha256="0xfn7s3wzrv1md40bdjrnjfiqyxg5c6lrcpnvayjdgrhxq161hhq"; depends=[]; }; dockerfiler = derive2 { name="dockerfiler"; version="0.1.3"; sha256="128648s9lj96p3nlxwy4gs108w5kjcg6w48nfx3r52gb8w2z7948"; depends=[attempt glue R6]; }; docopt = derive2 { name="docopt"; version="0.6.1"; sha256="06zknnd0c5s2y0hbddzdlr3m63ib783izpck6pgz7sjbab5pd068"; depends=[]; }; @@ -6643,9 +6738,9 @@ in with self; { dpcR = derive2 { name="dpcR"; version="0.5"; sha256="17l9g11qqs2fkskg331889m8nkkrwzrq0n684rdn62pnd5j2n5pi"; depends=[binom chipPCR dgof e1071 evd multcomp pracma qpcR rateratio_test readxl shiny signal spatstat]; }; dpcid = derive2 { name="dpcid"; version="1.0"; sha256="1gx8gyrxvm07mjiasl0b80y0x3crq6gy170v6s817d11jw44n86z"; depends=[]; }; dpglasso = derive2 { name="dpglasso"; version="1.0"; sha256="1mx28xbm2z2bxyp33wv2v6vgn1yfsdsa0bzjjdxasgd6lvr51myf"; depends=[]; }; - dplR = derive2 { name="dplR"; version="1.6.9"; sha256="0pb2f0f09qwi6az7c0pp28jhv5cgdfy4wqwfsqgkq5nlzlbkbnri"; depends=[animation digest lattice Matrix matrixStats plyr png R_utils signal stringi stringr XML]; }; + dplR = derive2 { name="dplR"; version="1.7.0"; sha256="1ylzki6wvsbcxlz4k532a8yh0kwc6817vkbks7l060acssbycipr"; depends=[digest lattice Matrix matrixStats plyr png R_utils signal stringi stringr XML]; }; dplRCon = derive2 { name="dplRCon"; version="1.0"; sha256="10xnawgnhxp5y949fxs1vvadc1qz2ldy0s9w9w7kf6iqh59d35sw"; depends=[]; }; - dplyr = derive2 { name="dplyr"; version="0.8.2"; sha256="12z1z2mn4y6dnv56yi6f6f7fw72l4sj3sqkl0cknzn041nrxbdp2"; depends=[assertthat BH glue magrittr pkgconfig plogr R6 Rcpp rlang tibble tidyselect]; }; + dplyr = derive2 { name="dplyr"; version="0.8.3"; sha256="032c89wa04g9rih9shyvwl3il0bsrv3xk489x6867sk9bb3amd38"; depends=[assertthat BH glue magrittr pkgconfig plogr R6 Rcpp rlang tibble tidyselect]; }; dplyr_teradata = derive2 { name="dplyr.teradata"; version="0.3.2"; sha256="1pq630hlvpfrhaxqn6yh0kgapgibrnbic78g130d40visak60j1p"; depends=[bit64 DBI dbplyr dplyr odbc rstudioapi]; }; dplyrAssist = derive2 { name="dplyrAssist"; version="0.1.0"; sha256="1lqizh70b1apyr4578917gv6s0i7p84ak96a57kvwipmh36a4ywn"; depends=[DT magrittr miniUI plyr rstudioapi shiny shinyAce shinyWidgets stringr tidyr tidyverse]; }; dpmixsim = derive2 { name="dpmixsim"; version="0.0-9"; sha256="064i122j8vkpjxzfrhp25kb6nv5j3a7s8qk0202x7vnvj9caqjvx"; depends=[cluster oro_nifti]; }; @@ -6659,7 +6754,7 @@ in with self; { dragon = derive2 { name="dragon"; version="0.1.0"; sha256="0vnhp901xnvj7w8si8s2nd880c5b1zc30qq61zv7zkxd7bhzxp7g"; depends=[colorspace colourpicker DT igraph magrittr RColorBrewer shiny shinythemes shinyWidgets tidyverse visNetwork]; }; dragonking = derive2 { name="dragonking"; version="0.1.0"; sha256="01b01wd1s2b8sa9f0kfbf2pbzhaqra7xxskigqh3vlj389xqm1id"; depends=[]; }; dragulaR = derive2 { name="dragulaR"; version="0.3.1"; sha256="1cw5v7m1b4pxsizsjb3zdzhydxj577p6q5fcjklsvpzmiixzlyav"; depends=[htmlwidgets shiny shinyjs]; }; - drake = derive2 { name="drake"; version="7.4.0"; sha256="142wlnwrskjmqk941dqi2vy7q745m007b6yl4pv1lmh68hnfd9is"; depends=[base64url digest igraph rlang storr]; }; + drake = derive2 { name="drake"; version="7.5.2"; sha256="18ch0wkjv3lc3fhw8msljlqpxlwb9a13m47majgipfm6ylq7nx30"; depends=[base64url digest igraph rlang storr txtq]; }; drat = derive2 { name="drat"; version="0.1.5"; sha256="0i80c4hyclwnq8g8amvdid9pwr11mwbscwydaxmvbrbhv3qzjg6d"; depends=[]; }; draw = derive2 { name="draw"; version="1.0.0"; sha256="0kbz8rcgygl4fhmljzaan5jl7wjvfljcaykm7q9lw9s6m78p06gz"; depends=[]; }; drc = derive2 { name="drc"; version="3.0-1"; sha256="0c8xn8ripzq270hy8d16fcnx02l02alddznd7fqwk3jyi6113h1y"; depends=[car gtools MASS multcomp plotrix scales]; }; @@ -6673,11 +6768,11 @@ in with self; { drsmooth = derive2 { name="drsmooth"; version="1.9.0"; sha256="1wgi961bvbsnq4bygxbpy4sy5fy34lrrkaaj0r2rxcahwa1sc38n"; depends=[boot car DTK lubridate mgcv multcomp pgirmess segmented]; }; drtmle = derive2 { name="drtmle"; version="1.0.4"; sha256="0k8cps3kpfrlv33a0czjp327qzdj69lwbpv4k5q7qjcv0878yypg"; depends=[doFuture future future_apply future_batchtools np plyr SuperLearner]; }; drugCombo = derive2 { name="drugCombo"; version="1.1.0"; sha256="0y8zjcbaympczrvr4dfbd1n83iliv5qv4xz9za4zm412c1dkdd24"; depends=[BIGL Deriv ggplot2 minpack_lm nlme rgl]; }; - ds = derive2 { name="ds"; version="3.0"; sha256="10xp575l0wh85wg32k3as02kgqm9ax9nx9i5kd5bkimfwg4qv745"; depends=[]; }; + ds = derive2 { name="ds"; version="4.0"; sha256="1iic5fb27cnhsa83zg28hydrhzc01i9z0711xvk95c3gv7mbfp2p"; depends=[]; }; dsa = derive2 { name="dsa"; version="0.70.3"; sha256="0ilfrrfdvw86p6q5jskh0fqnqrcz75j2ldzhvwfpbdr9bh65jfai"; depends=[dygraphs extrafont forecast ggplot2 gridExtra htmlwidgets R2HTML reshape2 rJava timeDate tsoutliers xtable xts zoo]; }; dsample = derive2 { name="dsample"; version="0.91.2.2"; sha256="18c0zxaqwgbn9kmkwlnicwd74ljy2sxj0b9ksif13pdlj3zn57h1"; depends=[MASS]; }; dse = derive2 { name="dse"; version="2015.12-1"; sha256="1976h57zallhzq43nshg77bsykcvkfwnasha1w59c44fjpl1gs9w"; depends=[setRNG tfplot tframe]; }; - dslabs = derive2 { name="dslabs"; version="0.6.0"; sha256="0s4jqyi654blzjg7ysvwn1adjdnmnrlv4vhpfwy29f4vb7lla9z2"; depends=[ggplot2]; }; + dslabs = derive2 { name="dslabs"; version="0.7.1"; sha256="1paagq2wxikf1kxplh88iwscfgqsqjyj9c1hh5j843n9vkr4dv3j"; depends=[ggplot2]; }; dslice = derive2 { name="dslice"; version="1.2.0"; sha256="1k9hxpmr563p8bpd9m991lx5ig366mzk9j1lzldci9pq4jiayin1"; depends=[ggplot2 Rcpp scales]; }; dsm = derive2 { name="dsm"; version="2.2.17"; sha256="0n2nn05zb8zd2wah1cfzv8a9qwbh6an3jwsfy0x6lbkk63bs5mxw"; depends=[ggplot2 mgcv mrds nlme numDeriv plyr statmod]; }; dsmodels = derive2 { name="dsmodels"; version="1.1.0"; sha256="0gidxi4ph49mjm2hdf9flphfb9916al4cpdkiig504n7ms2sbpbg"; depends=[latex2exp pryr shape]; }; @@ -6687,7 +6782,7 @@ in with self; { dstat = derive2 { name="dstat"; version="1.0.4"; sha256="023jp0xdbg200ww1gnr3fzgjqd82acag0jps7q6j6m27q11psvgz"; depends=[]; }; dtables = derive2 { name="dtables"; version="0.2.0"; sha256="0ikgip3p4b7q97b2dshlx0fq09xsk304gfk5prw4rk95w9wck3qs"; depends=[psych]; }; dtangle = derive2 { name="dtangle"; version="0.3.1"; sha256="0kvds49gx850rmrcja0xr3j9nja5zqnsg1q2zjb07qp425jc3j46"; depends=[]; }; - dti = derive2 { name="dti"; version="1.4"; sha256="1159qmmjxnnnp5x0z5219ds0jwkhqlaj4x6c5n5fmv505fnlx8cz"; depends=[adimpro awsMethods gsl oro_dicom oro_nifti quadprog rgl]; }; + dti = derive2 { name="dti"; version="1.4.1"; sha256="0dwrs6bkrznwybpr5g5hsl6si107l3xwzi4g3wqyx0hr03447p9i"; depends=[adimpro awsMethods gsl oro_dicom oro_nifti quadprog rgl]; }; dtp = derive2 { name="dtp"; version="0.1.0"; sha256="0qy8nrbq22bfbajkxq6blkq7583pc5mb392gmqb3c9daxmqn42vb"; depends=[Formula gtools plyr]; }; dtpcrm = derive2 { name="dtpcrm"; version="0.1.0"; sha256="1zrgg4pz2zr001bl1rvkqxqpyqch4xp97wwfrn9wkf8ylbl08iqv"; depends=[dfcrm diagram]; }; dtplyr = derive2 { name="dtplyr"; version="0.0.3"; sha256="04yawjzyij0hlarifb9w4bnxybf73crwidvd5nwclscbis22a29r"; depends=[data_table dplyr lazyeval rlang]; }; @@ -6696,7 +6791,7 @@ in with self; { dttr2 = derive2 { name="dttr2"; version="0.0.1"; sha256="042zll9hw4ljwr85x4dmkv8nz6r0mpawaa5s58ngxypshss8sbg0"; depends=[checkr hms]; }; dtw = derive2 { name="dtw"; version="1.20-1"; sha256="1w301xwizncy5r8v9rwwdxfshydgp3l1pnjla1fjn6n8lx3imjj3"; depends=[proxy]; }; dtwSat = derive2 { name="dtwSat"; version="0.2.5"; sha256="0qvjzqmi6plkq5l4r52c7wil58n41l5f5dxzpk9r4yis8bdm5zlq"; depends=[caret dtw ggplot2 lubridate mgcv plyr proxy raster RColorBrewer Rdpack reshape2 rgdal scales snow sp xtable zoo]; }; - dtwclust = derive2 { name="dtwclust"; version="5.5.3"; sha256="0y6841wxkbqvf7878cw8wx0knnizkw1z2n9sk8b1lf7nw8qprj0a"; depends=[bigmemory clue cluster dplyr dtw flexclust foreach ggplot2 ggrepel Matrix nloptr proxy Rcpp RcppArmadillo RcppParallel RcppThread reshape2 RSpectra shiny shinyjs]; }; + dtwclust = derive2 { name="dtwclust"; version="5.5.4"; sha256="0vjgi2j0p1jbbd3dqcrgi9mm6nwyzgjbifyidgdpdshwlxiardvd"; depends=[bigmemory clue cluster dplyr dtw flexclust foreach ggplot2 ggrepel Matrix nloptr proxy Rcpp RcppArmadillo RcppParallel RcppThread reshape2 RSpectra shiny shinyjs]; }; duawranglr = derive2 { name="duawranglr"; version="0.6.3"; sha256="0swvrdwnbyigsvds3s32nw79b245q3cgv7xskjx7qjcpnvzr7x7q"; depends=[digest dplyr haven readr readxl]; }; dub = derive2 { name="dub"; version="0.2.0"; sha256="066lzyk44380mf17vx4db4a3a4rs7zl85mj5hjg172khjbqnbixw"; depends=[]; }; duckduckr = derive2 { name="duckduckr"; version="1.0.0"; sha256="1wki8xvqp5hr27iafd9jbryl9faywfkdkpn0pa0afywbic39k2cm"; depends=[crul jsonlite]; }; @@ -6704,7 +6799,7 @@ in with self; { dummy = derive2 { name="dummy"; version="0.1.3"; sha256="081a5h33gw6ym4isy91h6mcf247c2vsdygv9ll07a3mgjcjnk79p"; depends=[]; }; dunn_test = derive2 { name="dunn.test"; version="1.3.5"; sha256="0lqwvyl3pyygfc73nf81gzw3zl3w43r7ki0yw2dgrzhkpb2iji4a"; depends=[]; }; dupiR = derive2 { name="dupiR"; version="1.2"; sha256="0p649yw7iz6hnp7rqa2gk3dqkjbqx1f6fzpf1xh9088nbf3bhhz3"; depends=[plotrix]; }; - durmod = derive2 { name="durmod"; version="1.0-2"; sha256="0a2q7hza9khfqgi26vaipz71g4yna9a8vhd5yzjkdwx94b3b8dr1"; depends=[data_table mvtnorm nloptr numDeriv Rcpp]; }; + durmod = derive2 { name="durmod"; version="1.1-1"; sha256="0v8ww13d71nlhxz6512hc1cdakvn9mb54npvy3zyc2i73avqgisl"; depends=[data_table mvtnorm nloptr numDeriv Rcpp]; }; dvmisc = derive2 { name="dvmisc"; version="1.1.3"; sha256="0x391pxg5mqgp5xxc8qwhwxky8ds7d9gr9iwmsb12c92kxfk00bv"; depends=[cubature data_table dplyr ggplot2 MASS mvtnorm pracma purrr rbenchmark Rcpp survey]; }; dwapi = derive2 { name="dwapi"; version="0.1.3.1"; sha256="1sz4n8vn7cmlilxzhkm4rdfca0904cbh28n5383p9pr46bdi69q5"; depends=[httr jsonlite readr rjson xml2]; }; dyads = derive2 { name="dyads"; version="1.1.2"; sha256="014gphxkn0wkdq5zgd71vv9dmzyswgpari59w5mf2070c0rr56n5"; depends=[MASS mvtnorm]; }; @@ -6741,11 +6836,13 @@ in with self; { eAnalytics = derive2 { name="eAnalytics"; version="0.1.4"; sha256="15hhd4q2yxzq3a3awvk81ixa43hk519ym8ap7v1ahghyr0njnyyf"; depends=[dplyr DT energyr googleVis leaflet plotly shiny shinydashboard shinytest shinyWidgets]; }; eChem = derive2 { name="eChem"; version="1.0.0"; sha256="0wmf204hqd4s5har5l9bkcbrbmbqbb8m11w2aivi2gs98f3hy51p"; depends=[animation plot3D]; }; eDMA = derive2 { name="eDMA"; version="1.5-3"; sha256="0wyp81si6lcispqng4c7lii22qbyblvijgnlxvcsnkcxj5hpm76j"; depends=[Rcpp RcppArmadillo xts zoo]; }; + eGST = derive2 { name="eGST"; version="1.0.0"; sha256="0qi4vg0pwy55js9ww1cw85ssim3x7s2p98cjijxvlrvid8sns5bq"; depends=[MASS matrixStats mvtnorm purrr]; }; eHOF = derive2 { name="eHOF"; version="1.8"; sha256="0g0sb98mlgvhs27s0a1x0ysj3r4p3r7i382fqzfv29kn1ayw0r5c"; depends=[lattice mgcv]; }; eMLEloglin = derive2 { name="eMLEloglin"; version="1.0.1"; sha256="087zw48lykls2jcsmpqd5jkrlpr0j423snp00liszjhdpdh59saq"; depends=[lpSolveAPI]; }; eNetXplorer = derive2 { name="eNetXplorer"; version="1.0.2"; sha256="1rcqy5r3hzra57rdjl477w2khv74s4zk0vcbnp6ypnym0c8k6vzz"; depends=[calibrate expm glmnet gplots Matrix progress RColorBrewer]; }; ePCR = derive2 { name="ePCR"; version="0.9.9-9"; sha256="0ix7rvh9w4zcp7k0m5bm16wdjs6yr7wvnsc9mssfrwcjx0p57nlx"; depends=[Bolstad2 glmnet hamlet impute pracma survival timeROC]; }; eRm = derive2 { name="eRm"; version="1.0-0"; sha256="11p8j61arq1ih2qi33wf0442vcdbp3zvknzm5aknsifwl4mbzzly"; depends=[lattice MASS Matrix]; }; + eSDM = derive2 { name="eSDM"; version="0.2.1"; sha256="0s1njyc5xg8wwq1lhajzqx19i5201i92rvavkghkzd0c13kj8dhz"; depends=[colorRamps colourpicker dichromat dplyr DT leaflet lwgeom purrr raster RColorBrewer rlang ROCR sf shiny shinycssloaders shinydashboard shinyjs tmap units viridis]; }; eaf = derive2 { name="eaf"; version="1.8"; sha256="1plzvfa2vs3njky7xk9dvic2xapdnzb5iycrksv0qj03ylbh6410"; depends=[modeltools]; }; earlyR = derive2 { name="earlyR"; version="0.0.1"; sha256="14davqhh3n5dfsddnfd79ni56bssrpwhvkqkdb77a8x9fn8w32pv"; depends=[distcrete EpiEstim epitrix]; }; earlygating = derive2 { name="earlygating"; version="1.0"; sha256="0y6xjkh9p8bvanc9p5sycah8v81k85xr8i7vyvjb9g4a64srwhd7"; depends=[betareg doParallel foreach]; }; @@ -6757,17 +6854,18 @@ in with self; { easyCODA = derive2 { name="easyCODA"; version="0.31.1"; sha256="1g3k8a06zsif5a7xma4dz5zcdbxyc6i58jf5rnnyypxhj6xm5abc"; depends=[ca ellipse vegan]; }; easyDes = derive2 { name="easyDes"; version="5.0"; sha256="1msybgv4b7xlvp93lk64mdrqprr5qqc9ma1bz7glchhlkyyl8c21"; depends=[multcomp PMCMRplus]; }; easyNCDF = derive2 { name="easyNCDF"; version="0.0.4"; sha256="1hd7b6pdm5j41a4v0jxhbqdy2bz5gj86fsfwj0l7gg7h32d6hkhq"; depends=[abind ncdf4]; }; + easyPSID = derive2 { name="easyPSID"; version="0.1.0"; sha256="10373pbgkgc2aizff54qx95yixlcdbp3xbwlml0lm2rm449bjd6x"; depends=[foreign LaF stringr]; }; easyPubMed = derive2 { name="easyPubMed"; version="2.13"; sha256="1wd8idyqz7kgygp34mjp2abx82775ry8l07vsqdlqnc6fdnvg55d"; depends=[]; }; easySVG = derive2 { name="easySVG"; version="0.1.0"; sha256="03gl5gl0yqgpygd4kna79wrhflbnq3zrz3iq2i8hk9xqd83mszh3"; depends=[]; }; easySdcTable = derive2 { name="easySdcTable"; version="0.3.3"; sha256="0hhi1nwc84b0mjs2sw2qmvj3cmfkk9kr3rni9fkyyds1dhwgrvvh"; depends=[sdcTable shiny SSBtools]; }; easyVerification = derive2 { name="easyVerification"; version="0.4.4"; sha256="08mih1arx01vj7cs1jsln644pcvslpyw1rgr6jmv2czr6xd8qb7d"; depends=[pbapply Rcpp SpecsVerification]; }; easyalluvial = derive2 { name="easyalluvial"; version="0.2.0"; sha256="1bbygr512zzlyjzmf5lh9bks2f10k1mja5scrrrgf0ls3gnyw8ln"; depends=[caret dplyr e1071 forcats ggalluvial ggplot2 ggridges gridExtra magrittr progress purrr randomForest RColorBrewer recipes rlang stringr tibble tidyr]; }; - easyanova = derive2 { name="easyanova"; version="6.0"; sha256="16cypapzrsf70wrpd0rq00kks96rx3kiqnxswd410l6ss2gnni7h"; depends=[car emmeans lme4 lmerTest]; }; + easyanova = derive2 { name="easyanova"; version="7.0"; sha256="1zpwh3r1r0n11hgqzph8f2aac44qb6rpnhk73hcblq0f9vs0an55"; depends=[nlme]; }; easycsv = derive2 { name="easycsv"; version="1.0.8"; sha256="1i2k5372b6a5pypk6m0rsvvkcy0y51pvh57a60rpgqk8q0yq8pig"; depends=[data_table]; }; easynls = derive2 { name="easynls"; version="5.0"; sha256="1ma2q4y5dxk6q99v880vqfsgy1fha96j7pi8ch699l0pi6bx0d6c"; 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]; }; - easyreg = derive2 { name="easyreg"; version="2.0"; sha256="0qxcrgcc306g4i2wnph94wa7sj06mqxi96cvbpnk9mi46ps0l1kw"; depends=[car nlme]; }; + easyreg = derive2 { name="easyreg"; version="3.0"; sha256="09gjxwhwdkz2xfrhllf9g6ylvd7xw6sm5m9zn1983d12xld7kfvm"; depends=[nlme]; }; ebGenotyping = derive2 { name="ebGenotyping"; version="2.0.1"; sha256="1jllzc7kvvckrws8qhgvwy626llyb68sp1davp7swx48sf7rwcxc"; depends=[]; }; ebSNP = derive2 { name="ebSNP"; version="1.0"; sha256="0x3ijwg4yycsfy6jch1zvakzfvdgpiq8i7sqdp5assb8z1823w0b"; depends=[]; }; eba = derive2 { name="eba"; version="1.9-0"; sha256="1xbjd7n895wzzybpjf634a1jpbwqxwh7l17phz6zv7h6dfw19nx4"; depends=[nlme psychotools]; }; @@ -6780,7 +6878,7 @@ in with self; { ecd = derive2 { name="ecd"; version="0.9.1"; sha256="0d8mf5q6n7k5qj6kxvrb3habl0qmn2rxv814kydkrz2bg0scvm1q"; depends=[digest ggplot2 gridExtra gsl moments optimx polynom RcppFaddeeva Rmpfr RSQLite stabledist xtable xts yaml zoo]; }; ecdfHT = derive2 { name="ecdfHT"; version="0.1.1"; sha256="1n3n9n86pj8c54l3xvp7knvi0ajbnjmz9pi79p7wfq92a90fqx48"; depends=[rgl]; }; ecespa = derive2 { name="ecespa"; version="1.1-10"; sha256="1n6wvz463w0ainn9a52arjhs5q9pwciknb5328pr6y287fwa3nnn"; depends=[spatstat]; }; - echarts4r = derive2 { name="echarts4r"; version="0.2.2"; sha256="1yza82pjix6jfzak64v48801alzdpw7wy0kq5bn9bb5076nml30w"; depends=[broom countrycode d3r dplyr htmlwidgets magrittr purrr scales shiny]; }; + echarts4r = derive2 { name="echarts4r"; version="0.2.3"; sha256="0yxgxwsyhmbnw3llcgr4xh0i0d74awgsapdw7xsh57wzc539666m"; depends=[broom corrplot countrycode d3r data_tree dplyr htmltools htmlwidgets jsonlite magrittr purrr scales shiny stringi]; }; echo_find = derive2 { name="echo.find"; version="3.0"; sha256="15rrja2z01y4pbh2w4h2xcnwv9c81ppnb848203vavvlilm475y1"; depends=[boot minpack_lm]; }; echogram = derive2 { name="echogram"; version="0.1.1"; sha256="0f93s9f1ghin8129vb3bvsp7jmy2hfrx97p86hci8b2y4f7b83qh"; depends=[geosphere readHAC]; }; echor = derive2 { name="echor"; version="0.1.2"; sha256="1b2d8xbjnj3daqini1i3hccnpng0ilz9m6rk6ns8qvz7kpaxkjmn"; depends=[dplyr geojsonsf httr lubridate plyr purrr readr rlang tibble tidyr]; }; @@ -6794,7 +6892,8 @@ in with self; { ecolMod = derive2 { name="ecolMod"; version="1.2.6"; sha256="1n30faldfhpm2jkaw793vr220kgn3bmn8hxhw32rax294krmwn4v"; depends=[deSolve diagram rootSolve shape]; }; ecolottery = derive2 { name="ecolottery"; version="1.0.0"; sha256="0w5aq1aaqzz74vlj8hgnmn60l8rdrchx022dpspqnpvpzdlh65z5"; depends=[abc ggplot2]; }; econet = derive2 { name="econet"; version="0.1.81"; sha256="0hm1v4fjzyzdaxiw6lar7fxnqsckis3n7nrsravhbllhcf0aqq7w"; depends=[bbmle dplyr igraph intergraph MASS Matrix minpack_lm plyr sna spatstat_utils tnet]; }; - econetwork = derive2 { name="econetwork"; version="0.1"; sha256="0zzfqzi1nqczxkdqzqa5hblxysjfbn5ad1wrynaziq7b3qgyivwa"; depends=[igraph Matrix_utils rdiversity]; }; + econetwork = derive2 { name="econetwork"; version="0.2"; sha256="0ilqxyvpkiwhhgml19f1rf08bn061nf76d7fby3084ypgc4iwi1b"; depends=[igraph Matrix_utils rdiversity]; }; + economiccomplexity = derive2 { name="economiccomplexity"; version="0.1.2"; sha256="1g8f9l5p1jzqf1w81n88idq2kwrvq56ss6mgcm4lcirblcrf2jk2"; depends=[dplyr igraph magrittr Matrix rlang tibble tidyr]; }; econullnetr = derive2 { name="econullnetr"; version="0.1.0.1"; sha256="1ssgvz17a2cpwag786rc6azi3cz74cc4bxz5jjrn1bfq8ch8xqd3"; depends=[bipartite gtools reshape2]; }; ecoreg = derive2 { name="ecoreg"; version="0.2.2"; sha256="1yzyqvhshgc7ip251y7hsvip4xwf8i92bvvz84mn0mzv5b4mq3im"; depends=[]; }; ecoseries = derive2 { name="ecoseries"; version="0.1.5"; sha256="1q35hp5hl6z28hns5rnp3mjn6hqp5qh714pagw7fw4d4a6wnvacy"; depends=[magrittr RCurl readr rjson rvest tibble xml2 zoo]; }; @@ -6842,12 +6941,12 @@ in with self; { effects = derive2 { name="effects"; version="4.1-1"; sha256="1j3arsysyxssq5rhz779h8ffryxvashxhf5j0z08p2p7xhv7s3ns"; depends=[carData colorspace estimability lattice lme4 nnet survey]; }; effectsizescr = derive2 { name="effectsizescr"; version="0.1.0"; sha256="0shfjk6r3bz04jakrn5nwgymjx60lk83i0akcx7zqfxp3k8yncs5"; depends=[Kendall]; }; efflog = derive2 { name="efflog"; version="1.0"; sha256="1sfmq7xrr6psa6hwi05m44prjcpixnrl7la03k33n0bksj8r1w6b"; depends=[]; }; - effsize = derive2 { name="effsize"; version="0.7.4"; sha256="0m9qbcvisrf1d95b9rjj7f63s37wmmzldl05l9l77jws7vxql1hf"; depends=[]; }; + effsize = derive2 { name="effsize"; version="0.7.6"; sha256="129vs8kp10h6yhrrmn77518120bmfr55l6nkpbxkvylnr641b5a2"; depends=[]; }; efreadr = derive2 { name="efreadr"; version="0.2.2"; sha256="1h27by1m451wrnw017005avs5yj3fjzrm2lq5153aqm1mbbxxwvs"; depends=[dplyr ensurer magrittr readr]; }; efts = derive2 { name="efts"; version="0.9-0"; sha256="1cdn37sij3q73z9gal6x3nnnds55whfj5ywyww119hx092xcb2h4"; depends=[lubridate magrittr ncdf4 plyr stringr udunits2 xts]; }; ega = derive2 { name="ega"; version="2.0.0"; sha256="04kwh24aap22yclmcrix3vi553qb30hd43mgfzpdl0cw3ibrh7xg"; depends=[ggplot2 mgcv]; }; egcm = derive2 { name="egcm"; version="1.0.12"; sha256="0nssf5six1j7z6fss7478zdbsfx60myzw833m7nsnaf1r8n4ixaf"; depends=[ggplot2 MASS pracma quantmod tseries urca xts zoo]; }; - egg = derive2 { name="egg"; version="0.4.2"; sha256="0ihq8r2hfxj59mswrxb296shz9981wwmywhbnpxrpkmbia701nny"; depends=[ggplot2 gridExtra gtable]; }; + egg = derive2 { name="egg"; version="0.4.5"; sha256="1fy7srpiavfn8kyrr1m84an7acgwi6ydzrg71m3b0vk7y9ybmj0m"; depends=[ggplot2 gridExtra gtable]; }; eggCounts = derive2 { name="eggCounts"; version="2.2"; sha256="0y1335m8cmayaprgkzs7ws959mxlr3l71p203s3n732dz51smmbz"; depends=[BH boot coda lattice numbers Rcpp RcppEigen rootSolve rstan StanHeaders]; }; egoTERGM = derive2 { name="egoTERGM"; version="2.1.1"; sha256="1zp3kr7s43rjp45qbd6lv48mbmby5rrz1vdz9s64v43rjm8v2jyz"; depends=[boot btergm ergm GGally Matrix network sna speedglm xergm_common]; }; egor = derive2 { name="egor"; version="0.19.1"; sha256="0sfms7yvdhqk5qn9dh4j1fp8b2md6l04hdv2psjdzhqyxl29bxfw"; depends=[dplyr igraph network plyr purrr shiny survey tibble tidyr]; }; @@ -6856,6 +6955,7 @@ in with self; { eiCompare = derive2 { name="eiCompare"; version="2.1"; sha256="0kv4k1zk1gz3fapy2i2ydy0n38hy95i10r3hr3dx8mkkf3nsj46h"; depends=[cubature data_table ei eiPack ellipse foreach ggplot2 magrittr mnormt msm mvtnorm plotrix plyr R_utils stringr tidyr tmvtnorm ucminf]; }; eiPack = derive2 { name="eiPack"; version="0.1-9"; sha256="1rivccqfr5hz80xgfw652993zg0pw7yd0by52hyp7bwm89gsjksq"; depends=[coda MASS msm]; }; eiPartialID = derive2 { name="eiPartialID"; version="0.1.2"; sha256="0721p89llzjznz2b6zlf54v7fy9lb9c5qb7w8q0l582iy5cwaw35"; depends=[eco MASS sandwich]; }; + eia = derive2 { name="eia"; version="0.3.2"; sha256="1p994salk4rn86fjcwm3m9y5lfalmx0wac3xnrfm48w9qx7ms15z"; depends=[dplyr httr jsonlite lubridate magrittr memoise purrr tibble]; }; eigeninv = derive2 { name="eigeninv"; version="2011.8-1"; sha256="18dh29js824d7mrvmq3a33gl05fyldzvgi8mmmr477573iy9r30g"; depends=[]; }; eigenmodel = derive2 { name="eigenmodel"; version="1.11"; sha256="1l3n0z736xf3x6cyxzmmq1jb2glxi2b75z7v39y4471knh6nbb4d"; depends=[]; }; eigenprcomp = derive2 { name="eigenprcomp"; version="1.0"; sha256="156qyv7sl8nng55n3ay6dnpayyfrqv27ndz40xf4w92is9zmymy0"; depends=[]; }; @@ -6868,26 +6968,27 @@ in with self; { elastic = derive2 { name="elastic"; version="1.0.0"; sha256="1mq2ayq4dwb1y0dkp3v30qs6vh2d5q4brcifjrvq7wifh4r6gnpk"; depends=[crul curl jsonlite R6]; }; elasticIsing = derive2 { name="elasticIsing"; version="0.2"; sha256="1zjgvz7w5j06x2cd1fzjl85di95ah67m1lanw01kic2bvhfwfbn6"; depends=[cvTools glmnet magrittr qgraph reshape2]; }; elasticnet = derive2 { name="elasticnet"; version="1.1.1"; sha256="0p9dplnsp28z4s2fl6afbwrgd0aj339fak8mmndicmrh7bb7rpmb"; depends=[lars]; }; - elasticsearchr = derive2 { name="elasticsearchr"; version="0.3.0"; sha256="0h3r2vdxn0hygf65cq4p9ff4zh1ndsd7nl7cbwzsnkcnra4grsb9"; depends=[httr jsonlite]; }; + elasticsearchr = derive2 { name="elasticsearchr"; version="0.3.1"; sha256="0v79kb0w33n7l64ipkq0bd7kp5hmj6cvxf5rflqjd412lnf669q8"; depends=[dplyr httr jsonlite]; }; elec = derive2 { name="elec"; version="0.1.2.1"; sha256="1gk75y83n6hvv36fp1n6kncln35j6f3ahasnzhc4fp71aq6q6vjf"; depends=[]; }; elec_strat = derive2 { name="elec.strat"; version="0.1.1"; sha256="09196k5c3jsikh98d33bn70izwcbx0wb5ki9fv1ij0dw9mnv4c3p"; depends=[elec]; }; elect = derive2 { name="elect"; version="1.2"; sha256="1hjqhmdklspssa75x8xdhv2narqgw80qh259hyfwfgnvva97w2ja"; depends=[msm nnet]; }; elections = derive2 { name="elections"; version="1.0"; sha256="0ig3pd1dw978g2sg4ynzd3p15nk6hx17pxvbxfi5rm131mjdmjdm"; depends=[]; }; - electionsBR = derive2 { name="electionsBR"; version="0.3.0"; sha256="18aq1yz2l2g4cjbmk18n5vl8x8lkp90xwm82l0bg1z1smyv3agan"; depends=[data_table dplyr haven magrittr]; }; + electionsBR = derive2 { name="electionsBR"; version="0.3.1"; sha256="0yxaxd84d13mb6xbixgm9rd56alrh5qnrmh54n1h94mna89jb103"; depends=[data_table dplyr haven magrittr readr]; }; electoral = derive2 { name="electoral"; version="0.1.1"; sha256="0lmw9kwr189dzfxzlns9fmhrdy93ja8jl2s4jir07lichyiavs03"; depends=[dplyr ineq tibble]; }; elementR = derive2 { name="elementR"; version="1.3.6"; sha256="12gg2x6xzms2ni80qdm04bfajg55ff6zkki0y2cz47kq70wzfkmg"; depends=[abind colourpicker devtools EnvStats gdata gnumeric httpuv lmtest outliers R6 reader readODS readxl shiny shinydashboard shinyjs stringr tcltk2 zoo]; }; elevatr = derive2 { name="elevatr"; version="0.2.0"; sha256="0721w28pb07ndw24k4zssh5r90fd4mf33yxigricnz23z29ql120"; depends=[httr jsonlite progress raster sf sp]; }; elexr = derive2 { name="elexr"; version="1.0"; sha256="1xmrzlp55z6k3psdg4a3x3rsilvq3k37v9r7ydfn80ahvqjz0fqh"; depends=[]; }; elhmc = derive2 { name="elhmc"; version="1.1.0"; sha256="0ngva7rnfj75fq93ycsv929m9ykijp48r7cvd6sfmi0sqsjinax5"; depends=[emplik MASS plyr]; }; + elitism = derive2 { name="elitism"; version="1.0.4"; sha256="0n5g1nd1dd5wc76qa2va1lyxahg9p062l8wdqzq43ah6943pjzgr"; depends=[MASS]; }; elliplot = derive2 { name="elliplot"; version="1.2.0"; sha256="186i4gr8k9bifzssblln8z6wxfmnplls3kc4m2liiz86mzsnim9r"; depends=[]; }; ellipse = derive2 { name="ellipse"; version="0.4.1"; sha256="0g82vc51m3c1k0hnpp2zla6amxxgk2mmkl8ssnsc49jv3599r6hs"; depends=[]; }; - ellipsis = derive2 { name="ellipsis"; version="0.2.0"; sha256="0hdk79q4wn5nq52p8qd65kqz81l0b8gfzsbzyvmfais0p24qclib"; depends=[rlang]; }; + ellipsis = derive2 { name="ellipsis"; version="0.2.0.1"; sha256="0hx9l043433bwm1np9sypph77c7y9dddpz0wrhbkcv01x32jhr8f"; depends=[rlang]; }; elliptic = derive2 { name="elliptic"; version="1.4-0"; sha256="1dhba0yfxjd5rlqsxp5a7s2hclfkla9wigsr39dlma67l6qjjmxn"; depends=[MASS]; }; elmNNRcpp = derive2 { name="elmNNRcpp"; version="1.0.1"; sha256="1n71b5pqd1szhmp4q1h9aqgkx7s54f5i3xk5nljwzsn7cyih1kb3"; depends=[KernelKnn Rcpp RcppArmadillo]; }; - elo = derive2 { name="elo"; version="1.1.0"; sha256="0xcbzhmqz5n80ybzhydz3ndzxd72gwadj8g5y4bxxfvf5il1f5yv"; depends=[pROC Rcpp]; }; - elrm = derive2 { name="elrm"; version="1.2.3"; sha256="0n05x9chr3c8cz38ccbf0vzbazbmwhxmdijn24rb8wl8d8d05kb8"; depends=[coda]; }; + elo = derive2 { name="elo"; version="2.0.0"; sha256="0cryr1cgvs5z54piw6yrv9fd7nrqv1kwxw5ahx46k7qxdgr5bb2s"; depends=[pROC Rcpp]; }; emIRT = derive2 { name="emIRT"; version="0.0.8"; sha256="17igda5phgfapjzg7dkid5jj49gmwgpadjr27z7s21365i7md9mz"; depends=[pscl Rcpp RcppArmadillo]; }; - embed = derive2 { name="embed"; version="0.0.2"; sha256="0d53cv2c9rpmvvflbdf099r378yvrlvrfpczlmygc7jcd5ijja3v"; depends=[dplyr generics keras lme4 purrr recipes rlang rstanarm tensorflow tibble tidyr]; }; + emax_glm = derive2 { name="emax.glm"; version="0.1.2"; sha256="04di6bp97cxjbbszakb64y15bjmnd2j8zvxdj8gdbgmhxk9wmbwd"; depends=[AER MASS pander pracma pROC]; }; + embed = derive2 { name="embed"; version="0.0.3"; sha256="1kjrnjh683ly3mi4rshyw8hz2sci38n8zmin4llkhgcs249z99hz"; depends=[dplyr generics keras lme4 purrr recipes rlang rstanarm tensorflow tibble tidyr uwot withr]; }; embryogrowth = derive2 { name="embryogrowth"; version="7.4.1"; sha256="1qha6l7q0565fn9yfvp04dmlpf21hr754gh6fpzhqnrh58h371v1"; depends=[deSolve HelpersMG numDeriv optimx]; }; emdbook = derive2 { name="emdbook"; version="1.3.11"; sha256="0a515jdzvg87npvrh7md7zp0v5nlz7c2jr7pba5dql6slb0d8j7q"; depends=[bbmle coda lattice MASS plyr]; }; emdi = derive2 { name="emdi"; version="1.1.5"; sha256="06v982rw8sz22w624hr68vdgxmfmi5na11ywsg6qr77jvgbprgz4"; depends=[boot ggplot2 gridExtra HLMdiag maptools MASS moments MuMIn nlme openxlsx parallelMap readODS reshape2 rgeos]; }; @@ -6897,7 +6998,7 @@ in with self; { emld = derive2 { name="emld"; version="0.2.0"; sha256="08kncxrc4yj32wcl6h1sszrajfi41m87sivc94py40c9bxpmnmmf"; depends=[jsonld jsonlite xml2 yaml]; }; emma = derive2 { name="emma"; version="0.1-0"; sha256="0psd8lrbcqla8mkhp0wlassaaimgwlmqy5yv2wwcq59mc5k1v27f"; depends=[clusterSim earth]; }; emme2 = derive2 { name="emme2"; version="0.9"; sha256="035s4h95ychqb14wib0dqbg4sjy9q01fsryr0ri25g1hsi5f8lpm"; depends=[reshape]; }; - emmeans = derive2 { name="emmeans"; version="1.3.5.1"; sha256="0rgzjvmp3yqhwgfg96v17wi8gbafzbrmz134shj2jsf5bsmw6vbj"; depends=[estimability mvtnorm numDeriv plyr xtable]; }; + emmeans = derive2 { name="emmeans"; version="1.4"; sha256="1ynf9hhbch83k63lwps69ijfch30fk5v0sc418ck264c5vih26dh"; depends=[estimability mvtnorm numDeriv plyr xtable]; }; emoa = derive2 { name="emoa"; version="0.5-0"; sha256="1wcnsnkdmpcn21dyql5dmj728n794bmfr6g9hgh9apzbhn4cri8p"; depends=[]; }; emojifont = derive2 { name="emojifont"; version="0.5.2"; sha256="0s1as6i5dz2rbd1aashn99fji2iksjzrkdkfi7wqnnxxpmkha3yx"; depends=[ggplot2 proto showtext sysfonts]; }; emon = derive2 { name="emon"; version="1.3.2"; sha256="19khjjpyxvzhzihqq15w02l5v5ryyvxlklz1ch2gkmqcpnvyga32"; depends=[MASS mgcv]; }; @@ -6908,7 +7009,7 @@ in with self; { emplik2 = derive2 { name="emplik2"; version="1.21"; sha256="1980bwc4fc4rwzlwya030n5rv8rq0s82hnw955mvaxrbmicnqlla"; depends=[]; }; ems = derive2 { name="ems"; version="1.2.7"; sha256="1l4javnfhlb6y40dpdvri2795yj0s9zqf8bi02s5llx5lcq3bxbd"; depends=[]; }; emstreeR = derive2 { name="emstreeR"; version="2.2.0"; sha256="1qbv61j2ya6zvyp8494xi8dhjlb58jmqil9cm5z0pr7p2sr6l32r"; depends=[BBmisc BH ggplot2 Rcpp RcppArmadillo RcppMLPACK scatterplot3d]; }; - emuR = derive2 { name="emuR"; version="1.1.2"; sha256="1z4xyrqylrmni34bq234c8c9dcxqlww0ylyzgql6qan1hma8bw8d"; depends=[base64enc compare DBI dplyr git2r httpuv jsonlite MASS purrr RCurl readr rlang RSQLite servr shiny stringr tibble tidyr uuid wrassp]; }; + emuR = derive2 { name="emuR"; version="2.0.2"; sha256="1a5ylfw9x6bbycamj5dj4hj3ssx701nkn11rngcysy50ppdwr2ll"; depends=[base64enc compare DBI dplyr git2r httpuv jsonlite MASS mime purrr RCurl readr rlang RSQLite rstudioapi shiny stringr tibble tidyr uuid wrassp]; }; emulator = derive2 { name="emulator"; version="1.2-20"; sha256="11z25iqyzck0s4hw0i86i9jsi52w9bjxx3zdpafssyfqfk7z5avw"; depends=[mvtnorm]; }; enaR = derive2 { name="enaR"; version="3.0.0"; sha256="0sy7k8l6b8p34bcf9bpjr1y6qkjkvn77y2w2ws7ivcr1fynrhm5p"; depends=[gdata limSolve MASS network sna stringr]; }; enc = derive2 { name="enc"; version="0.2.1"; sha256="0lx159hj464i9libaa3qy96avdwq220333h7pbdh94xz6jrn7k73"; depends=[]; }; @@ -6917,14 +7018,14 @@ in with self; { endogMNP = derive2 { name="endogMNP"; version="0.2-1"; sha256="0maxcp321ngbxrg0i23nlwhj849v771xahh53367x928ss4f8v7i"; depends=[]; }; endogenous = derive2 { name="endogenous"; version="1.0"; sha256="079fmfxl9gf080zq5m1ixmgry9dawg2y6ixbfyc5da5jxf3zk9h8"; depends=[mvtnorm]; }; endorse = derive2 { name="endorse"; version="1.6.1"; sha256="067wrb5vhi9qn66rwp38cb4kss2yc55blh5dnl99fsvpc0qs146p"; depends=[coda]; }; - endtoend = derive2 { name="endtoend"; version="1.0"; sha256="0x8f6h0mznmncqdwvsp2f0x524g5clgvk64qflf373lyn6h1v0ap"; depends=[]; }; - energy = derive2 { name="energy"; version="1.7-5"; sha256="15k9dg0a82cs9ypm0wpcsff3il1hzhnnv86dv5ngby1r144czhi4"; depends=[boot Rcpp]; }; + endtoend = derive2 { name="endtoend"; version="2.29"; sha256="0dqzh2blb2h8ngchvfvnzx0gmilvx9ydvzqwfy4d9f58ixybn4d9"; depends=[ggplot2 pastecs]; }; + energy = derive2 { name="energy"; version="1.7-6"; sha256="16m8bxfgr9sdisjy2qrv6fv5xxwcc9q890l0hpbwq6qzisrdn3lh"; depends=[boot Rcpp]; }; energyr = derive2 { name="energyr"; version="0.1.2"; sha256="0gjw2cvpvhyywxlx3vfkhlh7zjwig46z1zwdc01zxwflvdx3z40n"; depends=[RgoogleMaps]; }; enetLTS = derive2 { name="enetLTS"; version="0.1.0"; sha256="0lqnhrsg9fnkn8z5crdrajpgavk1knr9z4sbdffpa6q9n8s5pmhr"; depends=[cvTools ggplot2 glmnet reshape robustHD]; }; english = derive2 { name="english"; version="1.2-3"; sha256="1gyj3wzx9spibmly7blw2i3gx9gvy22iy8js4r9gn8d3hpv4yf98"; depends=[]; }; engsoccerdata = derive2 { name="engsoccerdata"; version="0.1.5"; sha256="06fdgjgnk4lwshrkd0jad411x5nz9sxlri9fdhxrf2dr2hik4l8q"; depends=[dplyr magrittr tidyr]; }; enpls = derive2 { name="enpls"; version="6.1"; sha256="12088v9xnj5b3dlakqz1hbzxz4mdai7xi7s2fpx8lj3y3lx7znmb"; depends=[doParallel foreach ggplot2 plotly pls reshape2 spls]; }; - enrichR = derive2 { name="enrichR"; version="1.0"; sha256="0lfdr45sdyqhvgz8q4qdbk12mpv86d6id665kq6aaslgr8jggfmn"; depends=[httr rjson]; }; + enrichR = derive2 { name="enrichR"; version="2.0"; sha256="056m6hksfss29fj7zvlk7pbh8g3gq84kjh3240isrsnhp9m1h9iz"; depends=[httr rjson]; }; enrichvs = derive2 { name="enrichvs"; version="0.0.5"; sha256="0x91s03hz1yprddm6mqi75bm45ki3yapfrxmap7d4qc0hi06h22k"; depends=[]; }; enrichwith = derive2 { name="enrichwith"; version="0.2"; sha256="063q4jbs6054djk6qf3105p7na4kndvr549w5c4fiz8264r8bnvv"; depends=[]; }; ensembleBMA = derive2 { name="ensembleBMA"; version="5.1.5"; sha256="0p744151pbj278lyc8d8p7rc20n70abpfgxz6jr10jarmq3r6x7l"; depends=[chron]; }; @@ -6968,11 +7069,12 @@ in with self; { epitab = derive2 { name="epitab"; version="0.2.2"; sha256="0yi65bblsikwsa9i7wys1mqf6pp6j01kyc8xkyrhs5n62y1k68nc"; depends=[kableExtra knitr MASS survival xml2]; }; epitools = derive2 { name="epitools"; version="0.5-10"; sha256="1qqa2kam3j3mkbgk62g6lwygk2fkdlrpbi27wl37j4dkdkvx013m"; depends=[]; }; epitrix = derive2 { name="epitrix"; version="0.2.2"; sha256="1rqpvdky002h6mz636b77l4kd0im16pww62l6vnwh83si1m9pkki"; depends=[distcrete sodium stringi]; }; - eplusr = derive2 { name="eplusr"; version="0.10.2"; sha256="1lspyqqcq745p1p54bds9v4cqw0gn7hqs7dsvwhnlkilkx05h5vw"; depends=[callr cli crayon data_table later lubridate processx progress R6 RSQLite stringi units]; }; + eplusr = derive2 { name="eplusr"; version="0.10.3"; sha256="1mmzqbn1zhc742cqblmwpc4k94r0zqmzwyxi5sv5d11dfj5mszzd"; depends=[callr cli crayon data_table later lubridate processx progress R6 RSQLite stringi units]; }; eply = derive2 { name="eply"; version="0.1.2"; sha256="0al44pvqf6ls3dh129vlv3g56hk1nbql09rj0qsb04d9kaz9anrp"; depends=[magrittr]; }; epoc = derive2 { name="epoc"; version="0.2.6-1"; sha256="0q17sf2q3yj9sia9m1d23q6li6fkvgmj2a73kl1im8aiaxwcq2m1"; depends=[elasticnet irr lassoshooting Matrix survival]; }; epos = derive2 { name="epos"; version="0.1.0"; sha256="0b9r552hbrs281z7pxxw1hxgv9d15qmyzvgk5xsrgh8wivkh4lwp"; depends=[dplyr ggplot2 gridExtra hashmap stringr testthat tidyr TopKLists xtable]; }; epr = derive2 { name="epr"; version="3.0"; sha256="0czfz6qkcpa2qqs3pqii27hgpdvdzfrvxl0ip67v58hamq7kvjfv"; depends=[car lme4]; }; + epsiwal = derive2 { name="epsiwal"; version="0.1.0"; sha256="0lmcmiqcc1pjj1d0zyn0hc23if1lkm85p6vcjqbddpnv9ags2mbh"; depends=[]; }; epubr = derive2 { name="epubr"; version="0.6.0"; sha256="0zzra5vpfsw62c19yah7fwm8xlrwnrlsb34d46wd1ssays6arf01"; depends=[dplyr magrittr tidyr xml2 xslt]; }; epxToR = derive2 { name="epxToR"; version="0.3-0"; sha256="0ckz7cvqsdilfkqap88brh4av9zv1fl3ijs4h4vlwwn7qvdcnhay"; depends=[httr XML]; }; eq5d = derive2 { name="eq5d"; version="0.2.0"; sha256="1h2mpj3l6wcwfkj1yzc4w17yzr2ir21zvz7qpv1h1b7qjdkbcrw4"; depends=[]; }; @@ -6991,6 +7093,7 @@ in with self; { erboost = derive2 { name="erboost"; version="1.3"; sha256="09hlpn6mqsmxfrrf7j3iy8ibb2lc4aw7rxy21g3pgqdmd9sbprim"; depends=[lattice]; }; ercv = derive2 { name="ercv"; version="1.0.0"; sha256="1h0v0gscf1ks1shkdvkn1g8r8x5jsb66a4m7rnpdfwbp2ijh41gp"; depends=[]; }; erer = derive2 { name="erer"; version="2.5"; sha256="0wgzd7r63d20vghmbilqn1p5033i5p31asya1gzwlipgyfxmqp0b"; depends=[lmtest systemfit tseries urca]; }; + ergMargins = derive2 { name="ergMargins"; version="0.1.0"; sha256="0f65150ahlxx75k72f2shmlryq5qbszl9p0qxxpl87sfpclsaa0x"; depends=[btergm ergm Matrix network numDeriv statnet xergm_common]; }; ergm = derive2 { name="ergm"; version="3.10.4"; sha256="08hzhc06sfchbq8kq5yvs7gxz0v6nvx0qdb2g6ac38n54cd0npw8"; depends=[coda dplyr lpSolve MASS Matrix network purrr rlang robustbase statnet_common tibble trust]; }; ergm_count = derive2 { name="ergm.count"; version="3.4.0"; sha256="1bvbqckssqj91q56nz17mrvadk1i2mm301z9rj8qkh8116fwf93w"; depends=[ergm network statnet_common]; }; ergm_ego = derive2 { name="ergm.ego"; version="0.5"; sha256="1vvyfjvkddc1qr189wqbp8sbqmd317y71ml9jjjjns3znahriqv3"; depends=[coda ergm network purrr RColorBrewer rlang statnet_common tibble]; }; @@ -7004,7 +7107,7 @@ in with self; { errint = derive2 { name="errint"; version="1.0"; sha256="1ya7fsvwhmgxw87r32m4345n8pw2pbpv026xvml03s1kiam8qwbw"; depends=[rootSolve VGAM]; }; errorist = derive2 { name="errorist"; version="0.0.2"; sha256="061v8z11sgzbhzcnyixfv9ff0vhiszjh0dy1rvzbyjsvjzmdimq0"; depends=[searcher]; }; errorizer = derive2 { name="errorizer"; version="0.2.1"; sha256="10p7ydm81x2gls0wn692llgj2rxhg4s96rv7gvihmgi5dflraypq"; depends=[]; }; - errorlocate = derive2 { name="errorlocate"; version="0.1.3"; sha256="0hfm0nad1bfh7a37zpn4aljrf69yc6dddz9iq46c1mzyrw116a9f"; depends=[lpSolveAPI validate]; }; + errorlocate = derive2 { name="errorlocate"; version="0.2.0"; sha256="0lm0fp7b4ggx744b7kymman813rqw18qr7pd8r3j52spy3kq90lk"; depends=[lpSolveAPI validate]; }; errors = derive2 { name="errors"; version="0.3.2"; sha256="1079jiv323r19paycwmnr9qirh4z0hv22qqmciy2afqpyw5diqh2"; depends=[]; }; es_dif = derive2 { name="es.dif"; version="1.0.1"; sha256="0cpncj68dhqfcpw7fjqc23d84rq767hqpw6la6iszfrrc27bx4lw"; depends=[]; }; esDesign = derive2 { name="esDesign"; version="1.0.2"; sha256="16dhddw4gp210bb1mmx5df1ziffadiz06s4i3znnzac8rv5564hp"; depends=[]; }; @@ -7015,8 +7118,8 @@ in with self; { eseis = derive2 { name="eseis"; version="0.4.0"; sha256="023j91j5s5b84gcgi6i9gs7ky1f8ncimlx2c5s6w37kh13nfhcby"; depends=[caTools fftw IRISSeismic matrixStats multitaper raster Rcpp rgdal rmarkdown signal sp XML]; }; eshrink = derive2 { name="eshrink"; version="0.1.0"; sha256="0s1jl652za7qwv70kmc1h3vbwlijl49527pwpm0z347lz2jdcigj"; depends=[glmnet MASS]; }; esmisc = derive2 { name="esmisc"; version="0.0.3"; sha256="1d6xrdxwn85c8s60s7vzaymh7wa9f7fzd79hq5spzd12fr3zisvj"; depends=[ggplot2 raster readr]; }; - esmprep = derive2 { name="esmprep"; version="0.1.4"; sha256="1d1rr11fldxsamn19za03sdyvvybkh3bm5zvlrlkz022jj7pgxlr"; depends=[lubridate]; }; - esquisse = derive2 { name="esquisse"; version="0.2.0"; sha256="16w8jw83lykxh39p7pb5nal3wqlb6q4xjjn4x2lwjv6qlms6axri"; depends=[ggplot2 ggthemes htmltools jsonlite miniUI RColorBrewer rlang rstudioapi scales shiny shinyWidgets stringi]; }; + esmprep = derive2 { name="esmprep"; version="0.2.0"; sha256="076sm26mkkvig2g04k32z2dlp2h9gnqgzckhirl4pqm01siknl61"; depends=[lubridate]; }; + esquisse = derive2 { name="esquisse"; version="0.2.1"; sha256="0639b0hd83hx1qbp5rymqif5bcziv883xawx8fs89pwp4484lnkz"; depends=[ggplot2 ggthemes hrbrthemes htmltools jsonlite miniUI RColorBrewer rlang rstudioapi scales shiny shinyWidgets stringi]; }; esreg = derive2 { name="esreg"; version="0.4.0"; sha256="1qfidbmdrm4vy72yjnpaadhm993xv6qqy44a8hk0l4isvmg51a5i"; depends=[Formula quantreg Rcpp RcppArmadillo]; }; essHist = derive2 { name="essHist"; version="1.2.2"; sha256="0rvlxfcl42h4pjqf37mx7bc4k21iwvnys6l5rf2jsl7yk1b9hmbn"; depends=[Rcpp]; }; essurvey = derive2 { name="essurvey"; version="1.0.2"; sha256="0r1hkdksidx974pi08hg25qlzfxazqmzamwqg2njks2r9xk299p8"; depends=[haven httr rvest stringr xml2]; }; @@ -7045,7 +7148,7 @@ in with self; { ev_trawl = derive2 { name="ev.trawl"; version="0.1.0"; sha256="14yhnhqq1gz2rfy13v1dybnf55pyyimajbarxyp7gaqnd66nfq3p"; depends=[eva evir fExtremes ghyp hypergeo testthat]; }; eva = derive2 { name="eva"; version="0.2.5"; sha256="03hyzbqi2mgdrmzrjnwzvy0ndf7ha5959b63sgd1g0b998fibbmd"; depends=[EnvStats Matrix]; }; evaluate = derive2 { name="evaluate"; version="0.14"; sha256="0a2y7j534gbgixkwj9r1z76l2vssw4g1hznzbpclc076wkdqpj58"; depends=[]; }; - evaluator = derive2 { name="evaluator"; version="0.4.0"; sha256="0f2l79jbqy98hy1waiwm4kji6wfx22si8a8g0y4wq5r6brk48vid"; depends=[cli crayon dplyr extrafont ggplot2 magrittr mc2d purrr readr readxl rlang rstudioapi scales stringi tibble tidyr vctrs viridis]; }; + evaluator = derive2 { name="evaluator"; version="0.4.1"; sha256="1h1s2n09i6r9w17lr8ry9acg6kfsmf3c4w45jdwvz1pmy1ss8whi"; depends=[cli crayon dplyr extrafont ggplot2 magrittr mc2d purrr readr readxl rlang rstudioapi scales stringi tibble tidyr vctrs viridis]; }; evclass = derive2 { name="evclass"; version="1.1.1"; sha256="00lbhcgswpv0amz0mb93kx9p91sf0d7zvxfw9i8x1zpmpfd6nhcj"; depends=[FNN]; }; evclust = derive2 { name="evclust"; version="1.0.3"; sha256="0cd0a8w0ixd9ilcqlxiaql4l2r49qrqnllb9qpg3xgnlxka3yb5m"; depends=[FNN limSolve Matrix R_utils]; }; evd = derive2 { name="evd"; version="2.3-3"; sha256="1d2r8ppblxrq6s60pf0gv4rp8ja58j8lbpax8a996ais1hpfzi9g"; depends=[]; }; @@ -7072,11 +7175,14 @@ in with self; { exactLoglinTest = derive2 { name="exactLoglinTest"; version="1.4.2"; sha256="0j146ih9szzks9r45vq1jf47hrwjq081q1nsja5h1gpllks8217h"; depends=[]; }; exactRankTests = derive2 { name="exactRankTests"; version="0.8-30"; sha256="02lqs5pw9vii398jz8yr55jk8158xxxqrk1bf55b08xcccxdwrff"; depends=[]; }; exactci = derive2 { name="exactci"; version="1.3-3"; sha256="03r35f6dyrck5pf43ypb1sjwfnvkhjkm1mbms3wh67ayfs2ypn0s"; depends=[ssanv]; }; + exactextractr = derive2 { name="exactextractr"; version="0.1.0"; sha256="01pyzgyb7my8b3fcyg907x6m15lg9ma53i4nyp62x2iz5g120ijn"; depends=[raster Rcpp sf]; }; exactmeta = derive2 { name="exactmeta"; version="1.0-2"; sha256="1v807ns799qajffky4k18iah0s3qh2ava6sz5i85hwx9dhkz19h4"; depends=[]; }; - exampletestr = derive2 { name="exampletestr"; version="1.4.2"; sha256="17x5bs00dzlmvqwfjxvcf71laqkrhxrmd77mh1cba0dx9payp7yv"; depends=[checkmate clisymbols crayon filesstrings fs glue magrittr ore purrr readr rlang roxygen2 rprojroot stringr styler usethis]; }; - exams = derive2 { name="exams"; version="2.3-2"; sha256="1x69vnzfipibfpflp22m3win8017abmmlikykb6kpc71bfwdq0jn"; depends=[]; }; + exampletestr = derive2 { name="exampletestr"; version="1.5.1"; sha256="1rk92ld5s812a2njs4fwidz7s2yjwbs7gf8chp7hcjw7pw81nbm4"; depends=[checkmate filesstrings fs glue magrittr ore purrr readr rlang roxygen2 stringr styler usethis withr]; }; + exams = derive2 { name="exams"; version="2.3-4"; sha256="1sa76qnzf7llj97xc41l2s8n4fqlg1wcvyq9sq59f1blfwxcnnd7"; depends=[]; }; + excelR = derive2 { name="excelR"; version="0.2.0"; sha256="1cp8hkpj54nwi1jh3ywn17lkjjs4l88b3x50a31636xs12x01nnh"; depends=[htmlwidgets jsonlite]; }; excerptr = derive2 { name="excerptr"; version="2.0.0"; sha256="1xglpg9i45dd103ahj46lin42x9c8lgff2b5c4k3799gaki9sjzz"; depends=[checkmate reticulate]; }; excursions = derive2 { name="excursions"; version="2.4.4"; sha256="140p0vks40vsj1bi89rhdqih5jh7795pxzzqm9140vfiv8b0aya5"; depends=[Matrix sp]; }; + exdex = derive2 { name="exdex"; version="1.0.0"; sha256="0yl7m70k1lrs14v6v98p0m0cqmzyi0gn475wsiiy6z49kbwd7ys4"; depends=[chandwich Rcpp RcppArmadillo RcppRoll]; }; exif = derive2 { name="exif"; version="0.1.0"; sha256="12phqn5x1x0xs2xczl3064q983dalm261vqpyafhdcndm1y3gwbc"; depends=[Rcpp]; }; exifr = derive2 { name="exifr"; version="0.3.1"; sha256="0394f04wq5dnqbnbaq7gxv4ggis4kf3b8dhhjzlybsbip6nmv54x"; depends=[curl jsonlite plyr rappdirs tibble]; }; exiftoolr = derive2 { name="exiftoolr"; version="0.1.2"; sha256="18q23lmazqw5vjvpz9kbd8i8ljchm8nakh726ic3qqzsckl98psp"; depends=[curl jsonlite]; }; @@ -7091,14 +7197,14 @@ in with self; { explore = derive2 { name="explore"; version="0.4.3"; sha256="16m8xqzgnndrlw24n3bx6xvqdgbpi6zv8hwpbr47nd83zl77yvhw"; depends=[broom DBI dplyr DT ggplot2 gridExtra magrittr MASS odbc rlang rmarkdown rpart rpart_plot shiny]; }; exploreR = derive2 { name="exploreR"; version="0.1"; sha256="154j5wiiy9vqdvh1qvdkz2fdp2phcygbbjl7nj5nkn07xwxbsc77"; depends=[ggplot2]; }; expm = derive2 { name="expm"; version="0.999-4"; sha256="15k0acg2aqb2ajhwal6l7vhhp03m4lg579805d34554cl0kn9l2q"; depends=[Matrix]; }; - expoRkit = derive2 { name="expoRkit"; version="0.9.2"; sha256="0qlzz86cyfz2yyynz8bj28086d1pc93gvjy1idip80m7z6vsrsxq"; depends=[Matrix SparseM]; }; + expoRkit = derive2 { name="expoRkit"; version="0.9.4"; sha256="186wnnx0gygnzrhhnsjysvwqccpxrcgy4pnvkyz6v3kcgg0n2x6j"; depends=[Matrix SparseM]; }; export = derive2 { name="export"; version="0.2.2"; sha256="03i3jk4b9q1sak6m36p349bzqcwfq3bw6y8sgrw65475mrwipm4m"; depends=[broom flextable officer openxlsx rgl rvg stargazer xml2 xtable]; }; expose = derive2 { name="expose"; version="0.0.3"; sha256="0dlxlxm3g9d8vmgp13i1825z1jzah94ih1vyif46s43xq0nf9anj"; depends=[e1071 foreach gam ggplot2 glmnet Matrix nnet polspline RColorBrewer Rcpp repmis SuperLearner xgboost]; }; expp = derive2 { name="expp"; version="1.2.4"; sha256="00r5f80wnz91n0ksp1dvrxpd6zyfis2v3rizsnm7qqnnwj3d4q1c"; depends=[deldir rgeos sp spatstat spdep]; }; expperm = derive2 { name="expperm"; version="1.6"; sha256="0cybna0q3qn3slyc4lv5rby4pr0xkwq0h6n7hl1zhsaqv4c2zc5b"; depends=[Rcpp]; }; exprso = derive2 { name="exprso"; version="0.5.1"; sha256="02fz2awxxgf5avnnvv10kr20zvzdmal7z9jbmjxzw5kjqrcv7jci"; depends=[cluster e1071 frbs glmnet kernlab lattice MASS nnet plyr randomForest ROCR rpart sampling]; }; expsmooth = derive2 { name="expsmooth"; version="2.3"; sha256="0alqg777g7zzbjbg86f00p2jzzlp4zyswpbif7ndd0zr8xis6zdc"; depends=[forecast]; }; - expss = derive2 { name="expss"; version="0.8.11"; sha256="12vgymdjw4j2xz3bx4kz7r8v2b61v8ihcna32v89ihx5qyiy041c"; depends=[data_table foreign htmlTable magrittr matrixStats]; }; + expss = derive2 { name="expss"; version="0.9.0"; sha256="0kbbz8h2cy69d0jw7mxc673i64pns6nj3kc594k4r2b4jp867igg"; depends=[data_table foreign htmlTable magrittr matrixStats]; }; expstudies = derive2 { name="expstudies"; version="0.0.5"; sha256="07li3lf7gnziws452arv38dayc30dym30qkw5d3ifp6za1aih5pv"; depends=[dplyr lubridate magrittr Rcpp]; }; exptest = derive2 { name="exptest"; version="1.2"; sha256="0wgjg62rjhnr206hkg5h2923q8dq151wyv54pi369hzy3lp8qrvq"; depends=[]; }; exreport = derive2 { name="exreport"; version="0.4.1"; sha256="0vj60rchhrc5q6x1kv7b95fcmh2a5qynli2w54rrrw1nx54xm8c2"; depends=[ggplot2 reshape2]; }; @@ -7119,7 +7225,7 @@ in with self; { extremevalues = derive2 { name="extremevalues"; version="2.3.2"; sha256="0pyngxljdnjwnbwcb0gmxcirv70r1s1wyq4m1wm5rprpdj8v9xil"; depends=[gWidgets gWidgetstcltk]; }; extremis = derive2 { name="extremis"; version="0.90"; sha256="1cnwn70d9swks5b2y915l18gky9v23vaqlaaggshi0ghn3snb4sm"; depends=[emplik]; }; extremogram = derive2 { name="extremogram"; version="1.0.2"; sha256="13k869v6j4ik9p8w0gf1absvb45xbd3nnwghsz0ix7y0vyvry358"; depends=[boot MASS]; }; - exuber = derive2 { name="exuber"; version="0.2.1"; sha256="1sz3i6fqhdcmin4213xhxyz4ikb9565m2kp2gryb9is2wq5nk1h5"; depends=[doSNOW dplyr foreach ggplot2 glue gridExtra lubridate magrittr purrr Rcpp RcppArmadillo rlang tibble zoo]; }; + exuber = derive2 { name="exuber"; version="0.3.0"; sha256="1g0cr7lgj8j5qdvrm7zmafhqafi1iwln590pcmfrfs37cynd5fkx"; depends=[cli doSNOW dplyr foreach generics ggplot2 glue gridExtra lubridate purrr Rcpp RcppArmadillo rlang tibble tidyr zoo]; }; eyelinker = derive2 { name="eyelinker"; version="0.1"; sha256="1lwpm247czqm26zvv5c6lkhdxpp4svszfw74g9ys9vwvwhry9c15"; depends=[intervals magrittr plyr readr stringi stringr]; }; eyetracking = derive2 { name="eyetracking"; version="1.1"; sha256="0ajas96s25hjp3yrg42hp78qjhl1aih04mjirkskx32qsyq5hfpv"; depends=[]; }; eyetrackingR = derive2 { name="eyetrackingR"; version="0.1.8"; sha256="18bz8fhy2hph7h8mm7hdhjfhi5gznj4qcl05rk3n99hkxl24qn73"; depends=[broom dplyr ggplot2 lazyeval purrr tidyr zoo]; }; @@ -7128,7 +7234,7 @@ in with self; { ezglm = derive2 { name="ezglm"; version="1.0"; sha256="0x7ffk3ipzbdr9ddqzv0skmpj5zwazkabibhs74faxnld7pcxhps"; depends=[]; }; ezknitr = derive2 { name="ezknitr"; version="0.6"; sha256="060a2175zh1nhzmqgz1mpj2c6721n5w5bv695jj4rbl2s2b2h4qj"; depends=[knitr markdown R_utils]; }; ezpickr = derive2 { name="ezpickr"; version="1.0.5"; sha256="1x45ccma78cx9blxr0zsnmvrpja8mb1p89gk4mpip299f6bza869"; depends=[haven jsonlite magrittr mboxr purrr readr readxl stringr textreadr tibble writexl]; }; - ezplot = derive2 { name="ezplot"; version="0.2.2"; sha256="07ls5pfaykn7l9lygfqn9vvi821xqgwyzdc6zpyphj9nyran0480"; depends=[dplyr forcats ggplot2 magrittr rlang]; }; + ezplot = derive2 { name="ezplot"; version="0.3.1"; sha256="1cs5i3ik6q6s30z8nh6ckc68vcqkf1hnzy3wn6d0rypmny7jkfkc"; depends=[dplyr forcats ggplot2 rlang]; }; ezsim = derive2 { name="ezsim"; version="0.5.5"; sha256="03x75vmf75qsmk4zb09j7xrb11w31rpfwd3dvv12nwjgndh9bnld"; depends=[digest foreach ggplot2 Jmisc plyr reshape]; }; fANCOVA = derive2 { name="fANCOVA"; version="0.5-1"; sha256="034m2mmm6wmsjd41sg82m9ppqjf4b1kgw5vl2w7kzqfx0lypaiwv"; depends=[]; }; fAsianOptions = derive2 { name="fAsianOptions"; version="3042.82"; sha256="13p1r93rgnf03wj0kkfpw4w4dlzd1ypkam50xqpjfm38qm4zvkds"; depends=[fBasics fOptions timeDate timeSeries]; }; @@ -7163,7 +7269,7 @@ in with self; { facilitation = derive2 { name="facilitation"; version="0.5.2"; sha256="0gyqa3njyynvdhfziq33xqc7cjhszii67mk8809ncvh6abkdx1hw"; depends=[animation Matrix Rcpp]; }; factoextra = derive2 { name="factoextra"; version="1.0.5"; sha256="1l6m8k7qhdw8ndar8nhmym0lfyd1i2iszl1cicjax0vq23ss6xw1"; depends=[abind cluster dendextend FactoMineR ggplot2 ggpubr ggrepel reshape2 tidyr]; }; factoptd = derive2 { name="factoptd"; version="1.0.3"; sha256="1ir50im3kr1xhqk4qwrm2h5fq9gqgrwshbamvjlf8n1wnn03mcb6"; depends=[MASS partitions]; }; - factorMerger = derive2 { name="factorMerger"; version="0.3.6"; sha256="04l52w2lfihmwqk4xbv2i37jgkanhvmzcw2x7dmj3hmjymlr4yl0"; depends=[agricolae colorRamps dplyr forcats formula_tools ggplot2 ggpubr knitr magrittr MASS mvtnorm proxy reshape2 scales survival]; }; + factorMerger = derive2 { name="factorMerger"; version="0.4.0"; sha256="127k5h1gbbnjr6gxgck2n9glvvwkd69xq7n6gzmrq8gszk8v1x5m"; depends=[agricolae colorRamps dplyr forcats formula_tools ggplot2 ggpubr knitr magrittr MASS mvtnorm proxy reshape2 scales survival]; }; factorQR = derive2 { name="factorQR"; version="0.1-4"; sha256="1vl01fm5qfyhnqbl5y86vkr50b8cv07vzlqs3v6smqaqq6yp4lv4"; depends=[lattice]; }; factorcpt = derive2 { name="factorcpt"; version="0.1.2"; sha256="17hwlsrj0fx4x05p6xvs6kl43a24icmnrzyvpf2vam5imwvmpvmm"; depends=[doParallel fields foreach iterators Rcpp RcppArmadillo]; }; factorplot = derive2 { name="factorplot"; version="1.1-2"; sha256="025lfk122w66yxym3njcpzwnbhg40xi7p1c9vnxczcb8kz31745s"; depends=[multcomp nnet]; }; @@ -7193,10 +7299,10 @@ in with self; { fastAdaboost = derive2 { name="fastAdaboost"; version="1.0.0"; sha256="1pv1y6znvc37pgwk99v4r0hljhipq8v6r3r5cb5vhgyl0bfi8g38"; depends=[Rcpp rpart]; }; fastDummies = derive2 { name="fastDummies"; version="1.4.0"; sha256="1sakgfzgdf1mcaqqpbb808xsdalz8jxpyfb6ilal2rcy9s11ds0q"; depends=[data_table tibble]; }; fastGHQuad = derive2 { name="fastGHQuad"; version="1.0"; sha256="1rjia8wggadr9xwxcmzmal0rc4g6pa3dr5888fbbnb6abl8b2lrj"; depends=[Rcpp]; }; - fastGraph = derive2 { name="fastGraph"; version="1.3"; sha256="1qvzq6ncrv97vgnqgk58dkqhjdqg0svbzv4g3gr2slgnj8kh19gp"; depends=[]; }; + fastGraph = derive2 { name="fastGraph"; version="2.1"; sha256="0lz199607hqpwxzhff4jzhmjq6cbakd335iyclmlscllgfzgnhql"; depends=[]; }; fastHICA = derive2 { name="fastHICA"; version="1.0.2"; sha256="1h794ybbii0k7v3x0r1499zxdqa1i1dpi3i7idzqdrffnb5kmwlv"; depends=[energy fastICA]; }; - fastICA = derive2 { name="fastICA"; version="1.2-1"; sha256="108z2ymby5y4h8l4l2krqwm28rya93gq09yylgilnm3afvfrfabg"; depends=[]; }; - fastJT = derive2 { name="fastJT"; version="1.0.4"; sha256="1pa4qpcf4qmzk6s8qgk60n5ialz8gcj5m8d7xr10cmn4jfwghc7b"; depends=[Rcpp]; }; + fastICA = derive2 { name="fastICA"; version="1.2-2"; sha256="1zpijqcipm0aa3rxj0mys06lskqy4dbppjpxr1aby0j16y9ka8ij"; depends=[]; }; + fastJT = derive2 { name="fastJT"; version="1.0.5"; sha256="1knk4zjrkkv1i3a8n68vdrpxkwdkf19zw75p93hygfmbbz6r88v4"; depends=[Rcpp]; }; fastLink = derive2 { name="fastLink"; version="0.5.0"; sha256="1hgz4c26qlsdlp7gx0rsvkwn6xv86d7yk186sp7j6nfh2p9b1ccz"; depends=[adagio data_table doParallel dplyr FactoClass foreach gtools Matrix plotrix Rcpp RcppArmadillo RcppEigen stringdist stringi stringr]; }; fastM = derive2 { name="fastM"; version="0.0-4"; sha256="1n9a431w0hl4kr3pa32kcyd1d73acz4vb9vhfkckk3099mg46d9m"; depends=[Rcpp RcppArmadillo]; }; fastNaiveBayes = derive2 { name="fastNaiveBayes"; version="1.1.2"; sha256="0l50lyqwn0qxpnfp5aksw7ib5asigj43fbhmk2fza6a8ljgg4alg"; depends=[Matrix]; }; @@ -7215,6 +7321,7 @@ in with self; { fasterize = derive2 { name="fasterize"; version="1.0.0"; sha256="0q8n1r5n06yr6vmnwrdajx8923646bzm7ywgn2f0zxl214plf56s"; depends=[raster Rcpp RcppArmadillo sp]; }; fastglm = derive2 { name="fastglm"; version="0.0.1"; sha256="1vqw02j4y28mngki87r42f1mhlkvajqp2gpbvk0l2adrkz70l0bn"; depends=[Rcpp RcppEigen]; }; fastmaRching = derive2 { name="fastmaRching"; version="1.1.0"; sha256="085xr5i6h6vwl1flzbkwqsm8d815s0p02p0mir60jqjvy0s7haip"; depends=[raster rgdal sp]; }; + fastmap = derive2 { name="fastmap"; version="1.0.0"; sha256="1mmqxzcdb64mj5i9fgcxlp1d547fgamja743y40b8v85pw9yz5gz"; depends=[]; }; fastmatch = derive2 { name="fastmatch"; version="1.1-0"; sha256="0z80jxkygmzn11sq0c2iz357s9bpki548lg926g85gldhfj1md90"; depends=[]; }; fastnet = derive2 { name="fastnet"; version="0.1.6"; sha256="16jdwvk1xhl6bn9fx5s8pzvbizx6c0jmg6arqf201a7ghw2wi4xh"; depends=[doParallel foreach igraph tidygraph]; }; fastpseudo = derive2 { name="fastpseudo"; version="0.1"; sha256="0paag4pjh3gs270j663bsl65sfrq43gk2zzqmalr03fmcckp6aaj"; depends=[]; }; @@ -7244,7 +7351,7 @@ in with self; { fdadensity = derive2 { name="fdadensity"; version="0.1.1"; sha256="0jj5gprv3ihdjic261czqnv7c13mxsmjmv7gn2gv4483kgijlkz9"; depends=[fdapace Rcpp]; }; fdakma = derive2 { name="fdakma"; version="1.2.1"; sha256="0j9qgblrl7v4586dd6v0hjicli6jh8pkk5lzn8afpl75xfs24six"; depends=[]; }; fdapace = derive2 { name="fdapace"; version="0.4.1"; sha256="1k10j6nlsidyms1a0nnki46ddyyywpz8gnnnjm3k17wxyi69bmg1"; depends=[Hmisc MASS Matrix numDeriv pracma Rcpp RcppEigen]; }; - fdasrvf = derive2 { name="fdasrvf"; version="1.8.3"; sha256="1lqyadg17ddd3vksbaxc7bpwvk0afsd59rfg0n5wrgvhbd473s0y"; depends=[coda doParallel fields foreach matrixcalc mvtnorm Rcpp RcppArmadillo testthat viridisLite]; }; + fdasrvf = derive2 { name="fdasrvf"; version="1.9.2"; sha256="0hdxpin1ydc9sl9wp5axn6sj2mwlhndxya92ss1i8lj1cxmlz42d"; depends=[coda doParallel fields foreach matrixcalc mvtnorm Rcpp RcppArmadillo testthat tolerance viridisLite]; }; fdatest = derive2 { name="fdatest"; version="2.1"; sha256="0zdnmssir5jz2kbfz4f4xshjfv4pivqx7cbh2arlx6ypkjrjws8n"; depends=[fda]; }; fdcov = derive2 { name="fdcov"; version="1.1.0"; sha256="0savsgcifcjjqrmbpn6m30gncq5iigqxpb19l710wlx8nm98svjh"; depends=[corrplot matlab]; }; fdq = derive2 { name="fdq"; version="0.11"; sha256="1lzv1pmzjixp8wpap0w3lad1ns9z2hjbxkfpyp9jy9mxprj1w3q9"; depends=[data_table Fgmutils ggplot2 plyr randomcoloR sqldf]; }; @@ -7289,7 +7396,7 @@ in with self; { fhidata = derive2 { name="fhidata"; version="2019.6.24"; sha256="1lzv49nzf5j0gn88g8ilgp1vxwq2k7rji2vzzcxhmcdc1wir2nhk"; depends=[data_table]; }; fiberLD = derive2 { name="fiberLD"; version="0.1-6"; sha256="1i3bl2qsc77m81l11an9ihl4vy86s8jd5x6pasib77rl2877ad4x"; depends=[doParallel foreach Matrix VGAM]; }; fic = derive2 { name="fic"; version="1.0.0"; sha256="18xz94w1ab17jfi61bdg9z3pm63g488v17ns2ivizkza4gg07pv8"; depends=[abind ggplot2 mvtnorm numDeriv scales survival tensor]; }; - fieldRS = derive2 { name="fieldRS"; version="0.2.1"; sha256="04h6jwlpar5s0rv35379qr0f64ca3hg510qh62k896rn38z2265d"; depends=[caret concaveman ggplot2 raster rgeos sp spatialEco stringdist]; }; + fieldRS = derive2 { name="fieldRS"; version="0.2.2"; sha256="0jrcdsv46zx7six9ll5sha32wx36wqajaladj6z8xym2n9ay8d5b"; depends=[caret concaveman ggplot2 raster rgeos sp spatialEco stringdist]; }; fields = derive2 { name="fields"; version="9.8-3"; sha256="1q9x68dczjym56v7x90x4x5br59vj3dww6w8v42zd3yl17h7c1h1"; depends=[maps spam]; }; fiery = derive2 { name="fiery"; version="1.1.1"; sha256="07cfrzajr5knmz5ngczkdd2kzjfdnn1y4b0z73daxwhk4dq8j6ji"; depends=[assertthat crayon future glue httpuv later R6 reqres stringi uuid]; }; filehash = derive2 { name="filehash"; version="2.4-2"; sha256="14zv7h5195dmfksgk8qvjgc2qq8253vga6267aa1bqs5bpvmdl5n"; depends=[]; }; @@ -7301,15 +7408,16 @@ in with self; { files = derive2 { name="files"; version="0.0.1"; sha256="1vhhawqjjbb6fadkn3l10mvz63w3vmcwvl93fk0q9mhkifzlj9kc"; depends=[]; }; filesstrings = derive2 { name="filesstrings"; version="3.1.5"; sha256="072alawp6j08mwlw1pz50g3lfi726kpsc744x5fvy71d7w4gqn6l"; depends=[checkmate magrittr matrixStats ore rlang strex stringi stringr tibble withr]; }; filling = derive2 { name="filling"; version="0.2.0"; sha256="0yxixwgvn7jq09j4r3q33mmdda9a4anfi7y0xqscbdjz6p9bx48w"; depends=[CVXR nabor Rcpp RcppArmadillo Rdpack ROptSpace RSpectra]; }; - finalfit = derive2 { name="finalfit"; version="0.9.3"; sha256="1hwnk3rvvkh70k62x538j7jkfq03v3gw1r5r7sq45jjsic62k79j"; depends=[boot broom dplyr forcats GGally ggplot2 gridExtra Hmisc lme4 magrittr mice pillar plyr pROC purrr readr scales stringr survival survminer tibble tidyr]; }; + fillr = derive2 { name="fillr"; version="0.1.1"; sha256="01z4841hxnpf8s9s327fqprb4gl9k8pkyv2mgc5vfl86r1pd7m1b"; depends=[]; }; + finalfit = derive2 { name="finalfit"; version="0.9.4"; sha256="01qyigr29pxk89bn9qkmbjzxsks06an15r8apbh1ks5ykj442a70"; depends=[boot broom dplyr forcats GGally ggplot2 gridExtra Hmisc lme4 magrittr mice pillar plyr pROC purrr readr scales stringr survival survminer tibble tidyr]; }; finch = derive2 { name="finch"; version="0.3.0"; sha256="1cglyq3b0cvl05yrnpy6xn0nj0n817hgpcsxp3m07cvj8xidib02"; depends=[data_table digest EML hoardr plyr rappdirs xml2]; }; findR = derive2 { name="findR"; version="0.2.1"; sha256="1a7cf6kd7i2l4ffr2b17nb9xnpsjhf6fcwpjy06r0qgcapnfp54b"; depends=[pdftools stringr]; }; findpython = derive2 { name="findpython"; version="1.0.5"; sha256="0icifm4z6hhpmcjrg75a875iph0ci890ss02kdv3725pijc236iy"; depends=[]; }; findviews = derive2 { name="findviews"; version="0.1.3"; sha256="1l1yhw5hvrn0rpkdsch8m69d2q5284jwccvv7r4ia4m0iqjfipj7"; depends=[ggplot2 gridExtra scales shiny]; }; fingerPro = derive2 { name="fingerPro"; version="1.1"; sha256="1a1lj8gyrbgcg8hr03cj2bjzlaafddspri7abc83ys1raqwd4j68"; depends=[car GGally ggplot2 gridExtra klaR MASS plyr Rcmdr Rcpp RcppGSL RcppProgress reshape rgl scales]; }; fingerprint = derive2 { name="fingerprint"; version="3.5.7"; sha256="04jcwkydjrs31pia6kq8z2n9s54im950q08hs2ay15xjxxkmb8ic"; depends=[]; }; - fingertipsR = derive2 { name="fingertipsR"; version="0.2.6"; sha256="1i84q4yir2cwz96q5khdssia11nl3s12cp6rpaijfdyllqzivxh1"; depends=[curl dplyr DT httr jsonlite miniUI purrr readr shiny shinycssloaders]; }; - fingertipscharts = derive2 { name="fingertipscharts"; version="0.0.6"; sha256="0dazy49mzw5y2nj2ag3h9bncj5cma60885j37lkjij01swil0mkk"; depends=[curl dplyr fingertipsR geojsonio ggplot2 leaflet lemon mapproj purrr rlang scales sf stringr tibble tidyr]; }; + fingertipsR = derive2 { name="fingertipsR"; version="0.2.7"; sha256="0yriyw3qzxs9g0cfl9mk80mfpmfdx8l554gk03ps8ji497w94rql"; depends=[curl dplyr DT httr jsonlite miniUI purrr readr shiny shinycssloaders]; }; + fingertipscharts = derive2 { name="fingertipscharts"; version="0.0.8"; sha256="0hcbmzkzh3mnh6mk2yg21midkjgj5w03xw18qhq6mgpz8rcv7jm7"; depends=[curl dplyr fingertipsR geojsonio ggplot2 leaflet lemon mapproj purrr rlang scales sf stringr tibble tidyr]; }; finiteruinprob = derive2 { name="finiteruinprob"; version="0.6"; sha256="0z4l0crymh58chxniqq70fqmvi6f5jkgvz72vbc7s3l9lrrapgr3"; depends=[numDeriv sdprisk]; }; finreportr = derive2 { name="finreportr"; version="1.0.1"; sha256="1mansiyl4p4zqc1h2aw9zgzb3fy4mppgmshdm8mcf4nbm340g4vk"; depends=[curl dplyr httr rvest XBRL xml2]; }; firebehavioR = derive2 { name="firebehavioR"; version="0.1.2"; sha256="10krny60dkpgwjjnriap91qmrnfq1rl5ck4ynf4h6x016bv0m374"; depends=[ggplot2]; }; @@ -7323,7 +7431,7 @@ in with self; { fit_models = derive2 { name="fit.models"; version="0.5-14"; sha256="0vjbzmx0ambm6yzidb4vbgmhclwzwv2iz2cwl54ccdkvx4cx3fck"; depends=[lattice]; }; fit4NM = derive2 { name="fit4NM"; version="3.3.3"; sha256="0k2194521yby6xxi77bpjp6ywz8kpnzws217m7n0hw6xwz5mqj1g"; depends=[cairoDevice gWidgets gWidgetsRGtk2 RGtk2 tkrplot]; }; fitDRC = derive2 { name="fitDRC"; version="1.1.1"; sha256="09z9l27iwl0fd3zy6rsdhmy8qbm5d9a4wcaj5rxp7ynlnpi102aa"; depends=[]; }; - fitODBOD = derive2 { name="fitODBOD"; version="1.4.0"; sha256="0ziljws5dya9w1ak16yx5y3x1l6r3kv0bw98n9pbgqrqh36bis5y"; depends=[hypergeo]; }; + fitODBOD = derive2 { name="fitODBOD"; version="1.4.1"; sha256="06yqp95k13d5zy4md12aqlk8yjk9g7hnnizjzksx46sh6rsn82aw"; depends=[bbmle hypergeo]; }; fitPoly = derive2 { name="fitPoly"; version="3.0.0"; sha256="0ws1vsh8if9i9i7820ak32b0bysjc0z09nbrk17qpms0b11cpc3g"; depends=[foreach]; }; fitTetra = derive2 { name="fitTetra"; version="1.0"; sha256="0ia6wk4gicpmn6kclsd28p7v1npwfv2blagiz0cxzwfw3njv103g"; depends=[]; }; fitbitScraper = derive2 { name="fitbitScraper"; version="0.1.8"; sha256="0b4d7xw6inp6l1dkfwyrzxwg4vspp4vzlwrhv14ajxrqz6irj8a0"; depends=[httr jsonlite stringr]; }; @@ -7332,7 +7440,7 @@ in with self; { fitplc = derive2 { name="fitplc"; version="1.2-3"; sha256="1yg3ch907c4gk7q8hxgwqxgngkmy125j3ni917nkzi7hn59krd1n"; depends=[car nlme]; }; fitteR = derive2 { name="fitteR"; version="0.1.0"; sha256="1kgnyl7am966vkfap8gmvchlpankrcj5dv5aj7ws8ix9shr76db6"; depends=[dplyr DT maxLik R_utils shiny]; }; fitur = derive2 { name="fitur"; version="0.6.1"; sha256="04lr717lsbb4731nlzgscraj30knik4q68jzrl4i5f27912159r9"; depends=[actuar DT e1071 fitdistrplus ggplot2 goftest miniUI rstudioapi shiny]; }; - fivethirtyeight = derive2 { name="fivethirtyeight"; version="0.4.0"; sha256="1sdj5b365hi11dd2yxvg9w3fz3rx9rbv1nnhf5i8v2ydg4kqyrws"; depends=[]; }; + fivethirtyeight = derive2 { name="fivethirtyeight"; version="0.5.0"; sha256="00cc7kjs54wk2cxbkd14gldsrjmf4i35vwr6c2kfsassvjjhbmpm"; depends=[]; }; fixedTimeEvents = derive2 { name="fixedTimeEvents"; version="1.0"; sha256="0z7ji8yzp4pj76ad64l7ivknkbi82ijx6abd3a18wicqhrh433sj"; depends=[]; }; fixerapi = derive2 { name="fixerapi"; version="0.1.6"; sha256="0ikf8dn0l9c9gshp4bph3wasl0bh6lfybinc8n1rvb202231hmgb"; depends=[jsonlite tibble tidyr]; }; fizzbuzzR = derive2 { name="fizzbuzzR"; version="0.1.1"; sha256="119gbi9y4n8r52hk9vj7zf795dv9xnk7lnngljjcd7ydnhygwd4h"; depends=[]; }; @@ -7340,17 +7448,17 @@ in with self; { flagr = derive2 { name="flagr"; version="0.3.2"; sha256="195c78cml2pjzfvpkaxbzcg1dfdqxi76138p0v3x3zzva9d8nlji"; depends=[]; }; flam = derive2 { name="flam"; version="3.2"; sha256="0v6kcl4n7wq052p7jdgbzlh9fpk8bzlrqw12i6pib1wd3slj0asa"; depends=[MASS Rcpp]; }; flan = derive2 { name="flan"; version="0.7"; sha256="1r1vkf207k0il7r314gq1lxz0ndhdbbvx338mn8zhrkrd2ln9hpq"; depends=[lbfgsb3 Rcpp RcppArmadillo RcppGSL]; }; - flare = derive2 { name="flare"; version="1.6.0"; sha256="0ygif9a7a99qwv0b488wymmmncp6f5ww9yz13s4qs6p8yf37x1r1"; depends=[igraph lattice MASS Matrix]; }; + flare = derive2 { name="flare"; version="1.6.0.2"; sha256="1ybrsx1djqldw0l5l1iz4pfh6xxb8ckkg1ric7wnsr51wm9ljlh5"; depends=[igraph lattice MASS Matrix]; }; flars = derive2 { name="flars"; version="1.0"; sha256="06qma1ar1nj7n6g9alk1qydm5bkj6lsjx0pqkikxpb41d91civqk"; depends=[fda MASS Matrix Rcpp RcppEigen]; }; flashClust = derive2 { name="flashClust"; version="1.01-2"; sha256="0l4lpz451ll7f7lfxmb7ds24ppzhfg1c3ypvydglcc35p2dq99s8"; depends=[]; }; flatr = derive2 { name="flatr"; version="0.1.1"; sha256="10l98a3f57wahfpdqxj70r25zfhk4vzzd014pdnriy458yrfd7rw"; depends=[dplyr magrittr tibble]; }; flatxml = derive2 { name="flatxml"; version="0.0.2"; sha256="1f7pc3chzimkg23490qvppy63sk4ds3aaahc36sa4dc4qmhabyms"; depends=[RCurl xml2]; }; - flexCWM = derive2 { name="flexCWM"; version="1.9"; sha256="02afmg7d008mfgja7pqxk0fdgmgqk9vq7xy13ijancg6fm3x8prk"; depends=[ContaminatedMixt mclust numDeriv statmod]; }; flexPM = derive2 { name="flexPM"; version="2.0"; sha256="0h3qs9w9pc2nc24q1diz7j3s93y40ijpmgq2l0xg9mzcgjz9kz8c"; depends=[survival]; }; flexclust = derive2 { name="flexclust"; version="1.4-0"; sha256="0x7wxk8y46ndyz6fdacym0rd6p9wh3pcfr28chjcg5d7fm849zl2"; depends=[class lattice modeltools]; }; flexdashboard = derive2 { name="flexdashboard"; version="0.5.1.1"; sha256="0fy3nbrr67zqgd44r2mc850s5sp0hzfcw3zqs15m8kxzj1aw067x"; depends=[htmltools htmlwidgets jsonlite knitr rmarkdown shiny]; }; flexmet = derive2 { name="flexmet"; version="1.0.0.0"; sha256="0xhr4i46s3k7a4yz2sd1sphn8wz27xcl580s2kqkr1ifg8941kv8"; depends=[]; }; flexmix = derive2 { name="flexmix"; version="2.3-15"; sha256="0hrz2axp2c9548b1r0bmrl57219nn030qndb83a8garkzq5lqi5s"; depends=[lattice modeltools nnet]; }; + flexmixNL = derive2 { name="flexmixNL"; version="0.0.1"; sha256="0bk5v0cnsn1qkd1b86vj0bnpr4l9d6523kpkgzb1l1sqyscawfmm"; depends=[flexmix gnm]; }; flexrsurv = derive2 { name="flexrsurv"; version="1.4.1"; sha256="13jq7yk7rz2148wkf7dv28l79zwdf1gpfkd5khgacb8hl5kml3p0"; depends=[Epi formula_tools matrixcalc orthogonalsplinebasis survival]; }; flexsurv = derive2 { name="flexsurv"; version="1.1.1"; sha256="0x7p1rv51pplfyyzcg63ssb8z56mig7y0363hkr0219w3cvyq9nr"; depends=[deSolve mstate muhaz mvtnorm quadprog Rcpp survival tibble tidyr]; }; flexsurvcure = derive2 { name="flexsurvcure"; version="0.0.2"; sha256="1lhw2z8i4l822ncziwpw6hg0dzc244q60n7l5aahgdhcr0xgylhz"; depends=[flexsurv gtools survival]; }; @@ -7360,7 +7468,7 @@ in with self; { flippant = derive2 { name="flippant"; version="1.1.0"; sha256="06aj90y7c33c1q0nw1c67vr1pfmp9fw78az6ivrbq110f2k1m12w"; depends=[assertive_files assertive_numbers assertive_properties assertive_strings assertive_types data_table ggplot2 magrittr minpack_lm plyr RcppRoll stringi withr wmtsa]; }; flipscores = derive2 { name="flipscores"; version="0.2"; sha256="0b55qxdrn6m0pbk4aj9zr1d9s7id6pclsaz939p48jmqx07zayjg"; depends=[]; }; float = derive2 { name="float"; version="0.2-3"; sha256="1sf0pj5543alh25b96fw8jjsmiaky3r4nw9xhn349gv50rf0nhrj"; depends=[]; }; - flobr = derive2 { name="flobr"; version="0.1.0"; sha256="0i4n5mqpg0i0ysncm8b99a8lnqph01yfiwiw1nar7qpxszai0399"; depends=[blob checkr err]; }; + flobr = derive2 { name="flobr"; version="0.2.0"; sha256="1pwk190bj1f8312bg95hj5y19ripm2jf6l1cbbsmfh2xw5x0xz0z"; depends=[blob checkr]; }; flock = derive2 { name="flock"; version="0.7"; sha256="1zg93p74icj4bhxnmnssj2xp6vw4yaksyavq03497v33xfpdxss7"; depends=[Rcpp]; }; flood = derive2 { name="flood"; version="0.1.1"; sha256="0nlmjh2l7dij1aqd70hhj0m550knlin3am14azqkx4pacs1kir3p"; depends=[copula evd magrittr TLMoments]; }; flora = derive2 { name="flora"; version="0.3.0"; sha256="1nsc2q6y02shpk70p44rr7nl7pnj6as7jgdyakxqs64imwais8x2"; depends=[dplyr httr jsonlite stringdist]; }; @@ -7378,7 +7486,6 @@ in with self; { fma = derive2 { name="fma"; version="2.3"; sha256="1z7shh9ng3q7ax22cwg86y79jzz5gbchdny2rppzzm0lkvvyy5pm"; depends=[forecast]; }; fmbasics = derive2 { name="fmbasics"; version="0.3.0"; sha256="1dnf09rgwpc7n7ydlp7r5cwy2fa4vh1h9mbjqzfhk0208kz6jpl0"; depends=[assertthat fmdates lubridate tibble]; }; fmdates = derive2 { name="fmdates"; version="0.1.4"; sha256="1bbcwkh65nf2gak9b81zgg32c5ihwhmai3nc43ayf6ivhqsxw8x0"; depends=[assertthat lubridate]; }; - fmlogcondens = derive2 { name="fmlogcondens"; version="1.0.2"; sha256="0slmwzcmsl5cfgif6d47xfjknmap0x45cql339dyamwmhqm968rk"; depends=[geometry MASS mclust mvtnorm]; }; fmri = derive2 { name="fmri"; version="1.9"; sha256="1v7aicpds7zbh7p0vizrg5730f98ikqzrp6gmjw9psjwfxv0kmf6"; depends=[aws awsMethods metafor nlme]; }; fmriqa = derive2 { name="fmriqa"; version="0.3.0"; sha256="1z09nf1c305a78c129jvs21b9z91wyhazz41wrn4bimmhfhx7szv"; depends=[ggplot2 gridExtra imager optparse pracma RcppEigen reshape2 RNifti tidyr viridisLite]; }; fmrs = derive2 { name="fmrs"; version="1.0-9"; sha256="1x9g67701kcnz3p97iynr74sn0mfpxpp16mv1l4zxlhhfn2v5lwx"; depends=[survival]; }; @@ -7386,7 +7493,7 @@ in with self; { foba = derive2 { name="foba"; version="0.1"; sha256="1af8whgl66v0vwzdf03b6141k3dysdc0svymlgifcga5gqkwzsl0"; depends=[]; }; focusedMDS = derive2 { name="focusedMDS"; version="1.3.3"; sha256="18s86dbbpyajscqr9frprf2vp1zif7vh4lw5m0cjskfc6gmsdp2p"; depends=[htmlwidgets]; }; foghorn = derive2 { name="foghorn"; version="1.1.0"; sha256="161smkvx1pzn8sskr137iiqhcm0jp5rrrmc1valamh0zz5glcdk8"; depends=[clisymbols crayon curl httr jsonlite rvest tibble xml2]; }; - foieGras = derive2 { name="foieGras"; version="0.2.1"; sha256="1l2aajf1wvr17nk0vzn9a6sp5ihgcxq3jxk8yiy0lwrj24qqm4a0"; depends=[argosfilter dplyr ggplot2 gridExtra lubridate magrittr RcppEigen sf stringr tibble TMB]; }; + foieGras = derive2 { name="foieGras"; version="0.2.2"; sha256="0nllvq81py74hgjci0n0lbi0flr3rrc1ki39xnidpcqkdp9n8ddx"; depends=[argosfilter dplyr ggplot2 gridExtra lubridate magrittr RcppEigen sf stringr tibble TMB]; }; folderfun = derive2 { name="folderfun"; version="0.1.2"; sha256="08kfw7i5xqbk07ssp4j79p3x0gf0jq2fbcq99lb10r6ndcgp5rxp"; depends=[]; }; fontBitstreamVera = derive2 { name="fontBitstreamVera"; version="0.1.1"; sha256="0nipdlmhjv1wr3aidcl97nk6mppdkd65krgwqnhdsnv0jpfv761j"; depends=[]; }; fontHind = derive2 { name="fontHind"; version="0.1.1"; sha256="0qz3bj8vdy6jayy84p3vyxfwqll4v4qlklwq9wl981ii2k7g0vxf"; depends=[extrafont ggplot2 hrbrthemes]; }; @@ -7398,19 +7505,20 @@ in with self; { foolbox = derive2 { name="foolbox"; version="0.1.1"; sha256="06lcr5v6bcqqxskrwdm16b46zq4h67x8bwqya88jxs5bgi5w0hj3"; depends=[magrittr rlang]; }; forams = derive2 { name="forams"; version="2.0-5"; sha256="1fh3m9896ksv1h7b027yb955bzyv70yafhqvn5crkzalzk3jpb0s"; depends=[vegan]; }; forcats = derive2 { name="forcats"; version="0.4.0"; sha256="1cnjh23z59fhbjmy7y95425hcq3m5wrwqvahsxwi7zm6d9bwp0vw"; depends=[ellipsis magrittr rlang tibble]; }; - foreSIGHT = derive2 { name="foreSIGHT"; version="0.9.6"; sha256="0vz80p227fvw18rrar5d1ikz42j47jsly0h1wmiy9gww14rcnncd"; depends=[cowplot directlabels doParallel GA ggplot2 moments zoo]; }; - foreach = derive2 { name="foreach"; version="1.4.4"; sha256="0j2yj0rn0d5nbzz9nq5rqqgnxhp9pbd92q4klsarl2xpsn8119y0"; depends=[codetools iterators]; }; + foreSIGHT = derive2 { name="foreSIGHT"; version="0.9.8"; sha256="1kpk8p50xq3jrmapqyf56a5lnxkdvlafp5709wvqxq9rnsslpv2g"; depends=[cowplot directlabels doParallel GA ggplot2 moments zoo]; }; + foreach = derive2 { name="foreach"; version="1.4.7"; sha256="0q7iyniw5iri4hl57bhil3r69s5wnaijzn0q0x4h3z42245jqqwm"; depends=[codetools iterators]; }; forecTheta = derive2 { name="forecTheta"; version="2.2"; sha256="1a7ip3czm8k82kb8dx95m8q47kjhifdj51gzavd1zj9ni3vwbhfn"; depends=[forecast tseries]; }; - forecast = derive2 { name="forecast"; version="8.7"; sha256="0f9sdvh9b7wvd6ycflgmsjzqv12b7jfn7w4m2sbbfp7020nyqfhd"; depends=[colorspace fracdiff ggplot2 lmtest magrittr nnet Rcpp RcppArmadillo timeDate tseries urca zoo]; }; + forecast = derive2 { name="forecast"; version="8.8"; sha256="079c3h4dxpnznadqbrpidahl3j58i4v8p0jw47lh1snkfx6hfxyh"; depends=[colorspace fracdiff ggplot2 lmtest magrittr nnet Rcpp RcppArmadillo timeDate tseries urca zoo]; }; forecastHybrid = derive2 { name="forecastHybrid"; version="4.2.17"; sha256="1k3jwxqwkprcf2qr5x1b8hzzdvbyzdiablpvqnr0482x4vza8lmc"; depends=[doParallel foreach forecast ggplot2 purrr thief zoo]; }; forecastSNSTS = derive2 { name="forecastSNSTS"; version="1.2-0"; sha256="1rnf2a7sri52sm976iicab660qk07pmz8jmd3q71dg4hmc30yf9j"; depends=[Rcpp]; }; - foreign = derive2 { name="foreign"; version="0.8-71"; sha256="1mv04w3ycz0ymsszn8aa87k6k5sb8mg8lhf1b8w4zpfrphpkkliv"; depends=[]; }; + foreign = derive2 { name="foreign"; version="0.8-72"; sha256="124c9229is44p2rv7xyh2q86nsfi7vzyyh5n3c5ihziqrp4ig723"; depends=[]; }; forensic = derive2 { name="forensic"; version="0.2"; sha256="0kn8wn6p3fm67w88fbarg467vfnb42pc2cdgibs0vlgzw8l2dmig"; depends=[combinat genetics]; }; forensim = derive2 { name="forensim"; version="4.3"; sha256="1jhlv9jv832qxxw39zsfgsf4gbkpyvywg11djldlr9vav7dlh3iw"; depends=[tcltk2 tkrplot]; }; forestChange = derive2 { name="forestChange"; version="0.6"; sha256="13zzng022m1jhca0d2w868kqp9h0wfpjmh0xnlb8jl1l4vfc68r9"; depends=[curl raster rgdal rvest SDMTools xml2]; }; forestControl = derive2 { name="forestControl"; version="0.2.0"; sha256="1w1x7i57dqlrm6zzgx4k0p1zs83nrg2w2jhhvjjk9s6y1ba3whyg"; depends=[dplyr magrittr purrr Rcpp tibble]; }; forestFloor = derive2 { name="forestFloor"; version="1.11.1"; sha256="1sslxq44qmmmdhr7800bz8lj9w2l7f7x1vly3w2z7j1qdijc7nw7"; depends=[kknn randomForest Rcpp rgl]; }; forestHES = derive2 { name="forestHES"; version="1.0-1"; sha256="05l04ly3l8xkdz3rnnrfa4y0wfmh1am2ixbz1vfarnqkc0zppwpj"; depends=[]; }; + forestRK = derive2 { name="forestRK"; version="0.0-5"; sha256="0zm0q7bckmjl1j3yh5pw4r6rq64rfmzjvmvqniza5691jagjz60m"; depends=[ggplot2 igraph knitr mlbench partykit pkgKitten rapportools]; }; forestSAS = derive2 { name="forestSAS"; version="1.0.1"; sha256="1jva2nivvcrczvqfhxa6vv1hsazp5m7djgfp7mfp1kpr136lyf2d"; depends=[spatstat]; }; forestinventory = derive2 { name="forestinventory"; version="0.3.1"; sha256="0brbg0q8j9ymvm527db7063kgs6i6flja7mxqk7yvaf3dh8wsi46"; depends=[ggplot2 plyr tidyr]; }; forestmangr = derive2 { name="forestmangr"; version="0.9.1"; sha256="1b0yijc1yzgwkypyxb6v03sw32r3zz9rfjw63xiwzspq7hkbpinx"; depends=[broom car dplyr FinCal formattable ggdendro ggplot2 ggpmisc ggthemes gridExtra magrittr minpack_lm plyr purrr rlang scales systemfit tibble tidyr]; }; @@ -7425,7 +7533,7 @@ in with self; { formulize = derive2 { name="formulize"; version="0.1.0"; sha256="1fz8q48z4zvfglxzmmjznb7lcfrrfqmnws85jfkihs3ff43h7ccc"; depends=[recipes rlang]; }; fortunes = derive2 { name="fortunes"; version="1.5-4"; sha256="109ly9kpfn6hy294ava8795wy5z9l1bnl98hhhv8kn9naf4camdg"; depends=[]; }; forward = derive2 { name="forward"; version="1.0.4"; sha256="0qhssp8mymy5wgzfkp1xa8s81j803g0ckg647ind6ms26320hq0x"; depends=[MASS]; }; - forwards = derive2 { name="forwards"; version="0.1.1"; sha256="1ldyyma1ppjlnqahw6wpvwmcv7v2k9if8mfkx49j7kb866bvlhgk"; depends=[]; }; + forwards = derive2 { name="forwards"; version="0.1.3"; sha256="07374a1ak5h8q3diqyvsw3q1grqi3679w9sshf1jkhlrj7wn0dmv"; depends=[]; }; fossil = derive2 { name="fossil"; version="0.3.7"; sha256="188hyb3r1dnxkmqf2czh1kdzmk4mjc0v1kn1zml2yvxaxk7adsrz"; depends=[maps shapefiles sp]; }; foto = derive2 { name="foto"; version="1.0.0"; sha256="10mfxgg5f1r85cwr0jjnsa4csp1afcrjvyjvp31060nm638clcgh"; depends=[raster]; }; fourPNO = derive2 { name="fourPNO"; version="1.0.5"; sha256="0nx6rl34jklsn48wphh16rxm57hfxndc1zfddgl9yw5nfmfll7gs"; depends=[Rcpp RcppArmadillo]; }; @@ -7448,7 +7556,7 @@ in with self; { 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]; }; fragilityindex = derive2 { name="fragilityindex"; version="0.1.0"; sha256="06f7w0ff8mmydgylz5a0z29fc78spvmay3sjq0rz9k44w4bb9z3q"; depends=[pbapply stringr survival]; }; - frailtyEM = derive2 { name="frailtyEM"; version="0.8.8"; sha256="0mfhhb025wzwvch5bcvvfsljki34xahdkqli7lvqbhhihba00r1p"; depends=[expint ggplot2 magrittr Matrix msm numDeriv Rcpp survival tibble]; }; + frailtyEM = derive2 { name="frailtyEM"; version="1.0.0"; sha256="19rsn07knc4ifj4v4v37s7k1dh0a4sdsxgbk5w7slzwh816spmjl"; depends=[expint ggplot2 magrittr Matrix msm numDeriv Rcpp survival tibble]; }; frailtyHL = derive2 { name="frailtyHL"; version="2.2"; sha256="0i6r889i4f07w6992nfsfr439psz6k3q79nkkk3zwf5fv5r6bcky"; depends=[cmprsk Matrix survival]; }; frailtySurv = derive2 { name="frailtySurv"; version="1.3.6"; sha256="0k41a5x7qzrajk2l59q5b8kjj084vids4ailr8r7r2lnf6r9xrav"; depends=[ggplot2 nleqslv numDeriv Rcpp reshape2 survival]; }; frailtypack = derive2 { name="frailtypack"; version="3.0.3.2"; sha256="0kwp7z5m73nx6jcgh6j76lmirpzh2kz3yirwn4iii9qkccrh6jps"; depends=[boot doBy MASS nlme statmod survC1 survival]; }; @@ -7461,7 +7569,7 @@ in with self; { freegroup = derive2 { name="freegroup"; version="1.1-0"; sha256="0ssshs2d6l2ip1xx9x581w0cdnd2459a1mh360ybwajkjgak2ci6"; depends=[magic magrittr plyr]; }; freeknotsplines = derive2 { name="freeknotsplines"; version="1.0.1"; sha256="1yl53rnngrpj5mv1fgd0rgiqaw431g4ckxl1bq0l712647njx02a"; depends=[]; }; freestats = derive2 { name="freestats"; version="0.0.3"; sha256="0b18n8idap089gkmjknzzb94dvs2drpdqs0mrw7dqnacxgbbqwfj"; depends=[MASS mvtnorm]; }; - freesurfer = derive2 { name="freesurfer"; version="1.6.1"; sha256="1ibhl5sbz85skkawmfdr9df6wdq6b3bl6cdvykx0gcszmd3fiabh"; depends=[neurobase R_utils reshape2]; }; + freesurfer = derive2 { name="freesurfer"; version="1.6.5"; sha256="0g5rpskwgxx37b60vxn89kf2d6b2y66v508xyrsx3h47q973kjia"; depends=[neurobase R_utils reshape2]; }; freetypeharfbuzz = derive2 { name="freetypeharfbuzz"; version="0.2.5"; sha256="11agmqdp6sy32jk2840cj8wmgywq0yjar18zsnsn56qfvn4b1k1c"; depends=[fontquiver]; }; freqdist = derive2 { name="freqdist"; version="0.1"; sha256="1pb45jabv9s3qa7v1isd5wm9b0g9p04q5h18spcaax8397s0d2fv"; depends=[]; }; freqdom = derive2 { name="freqdom"; version="2.0.1"; sha256="0ig0ygnlcb5ndjjm5x8jpp37gvgwli9xv6zsvbbgfh72q418qswp"; depends=[matrixcalc mvtnorm]; }; @@ -7484,7 +7592,7 @@ in with self; { fscaret = derive2 { name="fscaret"; version="0.9.4.4"; sha256="18fhyfl3f8syyc3g937qx87dmwbv7dray6b97p1s6lnssiv61gsw"; depends=[caret gsubfn hmeasure]; }; fsdaR = derive2 { name="fsdaR"; version="0.4-6"; sha256="0lj2kaan5n4g2ckj6d4sfvab0a45h164m1fjvqf57c0ymhaswz76"; depends=[ggplot2 reshape2 rJava rrcov]; }; fsia = derive2 { name="fsia"; version="1.1.1"; sha256="0id7cnswrqylgpwjil1zfn89ryrdpl20fim8x1srl8s1hm5bg35r"; depends=[]; }; - fslr = derive2 { name="fslr"; version="2.22.0"; sha256="1a3sclwhmalp4g05yr8gw80zgcbqvgpbppj1pyw4x846ahk1wikd"; depends=[neurobase oro_nifti R_utils]; }; + fslr = derive2 { name="fslr"; version="2.23.0"; sha256="1sx4mw9cknbn7q7qc5rqqzzzly7wsq09dsdlmhb98ycqq631hx8c"; depends=[neurobase oro_nifti R_utils]; }; fso = derive2 { name="fso"; version="2.1-1"; sha256="0hn2ypm0nwfbmnh9il78pi30x7gfmayfangqyh0d63ngyz40bvma"; depends=[labdsv]; }; fssemR = derive2 { name="fssemR"; version="0.1.5"; sha256="1pxyl8b6nfaxdc86zlfjgyjvmx8ifh46d1lbwc2dknhp7sxc95q5"; depends=[glmnet igraph MASS Matrix mvtnorm qtl Rcpp RcppEigen stringr]; }; fst = derive2 { name="fst"; version="0.9.0"; sha256="0ya5lh8p0qy5pcr6wxsrn43wj1r9gb9qycyn8gvl26ic3hxwk2rf"; depends=[Rcpp]; }; @@ -7504,7 +7612,7 @@ in with self; { funFEM = derive2 { name="funFEM"; version="1.1"; sha256="08798lvryykrxfvp2297anzl4gi81gwvc1qyyzq16nafjf65kwfy"; depends=[elasticnet fda MASS]; }; funHDDC = derive2 { name="funHDDC"; version="2.3.0"; sha256="1dym1bzywng5yjfzpppxx043pwcbvrxxq0bn1d6xqqkqcpzn2zhp"; depends=[fda MASS]; }; funLBM = derive2 { name="funLBM"; version="1.0"; sha256="0krx5v1lakrrxk0j249k7sr7c6r40yg1l8l10laf4444j2qn8rjp"; depends=[fda funFEM]; }; - funModeling = derive2 { name="funModeling"; version="1.7"; sha256="031rsqd2dr3zpzcnd34mkbq4wkvr34h64yszvjm8sx2f4d4p95x1"; depends=[dplyr entropy ggplot2 gridExtra Hmisc lazyeval moments pander RColorBrewer reshape2 ROCR scales]; }; + funModeling = derive2 { name="funModeling"; version="1.8"; sha256="1vcbrskl3kmiz6p75083gfk8r058w1ynjvk9qa1fm4x62ab3i9bk"; depends=[dplyr entropy ggplot2 gridExtra Hmisc lazyeval moments pander pROC RColorBrewer reshape2 ROCR scales]; }; funbarRF = derive2 { name="funbarRF"; version="1.0.2"; sha256="14xfhwp4vffl215fqdxdxpmjblyw75ylxqjzja794adywm06sz19"; depends=[BioSeqClass Biostrings randomForest]; }; funchir = derive2 { name="funchir"; version="0.1.4"; sha256="1mbsy65628q117c2k01wvibpjd3ibigy4yc1c8m0rf9jwsc67qjb"; depends=[data_table]; }; functional = derive2 { name="functional"; version="0.6"; sha256="120qq9apg6bf39n9vnp68db5rdhwvnj2vi12a8j8243vq8kqxdqr"; depends=[]; }; @@ -7527,7 +7635,7 @@ in with self; { futile_options = derive2 { name="futile.options"; version="1.0.1"; sha256="0w15agpi88y3qkv6fl72zy2pzyplzgvnj41a4ixhg64mw1sck73s"; depends=[]; }; futile_paradigm = derive2 { name="futile.paradigm"; version="2.0.4"; sha256="14xsp1mgwhsawwmswqq81bv6jfz2z6ilr6pmnkx8cblyrl2nwh0v"; depends=[futile_options RUnit]; }; futility = derive2 { name="futility"; version="0.4"; sha256="0zjb87brz7pkx3nq3q30y69cmcxpqqsra447p60qh7005kgr9vx4"; depends=[]; }; - future = derive2 { name="future"; version="1.13.0"; sha256="0h8ng2a6vg4axd5f75xcb3ip9d95zi22fa048dq2bzlnncwlznjz"; depends=[digest globals listenv]; }; + future = derive2 { name="future"; version="1.14.0"; sha256="1jyv2wlmpfqbk3hw269h4xg36na3wh1kd1lxmwdb40bsv4850lqa"; depends=[digest globals listenv]; }; future_BatchJobs = derive2 { name="future.BatchJobs"; version="0.16.1"; sha256="0isisl38gy59ws6w2qvz5ljp7j88lr6kqnq9g6pdw7njph1p6ayn"; depends=[BatchJobs future R_utils]; }; future_apply = derive2 { name="future.apply"; version="1.3.0"; sha256="0wd3bh114zkvrqlpn8gqz4ix1igr9hr8x72h2g00a7mqkfjfqx33"; depends=[future globals]; }; future_batchtools = derive2 { name="future.batchtools"; version="0.8.0"; sha256="1ga29dhbfgjv5gxih8phad4y1yysdfljn0q218r0gdbnqw3gmzwb"; depends=[batchtools future]; }; @@ -7545,7 +7653,7 @@ in with self; { fwi_fbp = derive2 { name="fwi.fbp"; version="1.7"; sha256="1wk9cr0kk6zkbf111bv87n7b1wwx1qrsbjxydvbjvy8bgz0nfa62"; depends=[]; }; fwsim = derive2 { name="fwsim"; version="0.3.4"; sha256="0fy87c1x5hihfcppv1pvk3b0pwl6ygqpka40x55gbpkgssdigb1l"; depends=[Rcpp]; }; fxregime = derive2 { name="fxregime"; version="1.0-3"; sha256="15fh8yhcba2gw2xfd0yiw5ssvbgb62l6vb28bxz71ckdyv9nsahk"; depends=[car sandwich strucchange zoo]; }; - fxtract = derive2 { name="fxtract"; version="0.9.1"; sha256="1b6ijxda969m7b74zyyd6rm1g706z2691awjlx23xwfirfkc2jka"; depends=[checkmate data_table dplyr future future_apply magrittr R6]; }; + fxtract = derive2 { name="fxtract"; version="0.9.2"; sha256="0v65gdbc6xhqy1dwb6s8gp5dlz4nbsl7yr17g3pyw43znx7s5l1j"; depends=[checkmate data_table dplyr fs future_apply magrittr R6]; }; fy = derive2 { name="fy"; version="0.1.0"; sha256="1620b2qsrryxdg49xfisf0gf0j380vkbg2nizanki2wh0rw9x7r3"; depends=[data_table fastmatch hutils]; }; g_data = derive2 { name="g.data"; version="2.4"; sha256="14a4m0v38p3j1k1kymkxwydlgm8b73hlx9m80sg1l4aj38fvflzl"; depends=[]; }; g2f = derive2 { name="g2f"; version="0.2"; sha256="1jsmiv6v8ilpxg1k1npcgqa467hpyw7mzh5m8dp7bxar4j5npsp4"; depends=[KEGGREST minval sybil]; }; @@ -7582,7 +7690,7 @@ in with self; { gains = derive2 { name="gains"; version="1.2"; sha256="1nmrhc7qjlyzn04r1qyjdws5fin3idmi789kbxzilax12ya8xr7k"; depends=[]; }; galgo = derive2 { name="galgo"; version="1.4"; sha256="1v150flk1x0rixpgvi8crd5iq28w4jk8h2iyv48hz5qmm2pvz1li"; depends=[e1071 MASS nnet R_oo randomForest rpart]; }; galts = derive2 { name="galts"; version="1.3.1"; sha256="0jg0yng1kc6s0qdhq8ps38dsxdcrgdcn8dl2dlclw6rcbknb6h4k"; depends=[DEoptim genalg]; }; - gam = derive2 { name="gam"; version="1.16"; sha256="0blg4gghw5068z180c4bf0s77ky0wspgsi6xpcfnkf2rkvj34182"; depends=[foreach]; }; + gam = derive2 { name="gam"; version="1.16.1"; sha256="1fbldshnfy37bpqprazwp1rkyh9f67mr2krnxpl4688mqq143l40"; depends=[foreach]; }; gamCopula = derive2 { name="gamCopula"; version="0.0-5"; sha256="08dw2i7h8maymqxr882kdv5938dz08n44969fisj2zya00zsrr4y"; depends=[copula doParallel foreach gsl igraph MASS mgcv numDeriv VineCopula]; }; gamRR = derive2 { name="gamRR"; version="0.6.0"; sha256="0l7ql1qp3xgky82d88l143nl7l11zsj4mnkdsx10f3nmf7kykj3d"; depends=[boot mgcv]; }; gama = derive2 { name="gama"; version="1.0.3"; sha256="1k79m01r3y9am62414947zfwb1w1gh0nn48najivbjyk9i2avn9r"; depends=[ArgumentCheck cluster clusterCrit GA ggplot2 NbClust Rfast]; }; @@ -7620,7 +7728,7 @@ in with self; { gapfill = derive2 { name="gapfill"; version="0.9.6"; sha256="0384v7capab7dbyvz6b2jvnh840z6ab3857my0h3cgsys3lhn3c5"; depends=[fields foreach ggplot2 quantreg Rcpp]; }; gapmap = derive2 { name="gapmap"; version="0.0.4"; sha256="0xz19n0vvdzbfg6afp3y0qfbs3f2nfxib1cyya3cax5wqqfbzw3i"; depends=[ggplot2 reshape2]; }; gapminder = derive2 { name="gapminder"; version="0.3.0"; sha256="067cra1ca4ngwjx8d1y9pyzwcpsfi1wcal0glzyy6ghd1k6jflpv"; depends=[tibble]; }; - gargle = derive2 { name="gargle"; version="0.3.0"; sha256="1r0vyz48469dzznlryx0wdb9vz2zi60pncpm31sfikxx6pdxmbpv"; depends=[fs glue httr jsonlite rlang withr]; }; + gargle = derive2 { name="gargle"; version="0.3.1"; sha256="0vqgp4w03sdyj0q96gxkybqflzzbaw84zifsbi7pxk5y08fimj2v"; depends=[fs glue httr jsonlite rlang withr]; }; garray = derive2 { name="garray"; version="1.1.2"; sha256="0s2dgi556x9jnhafvzz4qkxdbq9dm12gsvsqd2g9iy3468fx9flq"; depends=[]; }; gaselect = derive2 { name="gaselect"; version="1.0.7"; sha256="0bivbvs8yyspqskvka1s1sr6w3k0m5kk4b66wfz9bfdygnywd6wz"; depends=[Rcpp RcppArmadillo]; }; gasfluxes = derive2 { name="gasfluxes"; version="0.4-3"; sha256="017y3d67f22r6pxpjxab634kpdcxjd5mq53h3g45cxic1jz3znym"; depends=[AICcmodavg data_table MASS sfsmisc]; }; @@ -7651,6 +7759,7 @@ in with self; { gcmr = derive2 { name="gcmr"; version="1.0.1"; sha256="093j1cmfw83rck00lx2ns7sfaya7kfc8k7af0q80az7w2g9hmmpv"; depends=[betareg car Formula geoR lmtest nlme sandwich sp]; }; gconcord = derive2 { name="gconcord"; version="0.41"; sha256="1n3pfwk6vip19q1zhbz1n164f9vi7mig8pcd07c4wxnm5ir9dagy"; depends=[]; }; gcookbook = derive2 { name="gcookbook"; version="2.0"; sha256="11g1q187l4j31b6cdzdx5z3s14z3s09l7ynl36pzzn9j19l8cmrc"; depends=[]; }; + gdalUtilities = derive2 { name="gdalUtilities"; version="1.0.0"; sha256="1z452lh1n65g78dqynnwq3rcrmm7g4jz7qr25px7qav0zi6944mf"; depends=[raster sf]; }; gdalUtils = derive2 { name="gdalUtils"; version="2.0.1.14"; sha256="0dvp1qzxxp6rjqfxpxckbfhdqanksnm4rfgsalvb5wdm5qmm02l9"; depends=[foreach R_utils raster rgdal sp]; }; gdalcubes = derive2 { name="gdalcubes"; version="0.1.0"; sha256="1w8ll08icdddr07zazkkj6gdnxsdlzq1wpsbbd8kbs8rgfnq6zjg"; depends=[jsonlite ncdf4 Rcpp RcppProgress]; }; gdata = derive2 { name="gdata"; version="2.18.0"; sha256="0zwdj7lscgxr8r62ii8hbdh4mb7sa9w4f5nv32zzrxdvymcpya2b"; depends=[gtools]; }; @@ -7677,10 +7786,8 @@ in with self; { gems = derive2 { name="gems"; version="1.1.1"; sha256="174mjnpldb0rwjvwdgpcg1acm526gs0pjf9gi5mn9d3x9yz4r5jx"; depends=[data_table MASS msm plyr]; }; gemtc = derive2 { name="gemtc"; version="0.8-2"; sha256="0c2a9gz6rvsc5qh66ixxa4dz6lwhcmmsf2vnvxl98c9kbvdwfqm9"; depends=[coda igraph meta plyr Rglpk rjags truncnorm]; }; gen2stage = derive2 { name="gen2stage"; version="1.0"; sha256="16xbzgkjskzm1wik3dznvwhqddrpmcgsgd372n4a67rbb46jgx6r"; depends=[clinfun]; }; - genBaRcode = derive2 { name="genBaRcode"; version="1.1.0"; sha256="1x7hf80bqfl6ghd9vk878a86dacphp15wdw9zb198ax083q3jydm"; depends=[ape Biostrings doParallel dplyr foreach futile_logger ggnetwork ggplot2 ggseqlogo ggtree igraph network phangorn RColorBrewer reshape2 S4Vectors shiny ShortRead stringdist VennDiagram visNetwork]; }; + genBaRcode = derive2 { name="genBaRcode"; version="1.2.0"; sha256="1h4yyjjx7cpinbh716ha79hsmjlj5waxvrv67dz8lij0ingycdzh"; depends=[ape Biostrings dplyr futile_logger future future_apply ggnetwork ggplot2 ggraph ggseqlogo ggtree igraph network phangorn RColorBrewer reshape2 S4Vectors shiny ShortRead stringdist VennDiagram visNetwork]; }; genBart = derive2 { name="genBart"; version="1.0.1"; sha256="12z5vj41npwawz954zqkjfmg9inh063ilh7m82pn73asrxif0ay3"; depends=[clValid data_table fastcluster ggplot2 gtools limma NMF pca3d psych qusage RColorBrewer reshape2 rmarkdown scales shiny shinydashboard shinyjs statmod stringr VennDiagram]; }; - genMOSS = derive2 { name="genMOSS"; version="1.2"; sha256="18qinckzz7wsw222skrq30izbj6s85i8hq6iicj9nng8gh6jydr8"; depends=[ROCR]; }; - genMOSSplus = derive2 { name="genMOSSplus"; version="1.0"; sha256="1n3ngx1piy3l14k5k95wrgvrjw9238jkygfqanl3xg2na2mmkr26"; depends=[]; }; genSurv = derive2 { name="genSurv"; version="1.0.3"; sha256="0k5rfpq603szjb76gxffvsbqcav8182h8zwvg4kar68k72yfw1xs"; depends=[]; }; genalg = derive2 { name="genalg"; version="0.2.0"; sha256="1wzfamq8k5yhwbdx0wy1w5bks93brj0p890xxc4yqrja4w38ja3s"; depends=[]; }; genasis = derive2 { name="genasis"; version="1.0"; sha256="1r0733cc2hss3f8dp19s1ji55yp72mds7p3x1zvvpiks2r7w712p"; depends=[fitdistrplus Kendall]; }; @@ -7688,7 +7795,7 @@ in with self; { gendata = derive2 { name="gendata"; version="1.1"; sha256="1r5bhmfblhk6d31v0byhp4a0pmpri6vk697zmmx9b0hvhda7mllf"; depends=[]; }; gender = derive2 { name="gender"; version="0.5.2"; sha256="1kd5024z9mbyiwmj7rpn7zflmpw6jsj2sz153g3ckzyhxjbc3x36"; depends=[dplyr httr jsonlite]; }; genderBR = derive2 { name="genderBR"; version="1.1.0"; sha256="0j5wsbv797wc48lc65yhaqhpwqyr662460vj59x7r9p7d7m1ncd0"; depends=[dplyr httr jsonlite]; }; - genderizeR = derive2 { name="genderizeR"; version="2.1.0"; sha256="00qx2va1sm4d7v2z8kyq59rnm451v131wm1f2klk6blv4pi6x6db"; depends=[data_table httr magrittr stringr tm]; }; + genderizeR = derive2 { name="genderizeR"; version="2.1.1"; sha256="17lngcn0plyf7cjh5yizkp05w87jpr7rf1py4v5nw96f18wr4gjg"; depends=[data_table httr magrittr stringr tm]; }; gendist = derive2 { name="gendist"; version="2.0"; sha256="0rs0sn1sb6j3pk2xncix04a093awlm2nw70g0rjhr7dlzmigspgb"; depends=[]; }; geneHummus = derive2 { name="geneHummus"; version="1.0.11"; sha256="1m6yyjsvmn3w87cw4da8js5vi74k5y739gxdx1yscx1n50bc3m34"; depends=[curl dplyr httr rentrez stringr]; }; geneListPie = derive2 { name="geneListPie"; version="1.0"; sha256="0z2gawfzhm05dafj4zlj6ifmf0dy7p1hrpa59lzxrnrc0wr6laji"; depends=[]; }; @@ -7707,6 +7814,7 @@ in with self; { genio = derive2 { name="genio"; version="1.0.10"; sha256="0l29rz9nap2rglansv8sbldhgngv04v1kdgy0zzxjzwwmsdcjrqp"; depends=[Rcpp readr tibble]; }; genius = derive2 { name="genius"; version="2.2.0"; sha256="0062g7wyclrbaljwib57s95x5wamc01fr3hgwjjzgv850vbbjqlv"; depends=[dplyr purrr readr reshape2 rvest stringr tibble tidyr tidytext]; }; geniusr = derive2 { name="geniusr"; version="1.1.0"; sha256="1qnzqlgzq507g9iik00gh242nh3zcg38awrlaxl5zgnsp852kjnv"; depends=[attempt curl httr purrr rvest stringr tibble xml2]; }; + genlasso = derive2 { name="genlasso"; version="1.4"; sha256="01p1cs0h6gwr6f18aaqirgd8yxrhyamakc763y9dm6mndrba2x0g"; depends=[igraph MASS Matrix]; }; genlogis = derive2 { name="genlogis"; version="1.0.0"; sha256="01av5invhviii7adqihh10ib47rjzwfsqdgw3lfg1c72kzrqywgr"; depends=[distr doParallel foreach ggplot2 manipulate]; }; geno2proteo = derive2 { name="geno2proteo"; version="0.0.3"; sha256="1q054ai42f5gmrj791abj02f663zs7ymdh3pfs3b2lq6i4w9s2fb"; depends=[BiocGenerics GenomicRanges IRanges R_utils RUnit S4Vectors]; }; genoPlotR = derive2 { name="genoPlotR"; version="0.8.9"; sha256="07901qv2lzzflda0p8qxmla6syvq2c9y230xipvn1i0p4izdqk5s"; depends=[ade4]; }; @@ -7744,14 +7852,14 @@ in with self; { geomedb = derive2 { name="geomedb"; version="1.0.0"; sha256="1bmprzm0xm78vixifl5sx6ig31l8pmbscjb382yyhh1i0qdd7bim"; depends=[ape data_table httr jsonlite]; }; geomerge = derive2 { name="geomerge"; version="0.3.1"; sha256="0pvyhpv4vq8mvvlybxhviq8rbazw29dgf9m0xnldaxg9r6lqdp4d"; depends=[geosphere ggplot2 gridExtra inlmisc lubridate raster scales sp spdep]; }; geometa = derive2 { name="geometa"; version="0.5-0"; sha256="1p2yr1xlxyslichy39krqhm0ag93mlc4vmvzn3frk5ay9by0prx6"; depends=[httr R6 XML]; }; - geometry = derive2 { name="geometry"; version="0.4.1"; sha256="0v3ivaw8vbjyxg08dd573qk3kqfyknj5hli9503dza6p6xz0dzmm"; depends=[lpSolve magic Rcpp RcppProgress]; }; + geometry = derive2 { name="geometry"; version="0.4.2"; sha256="0vq334115qi039vy198ggv1dsp6n1s6jwcm9ivipf5r8lbm287zz"; depends=[linprog lpSolve magic Rcpp RcppProgress]; }; geomnet = derive2 { name="geomnet"; version="0.2.0"; sha256="0xanzx8p34bac4zcf9j69nivwhllvsrw7x70mzgl95jhg3gvv96a"; depends=[dplyr ggplot2 network plotly readr sna tidyr]; }; geomorph = derive2 { name="geomorph"; version="3.1.2"; sha256="1wd8pnpcb5zkqg39hvsw1jyw9yx66w0w5nyg114b8v3m9x41rkr9"; depends=[ape jpeg rgl RRPP]; }; geonames = derive2 { name="geonames"; version="0.999"; sha256="0yz1b7y3vwa4izrhpry4n3iwzb7y67s5p3kgnd7d29cl5pcbpmqx"; depends=[rjson]; }; geonapi = derive2 { name="geonapi"; version="0.2-1"; sha256="1fypk4cc0q9jvn6zicc3jnxkh6f8yh1zcycy2sblvv175lbjlfzx"; depends=[geometa httr openssl R6 XML]; }; geonetwork = derive2 { name="geonetwork"; version="0.3"; sha256="0qjnv91rcxzw44fmbgm4qpcrbj5qgz1lgmyw53imyhxgyv55awxv"; depends=[geosphere igraph rgdal sf sp]; }; geoops = derive2 { name="geoops"; version="0.2.0"; sha256="0n9n0j849jbqv6y6lqhyhddr5zfz8i9yi03gpg9862nzkvxd3c4k"; depends=[Rcpp]; }; - geoparser = derive2 { name="geoparser"; version="0.1.1"; sha256="0rk2wcig79r28a974bc181p8vypxzbgxcb9rsp24qj9mg02rn5n5"; depends=[digest dplyr httr jsonlite lazyeval purrr stringr tidyr]; }; + geoparser = derive2 { name="geoparser"; version="0.1.2"; sha256="0vca4ijybqgk5dmbk0af4ykvbdkny8dm9d4frh5ikzk28hkvnlik"; depends=[digest dplyr httr jsonlite lazyeval purrr stringr tidyr]; }; geophys = derive2 { name="geophys"; version="1.4-1"; sha256="1s64sbr0chv0z2vaw059khfkv8iga1kr6428kkglgafq5x2d6h3q"; depends=[cluster GEOmap RFOC RPMG RSEIS]; }; georob = derive2 { name="georob"; version="0.3-10"; sha256="1d9chcvncf8ywrhb43slf86zl2mxzhhsmyifsg9jkbfn8ibbb720"; depends=[abind constrainedKriging fields lmtest nleqslv nlme quantreg RandomFields robustbase snowfall sp]; }; geosample = derive2 { name="geosample"; version="0.2.1"; sha256="1gpzrsza8ys2jdazb2ixc70y1w5lrkahlmvws1i071zby1la01iy"; depends=[pdist sf sp splancs]; }; @@ -7772,7 +7880,7 @@ in with self; { gepaf = derive2 { name="gepaf"; version="0.1.1"; sha256="0n36w40jrq3qkgmhz9wrnhp6fczw7bm96g950sa4nq33872xhfgm"; depends=[bitops]; }; germanpolls = derive2 { name="germanpolls"; version="0.2"; sha256="13ss7286sraiq6rgbbmlv3j94av26pv9016hz8hrlzvghmnkfwvh"; depends=[dplyr magrittr purrr RCurl xml2]; }; germinationmetrics = derive2 { name="germinationmetrics"; version="0.1.3"; sha256="1hfhwprs4b582n81ardh7mah52989shq2cphci9vskwb4jbkyzwx"; depends=[broom data_table ggplot2 ggrepel minpack_lm plyr Rdpack]; }; - gert = derive2 { name="gert"; version="0.1"; sha256="1bsmyf7r74l544xiq2vnm1jvnl887vkw5d2rcabh2i29mjjjy0p7"; depends=[askpass credentials openssl]; }; + gert = derive2 { name="gert"; version="0.2"; sha256="1qs404afcxpm3gxra2lpqb27l4746ga1pz0n29ig0qg3kala5yrj"; depends=[askpass credentials openssl]; }; gesca = derive2 { name="gesca"; version="1.0.4"; sha256="1ndn8wgp22pr017x6v7jw8jy4gd06x8110qa860hw8i6pn47wfwv"; depends=[]; }; gestalt = derive2 { name="gestalt"; version="0.1.8"; sha256="1cb04rd3yvkd47byynrn0pq6brlsi2z2iavh4gfrwmqyvks34k51"; depends=[rlang]; }; gestate = derive2 { name="gestate"; version="1.3.2"; sha256="1fr811f4d7zc75wxdrasd91wsa5ngzzb0p73ycy6lfwpm839i28q"; depends=[doParallel foreach shiny shinythemes survival survRM2]; }; @@ -7785,7 +7893,7 @@ in with self; { getlandsat = derive2 { name="getlandsat"; version="0.2.0"; sha256="15450v93lc4i2qda0zlb5vplwbarkmf3f6sb4rlrdpv9vlj85hff"; depends=[crul data_table rappdirs readr tibble xml2]; }; getmstatistic = derive2 { name="getmstatistic"; version="0.2.0"; sha256="0rxj1dyfqy3fw2jhv05sw9x70p67rxmq3aqffymzal61rz6cnr3y"; depends=[ggplot2 gridExtra gtable metafor psych stargazer]; }; getopt = derive2 { name="getopt"; version="1.20.3"; sha256="0zzmzgwl9a4y3s34600vmih22d6y32294f9bvxrnmffnvkgmy7sk"; depends=[]; }; - gets = derive2 { name="gets"; version="0.18"; sha256="0sg51xkiw3w3lzgmbkvv6zfr41fc4krs4dxajj2m64hv4zfl2cj6"; depends=[zoo]; }; + gets = derive2 { name="gets"; version="0.19"; sha256="18qd0rnl8w307laykyv93ahrblxz2nsvrcn0qfwar23g3n9vnzx5"; depends=[zoo]; }; gettz = derive2 { name="gettz"; version="0.0.3"; sha256="1i06nfm824131q8lwwhrbzg2g9lbnmyp8k57w2vag7v8jj5rdrda"; depends=[]; }; gexp = derive2 { name="gexp"; version="1.0-0"; sha256="0jasxyr9rwdj1lmsc5zr77kkzm4nci3pxgc4npr7j0wcim7k8lby"; depends=[jpeg mvtnorm png]; }; gfcanalysis = derive2 { name="gfcanalysis"; version="1.5.0"; sha256="1cg34c4hr8kwc23qlv2m6qw2k7ah4w8s70q0hf4hnvp66rw4kaqh"; depends=[animation geosphere ggplot2 plyr raster rasterVis RCurl rgdal rgeos sp stringr]; }; @@ -7818,11 +7926,11 @@ in with self; { ggdmc = derive2 { name="ggdmc"; version="0.2.6.0"; sha256="1gncv7npl548k3zd41x2gwg5qywn5rp6zb4i7ga78sy77mvi3x92"; depends=[coda data_table ggplot2 matrixStats Rcpp RcppArmadillo]; }; gge = derive2 { name="gge"; version="1.4"; sha256="0plwk5j2n0309ghgn8r4ws3azwn7n4jb7yfykiiwwalhs3k05lsa"; depends=[nipals reshape2 rgl]; }; ggedit = derive2 { name="ggedit"; version="0.3.0"; sha256="1v9apfkm47jcqyhjrvv8ig09gz6zsss5xj5mrckfjybd5ca08rzn"; depends=[colourpicker dplyr ggplot2 magrittr miniUI plyr purrr rlang rstudioapi scales shiny shinyAce shinyBS tidyr]; }; - ggeffects = derive2 { name="ggeffects"; version="0.10.0"; sha256="0gmqzjk8k8q6j4q6asv9f3b1fv4qrw5w8xa48ha3y98shzm5np9k"; depends=[dplyr insight magrittr MASS purrr rlang scales sjlabelled sjmisc]; }; + ggeffects = derive2 { name="ggeffects"; version="0.11.0"; sha256="1b0lxa8bljdh6h4lk7pql1lrhjlvh7p5c8qlgb8ac6ay8hb79vmi"; depends=[dplyr insight magrittr MASS purrr rlang scales sjlabelled sjmisc]; }; ggenealogy = derive2 { name="ggenealogy"; version="1.0.0"; sha256="1wi29f7allky84w9w2512v8gs687gvypsbd7r4vyxs24l6pfssyc"; depends=[ggplot2 igraph plotly plyr reshape2 tibble]; }; ggetho = derive2 { name="ggetho"; version="0.3.4"; sha256="05wh0qk5cbcvcfgj5wf12qqbjgl1bbwcxywc16qdby7r4h5wy0gn"; depends=[behavr data_table ggplot2 labeling rlang scales stringr]; }; ggfan = derive2 { name="ggfan"; version="0.1.3"; sha256="1p3hbznpsaznlk0lnjyazc130www0p5919qplg3kspng7qh8p22w"; depends=[colorspace dplyr ggplot2 rstan]; }; - ggfittext = derive2 { name="ggfittext"; version="0.8.0"; sha256="0k6bm8g4n71044y88l8vi6nda1lgxzv1jiinw7hcxxgif48z1mw8"; depends=[ggplot2 shades stringi]; }; + ggfittext = derive2 { name="ggfittext"; version="0.8.1"; sha256="1a5k8fba2qjxnpd14vqkakpzcwkzqbpvs8h6fb9zh62y91n6p26v"; depends=[ggplot2 shades stringi]; }; ggfocus = derive2 { name="ggfocus"; version="0.9"; sha256="03adq3pdhlgckqc20aw6r70kdcrw0v4rmm848ivv6wkck4qyla3m"; depends=[dplyr ggplot2 magrittr RColorBrewer rlang]; }; ggforce = derive2 { name="ggforce"; version="0.2.2"; sha256="0snxx9zhcccxa7pz9pf3bjqmcmv9mz4m47v81hklnhm25jj40xg2"; depends=[ggplot2 gtable MASS polyclip Rcpp RcppEigen rlang scales tweenr]; }; ggformula = derive2 { name="ggformula"; version="0.9.1"; sha256="01ngx8qh9lhmagng6abx2ky54zi3iyj5bpxlnw59slagwv7l6icx"; depends=[ggplot2 ggstance magrittr mosaicCore rlang stringr tibble tidyr]; }; @@ -7844,15 +7952,16 @@ in with self; { gglorenz = derive2 { name="gglorenz"; version="0.0.1"; sha256="0ar9ih6yvxb5pyba8y8jjsbwaq808baysjhpd15psjzhfbimjqfm"; depends=[ggplot2 ineq]; }; ggm = derive2 { name="ggm"; version="2.3"; sha256="1n4y459x2i0jil8chjjqqjs28a8pzfxrws2fcjkg3il7zy0zwbw3"; depends=[igraph]; }; ggmap = derive2 { name="ggmap"; version="3.0.0"; sha256="13dmzl6z62pzjiffilarkji46vy0sacxa8a7mhrhc3biq3ylzhln"; depends=[bitops digest dplyr ggplot2 glue httr jpeg magrittr plyr png purrr RgoogleMaps rjson scales stringr tibble tidyr]; }; - ggmcmc = derive2 { name="ggmcmc"; version="1.2"; sha256="1g36zcypv587h7zig6slwkmd3b21cdhlfv2spxwg7061qslvw019"; depends=[dplyr GGally ggplot2 tidyr]; }; + ggmcmc = derive2 { name="ggmcmc"; version="1.3"; sha256="0p3akjbi0044nma8ynvqa42bkrgrb0jjx323k2pbrnlkq8x3ma1b"; depends=[dplyr GGally ggplot2 tidyr]; }; ggmosaic = derive2 { name="ggmosaic"; version="0.2.0"; sha256="0byhp7125r015wbbnv6fq13bx38krf11r39jx9dzbr0ci6kqzkdb"; depends=[dplyr ggplot2 plotly productplots purrr rlang tidyr]; }; ggmuller = derive2 { name="ggmuller"; version="0.5.3"; sha256="0qcphgal4c28lcwa1qdbryk40rkqpd4hz6phvcp6jy0n75lqi9f3"; depends=[ape dplyr ggplot2]; }; ggnetwork = derive2 { name="ggnetwork"; version="0.5.1"; sha256="13qisn4msjzkpcmn7rh2c4ymqfxp9bayrvqngp9pysfmr6wvc6ia"; depends=[ggplot2 ggrepel network sna]; }; - ggnewscale = derive2 { name="ggnewscale"; version="0.2.0"; sha256="0n6isxw85lr0k9nzq5vnjjhpf53ldc1q4lg9n0np0yv9lkxwxyp1"; depends=[ggplot2 stringi]; }; + ggnewscale = derive2 { name="ggnewscale"; version="0.3.0"; sha256="0nh5577if0qiqlksg028j4bkz058bm3qqwxm4nlqsssi4spja22f"; depends=[ggplot2 stringi]; }; ggnormalviolin = derive2 { name="ggnormalviolin"; version="0.1.2"; sha256="1gbv2b86nznw5bs05c4ns96b8hsxkhikhcf8syl2qbbafzy8vx6y"; depends=[dplyr ggplot2 magrittr scales]; }; ggpage = derive2 { name="ggpage"; version="0.2.3"; sha256="1qi8ydq3fxb1smk0jg9z1cv2xjq8c1lsnmz8l7c61rvdbjm3710v"; depends=[dplyr ggplot2 magrittr purrr rlang stringr tidytext]; }; ggparallel = derive2 { name="ggparallel"; version="0.2.0"; sha256="0zxaff0jbqkbavsmh1yyp3vdrxsam6a66hjw8lamv9pksdw1s2wf"; depends=[ggplot2 plyr reshape2]; }; ggparliament = derive2 { name="ggparliament"; version="2.0.0"; sha256="04za4lm3lir95bgda1rzlsyil2fkac3j5f5f1pjw2samy6pjz80r"; depends=[dplyr ggplot2 rlang]; }; + ggparty = derive2 { name="ggparty"; version="1.0.0"; sha256="0s6hr5p930kl3pj6ajwgwqz6yikc3l9hhzy1yn0nqc0r8pp2jyqf"; depends=[checkmate ggplot2 gtable partykit rlang survival]; }; ggperiodic = derive2 { name="ggperiodic"; version="1.0.0"; sha256="1cig715qy1kjjrn89cf505njdl2xccvjc5l0fwbqh86xgjayslxb"; depends=[data_table dplyr ggplot2 sticky tidyselect]; }; ggplot2 = derive2 { name="ggplot2"; version="3.2.0"; sha256="1cvk9pw59kxx19kamqwa15h26rbznp0vvqpn7y8kgjssnrzqkdii"; depends=[digest gtable lazyeval MASS mgcv reshape2 rlang scales tibble viridisLite withr]; }; ggplot2movies = derive2 { name="ggplot2movies"; version="0.0.1"; sha256="067ld6djxcpbliv70r2c1pp4z50rvwmn1xbvxfcqdi9s3k9a2v8q"; depends=[]; }; @@ -7863,7 +7972,7 @@ in with self; { ggpol = derive2 { name="ggpol"; version="0.0.5"; sha256="0n54mmk9alc3bd9q3jb64xvxnszqndfwpi6h6n09gpvlrbj8mkdx"; depends=[dplyr ggplot2 gtable plyr rlang]; }; ggpolypath = derive2 { name="ggpolypath"; version="0.1.0"; sha256="0g9zfal3vqcx16fi4abxm6l5sam475lk1f6bdik487wc2v0dkq83"; depends=[ggplot2]; }; ggpubr = derive2 { name="ggpubr"; version="0.2.1"; sha256="0a4dv6a752hwvc7l31xs7bgqhfzfdy94xp6wgwaxf5dxm46na7k1"; depends=[cowplot dplyr ggplot2 ggrepel ggsci ggsignif glue gridExtra magrittr polynom purrr scales tidyr]; }; - ggpval = derive2 { name="ggpval"; version="0.2.1"; sha256="1akhndl08nq97nvz2gzblfqsrjpxx1m632f3469mab9z1jcvaz57"; depends=[data_table ggplot2]; }; + ggpval = derive2 { name="ggpval"; version="0.2.2"; sha256="1l5m925ajbqffn7yccx3kg6hsgwbqalqgid04133p8m1vwm6dvyf"; depends=[data_table ggplot2]; }; ggquickeda = derive2 { name="ggquickeda"; version="0.1.3"; sha256="09b074rqyr93n3j60sm81qh3bdhrkwlkv4mxmcjcj3hivd6b2vck"; depends=[colourpicker dplyr DT Formula GGally ggplot2 ggpmisc ggpubr ggrepel ggstance gridExtra Hmisc lazyeval markdown plotly quantreg rlang scales shiny shinyjs stringr survival survminer table1 tidyr]; }; ggquiver = derive2 { name="ggquiver"; version="0.2.0"; sha256="1hsayqxf4brck1rx97yyprw1axc83lksgf7mn3rh8hqx4h1f5f0f"; depends=[dplyr ggplot2]; }; ggraph = derive2 { name="ggraph"; version="1.0.2"; sha256="0fpmp326mryd1k1qvacjadksrnhbla8h960i18lmrimzrag7692c"; depends=[digest dplyr ggforce ggplot2 ggrepel gtable igraph MASS plyr Rcpp scales viridis]; }; @@ -7883,7 +7992,7 @@ in with self; { ggspatial = derive2 { name="ggspatial"; version="1.0.3"; sha256="0ka15qj3f0yq9nfkgk77wp490nz9ymi80918apv9zp6x39kcprj9"; depends=[abind ggplot2 plyr raster reshape2 rlang rosm scales sf tibble tidyr]; }; ggspectra = derive2 { name="ggspectra"; version="0.3.3.1"; sha256="0mwpa4my9z377h5z9skaw4dy82cci6mkcyrw64c14kjv3rmx6xb7"; depends=[dplyr ggplot2 ggrepel lubridate photobiology photobiologyWavebands scales tidyr]; }; ggstance = derive2 { name="ggstance"; version="0.3.2"; sha256="078ih9s5b0xzf582qg0vjnxvg5qad5ms1v2vdd062ckahi8zz1r8"; depends=[ggplot2 plyr rlang withr]; }; - ggstatsplot = derive2 { name="ggstatsplot"; version="0.0.11"; sha256="0rb7y3brs84zpmhhk5mlv4wm23m1wz2k5cjyxvk7yy9q2jr8kd74"; depends=[BayesFactor boot broomExtra cowplot crayon DescTools dplyr ellipsis ez forcats ggcorrplot ggExtra ggplot2 ggrepel ggsignif glue groupedstats jmv magrittr metaBMA metafor paletteer psych purrr purrrlyr rcompanion rlang scales sjstats stringr tibble tidyr WRS2]; }; + ggstatsplot = derive2 { name="ggstatsplot"; version="0.0.12"; sha256="0fmf5619yzq9qv4x73bai6qi2lrmldk0n354dznk5ywpqw9xsnp4"; depends=[BayesFactor boot broomExtra cowplot crayon DescTools dplyr ellipsis ez forcats ggcorrplot ggExtra ggplot2 ggrepel ggsignif glue groupedstats jmv magrittr MCMCpack metaBMA metafor paletteer psych purrr purrrlyr rcompanion rlang scales sjstats stringr tibble tidyr WRS2]; }; ggswissmaps = derive2 { name="ggswissmaps"; version="0.1.1"; sha256="0is48x6k2p5dgj9q4km0dv33a9pcpfhlai9vz295y3acpyrkmnn4"; depends=[ggplot2]; }; ggtern = derive2 { name="ggtern"; version="3.1.0"; sha256="1fhs5s3sxhb46abzni7cyymyknk9z7ff8fanln41pkih76s5i18j"; depends=[compositions ggplot2 gridExtra gtable latex2exp lattice MASS plyr proto scales]; }; ggthemes = derive2 { name="ggthemes"; version="4.2.0"; sha256="0rrkzfggc1nlda1w1lbqdycx6nawxbkac1szhvkwrqlzh6agxcsv"; depends=[ggplot2 purrr scales stringr tibble]; }; @@ -7909,8 +8018,9 @@ in with self; { git2rdata = derive2 { name="git2rdata"; version="0.1"; sha256="1nq9pxvxk05xqsknwyfx30r7gzidl0whqiix56mbgy6zi3ma2pvj"; depends=[assertthat git2r yaml]; }; gitgadget = derive2 { name="gitgadget"; version="0.4.0"; sha256="0v6a205x493zycw4ky6ji8zd81jyw0ia47bxyklmiapxrzx8mpbd"; depends=[callr curl dplyr jsonlite markdown miniUI rstudioapi shiny shinyFiles usethis]; }; githubinstall = derive2 { name="githubinstall"; version="0.2.2"; sha256="0hqh86r2007hzdbm8rr0fwqhhsna7ji8sdgmdnrxkxraa5f2pfz3"; depends=[curl data_table devtools httr jsonlite mockery]; }; - gitignore = derive2 { name="gitignore"; version="0.1.2"; sha256="1lghdsv3z14m88wr6hlzdr2c0630w539hj900yc3fv1i4qjznf28"; depends=[clipr clisymbols crayon curl glue here jsonlite purrr xfun]; }; + gitignore = derive2 { name="gitignore"; version="0.1.3"; sha256="0ckvl5i99k9sjvlk3cfjyclhmchrlqdz4379nmlckh4jpmnckzk0"; depends=[clipr clisymbols crayon curl glue here jsonlite purrr xfun]; }; gitlabr = derive2 { name="gitlabr"; version="1.1.6"; sha256="1p68w0q8mjpz2hr6ys1qbfw1y4b35hgs27kzfkzv9hfi1vxqfd1h"; depends=[arpr base64enc dplyr httr magrittr purrr stringr tibble yaml]; }; + gitlink = derive2 { name="gitlink"; version="0.1.3"; sha256="1g34cyx35wlpq42alsayk69x708zxqgvbdndb7j6n1q0rm4vncvd"; depends=[htmltools rlang]; }; gitter = derive2 { name="gitter"; version="1.1.1"; sha256="10m4rs6mhg7xn8dfd41ai0bnn5bnxn6cgqip22hrrpj0i2lzky6l"; depends=[EBImage ggplot2 jpeg logging PET tiff]; }; givitiR = derive2 { name="givitiR"; version="1.3"; sha256="0y2slhxhj7k413kjaydin9hq3x2xgx4cgjshdplwnmg3x2nakn31"; depends=[alabama rootSolve]; }; gjam = derive2 { name="gjam"; version="2.2.7"; sha256="008g394sqcxr3jdhivldaaqi3d6h2mn16wdxcsqmspk80kiljnvr"; depends=[MASS RANN Rcpp RcppArmadillo]; }; @@ -7925,9 +8035,9 @@ in with self; { glassoFast = derive2 { name="glassoFast"; version="1.0"; sha256="1sgmh4l06q7mrmgnimphpqgix4k4jzaj2l30kpmnf92caa2v7ngw"; depends=[]; }; glba = derive2 { name="glba"; version="0.2"; sha256="0ckcz6v6mfbv34s8sp086czhb5l58sky79k84332rrz6wj47p3md"; depends=[]; }; glcm = derive2 { name="glcm"; version="1.6.4"; sha256="1al4i8r9g7izl5d4c3ccqx6zw9vfcvdr6zgzql8wjkq9fsdrrnq1"; depends=[Rcpp RcppArmadillo]; }; - gld = derive2 { name="gld"; version="2.4.2"; sha256="0yxly8vzplq5f6by28sa6727315fmy9i6jvmjm9lm75vyihbzxli"; depends=[e1071 lmom]; }; + gld = derive2 { name="gld"; version="2.5"; sha256="00bqyr22llsnxm2pjj8bzf9h64gx1vlrzdgagfsskwixccbhhsax"; depends=[e1071 lmom]; }; gldrm = derive2 { name="gldrm"; version="1.5"; sha256="1mbdxqjw6sa47kigwrjq1gn6vi36zhg9j2lck144iwa10ms0y9xp"; depends=[]; }; - glinternet = derive2 { name="glinternet"; version="1.0.9"; sha256="1158vza27svv43frc1xdcpa0a2pmjm507ikk80wrmb4754l8dv2j"; depends=[]; }; + glinternet = derive2 { name="glinternet"; version="1.0.10"; sha256="15dikazmhs7md7j8p45f67h3947br18hsrjl74cjk10vazd0ihng"; depends=[]; }; gllm = derive2 { name="gllm"; version="0.37"; sha256="169y3yz947d8qdphqv2a6yrdash6v2h9jfvj2fk7rcpmz0r45kl6"; depends=[]; }; gllvm = derive2 { name="gllvm"; version="1.1.3"; sha256="06kz66bbc29a11xp09nza6gvpgbxih4bzps5n8228sgk561vvw3w"; depends=[fishMod MASS Matrix mgcv mvabund mvtnorm RcppEigen statmod TMB]; }; glm_deploy = derive2 { name="glm.deploy"; version="1.0.4"; sha256="1akklvbhz2pp0sv1hax1jq0s9ajbfv1597z643gh5l9hwizj2h9m"; depends=[Rcpp]; }; @@ -7982,7 +8092,7 @@ in with self; { gmodels = derive2 { name="gmodels"; version="2.18.1"; sha256="0s8kd8krqk4kwv2zqxpsfy3w8qdwf5naf4b5l383vidq9sil0qb2"; depends=[gdata MASS]; }; gmp = derive2 { name="gmp"; version="0.5-13.5"; sha256="042mzsl6z6s61fy5m21yf9q83l08vnyqljn4iax7kqyiycpsp0gn"; depends=[]; }; gmt = derive2 { name="gmt"; version="2.0-1"; sha256="1g1sj9gq3h3s0pdcfvzg7iifkns5azn3pa83if0d3yzc28cjf0yz"; depends=[]; }; - gmvarkit = derive2 { name="gmvarkit"; version="1.0.3"; sha256="1497n11a7m5mbb8d3hcr89yhfh64vqsxi2w6kvlrxmmx95q2cp70"; depends=[Brobdingnag mvnfast pbapply]; }; + gmvarkit = derive2 { name="gmvarkit"; version="1.1.0"; sha256="1zzv050j1kxdz84dwrpvnnbxr5qxdgd3lvrdg8dy3a2kzclmywmh"; depends=[Brobdingnag mvnfast pbapply]; }; gnFit = derive2 { name="gnFit"; version="0.2.0"; sha256="0cji4zjslh18dfj0l827r6br4hx2f0akiaxrg7fhhyyyhgdcjnsm"; depends=[ismev rmutil]; }; gnlm = derive2 { name="gnlm"; version="1.1.1"; sha256="1krbz791l5qc06sh6my0bkq420b5afncw87lhyx1yiml2yg46zrk"; depends=[rmutil]; }; gnm = derive2 { name="gnm"; version="1.1-0"; sha256="01d7wxsh4d9w4jh8vn62sjzgpll650yl3klfhlaa8j0qwpxr2fml"; depends=[MASS Matrix nnet qvcalc relimp]; }; @@ -8002,8 +8112,8 @@ in with self; { gomms = derive2 { name="gomms"; version="1.0"; sha256="1i9d5y28wrhal990x7xxy99v3z9y2pzlakj7wnynd3dpx5pqr0jj"; depends=[]; }; goodpractice = derive2 { name="goodpractice"; version="1.0.2"; sha256="08rnm8z0pry5mwpc7p37r6f2rd56dry9djpcvvs9yl170w56psx0"; depends=[clisymbols covr crayon cyclocomp desc jsonlite lintr praise rcmdcheck rstudioapi whoami withr xml2 xmlparsedata]; }; googleAnalyticsR = derive2 { name="googleAnalyticsR"; version="0.6.0"; sha256="0amhhp7h7f6a2qmmbxjg5rqhj6jdvmjv9rsvcx83ql3b6vbaxrpz"; depends=[assertthat dplyr googleAuthR httr jsonlite magrittr memoise purrr rlang tidyr]; }; - googleAuthR = derive2 { name="googleAuthR"; version="0.8.0"; sha256="0r3w5x9fy3sf9a1h9qansrks6fibz4x6j51r95an3zskklad338d"; depends=[assertthat digest httr jsonlite memoise R6]; }; - googleCloudStorageR = derive2 { name="googleCloudStorageR"; version="0.4.0"; sha256="1iwn0qjyxyg1xr1s492h7z2g5yzcfw8kasd4ghxmghnqvhzzf7vn"; depends=[assertthat curl googleAuthR httr jsonlite openssl yaml zip]; }; + googleAuthR = derive2 { name="googleAuthR"; version="0.8.1"; sha256="0mgw9k6hmgd0yyan6d73kczya012caypy71ablhqdzvvykbsa8wi"; depends=[assertthat digest httr jsonlite memoise R6]; }; + googleCloudStorageR = derive2 { name="googleCloudStorageR"; version="0.5.0"; sha256="1wkmg7jrvzb9a2avdmvw5h4nqnf0745hqvjkfn82inaf6pyzb3b4"; depends=[assertthat curl googleAuthR httr jsonlite openssl yaml zip]; }; googleCloudVisionR = derive2 { name="googleCloudVisionR"; version="0.1.0"; sha256="1n7lbqx7qiahmirydli9nvq4w4i26qnyk3s2kxy4aj413619ym67"; depends=[caTools data_table googleAuthR jsonlite purrr]; }; googleComputeEngineR = derive2 { name="googleComputeEngineR"; version="0.3.0"; sha256="1s0qvnijzkja645lim373swk815n3s1292q6sk3q36ss70q42cfg"; depends=[assertthat future googleAuthR httr jsonlite]; }; googleLanguageR = derive2 { name="googleLanguageR"; version="0.2.0"; sha256="1l0gnynild95k9fw1d398zd4dkws97p13vvfv6jaklqj0xmh9ib8"; depends=[assertthat base64enc googleAuthR jsonlite magrittr purrr tibble]; }; @@ -8029,7 +8139,7 @@ in with self; { gpmap = derive2 { name="gpmap"; version="0.1.1"; sha256="00jhslbxbp6dgq7bw346hfpw0gans048vsn7chyzjhyr7ah5xrfg"; depends=[foreach ggplot2 isotone plyr]; }; gppm = derive2 { name="gppm"; version="0.2.0"; sha256="1n9is3xj52lsck2fiy9j320p2ca6ib36s251i7g3iz99a77b0ahh"; depends=[ggplot2 ggthemes MASS mvtnorm Rcpp rstan]; }; gpr = derive2 { name="gpr"; version="1.1"; sha256="03ywik11kc6cnaqrzzzi94jkrdbd378m3sf26f2vpb7d834nl728"; depends=[]; }; - gprofiler2 = derive2 { name="gprofiler2"; version="0.1.4"; sha256="0plllcbidfg0wjyw5q48bc1jy8xingz7dl66xbskljp2fm8gi8jk"; depends=[crosstalk dplyr ggplot2 gridExtra jsonlite plotly plyr RCurl tidyr viridisLite]; }; + gprofiler2 = derive2 { name="gprofiler2"; version="0.1.5"; sha256="07w6bihz6rbd4ldgdyvx1xabvhhnif2wdc3251a7bpdm9381m0xa"; depends=[crosstalk dplyr ggplot2 gridExtra jsonlite plotly plyr RCurl tidyr viridisLite]; }; gptk = derive2 { name="gptk"; version="1.08"; sha256="0fk6c8f8fni4y2n2cbfwywlfyz74xlb8lx25wajsxr2v4x74pa7l"; depends=[fields Matrix]; }; gpuR = derive2 { name="gpuR"; version="2.0.3"; sha256="1afbnrnk0hrsd3qa7gh269wxn1maq7dpi6wpjhhbp2gwr6100vqy"; depends=[assertive BH Rcpp RcppEigen RViennaCL]; }; gqlr = derive2 { name="gqlr"; version="0.0.1"; sha256="0qvyvy514ma5wi2qm6a8praqa7js9wl0hh0ack1hknw33g2gyqhy"; depends=[graphql jsonlite magrittr pryr R6]; }; @@ -8038,7 +8148,7 @@ in with self; { grImport2 = derive2 { name="grImport2"; version="0.1-5"; sha256="0dyb3nrrvxnkk9q5b136bdivcz1jj3ajx1kscm3k0kkpqjif0pls"; depends=[base64enc jpeg png XML]; }; gradDescent = derive2 { name="gradDescent"; version="3.0"; sha256="1jxgvnjw9qk5bkb0fw4kyks4vb9d1933jn79ry0w6956mq2xbb79"; depends=[]; }; grade = derive2 { name="grade"; version="0.2-1"; sha256="085hfvqn880yk19axdjv3z9jr33kls212vs172a8mzhnkallph1r"; depends=[]; }; - gradeR = derive2 { name="gradeR"; version="1.0.0"; sha256="1sx5bijp0ckkwr2zjs5mr5dk73wpbw6rk5rvni71w2w2zxm35fhb"; depends=[testthat]; }; + gradeR = derive2 { name="gradeR"; version="1.0.1"; sha256="15vjzc3y8gs433y47kp5cyrqrn3wphj1xb4q4wryn2bbhgf2m13y"; depends=[testthat]; }; gradientPickerD3 = derive2 { name="gradientPickerD3"; version="0.1.0.0"; sha256="0b20iqfipr7migwk1fl4lvdf4ghprqivcgmchfshhr8q82hyd1q0"; depends=[htmlwidgets jsonlite shiny]; }; grainchanger = derive2 { name="grainchanger"; version="0.2.0"; sha256="00gxzzl47kpghwzz22z5b1m1gcpsfg5pay3hcdwdqr00mz2albg2"; depends=[checkmate furrr raster sf usethis]; }; gramEvol = derive2 { name="gramEvol"; version="2.1-3"; sha256="0z2511zhs2gcdkwp29n6fpafhn49h69yi56nmrhh9zc8jqj1rwpa"; depends=[]; }; @@ -8046,13 +8156,14 @@ in with self; { 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]; }; grapes = derive2 { name="grapes"; version="1.0.0"; sha256="079b7w2xhb0a481s7qihhka0l9ydkjdph0865wjjkcbpr4775p26"; depends=[magrittr]; }; - graphTweets = derive2 { name="graphTweets"; version="0.5.1"; sha256="1279d5ysfq8338b35y35373z1k2gphcr9ynckg3q0pnvx9cqihlk"; depends=[combinat dplyr igraph magrittr purrr rlang rtweet tidyr zeallot]; }; + graph4lg = derive2 { name="graph4lg"; version="0.1.1"; sha256="095nr0a00p8nl6plmkl68czj6r74bwwvmk7xzdpw4i32j4raldpi"; depends=[ade4 adegenet diveRsity doBy ecodist ggplot2 igraph Imap MASS Matrix mclust pegas raster Rdpack rgdal sf sp stringr tidyr vegan]; }; + graphTweets = derive2 { name="graphTweets"; version="0.5.2"; sha256="1rizfabd3j3n5ddzg6c2a4jy4jnbdpy2zv8k09jqrxjkg1cvl5m0"; depends=[combinat dplyr igraph magrittr purrr rlang rtweet tidyr zeallot]; }; grapherator = derive2 { name="grapherator"; version="1.0.0"; sha256="071by9b8figbsf4g0f8a8mgcdksjksc57mnlgggilw7py1yjnjlh"; depends=[BBmisc checkmate deldir ggplot2 lhs reshape2 vegan]; }; graphframes = derive2 { name="graphframes"; version="0.1.2"; sha256="1bv7d0sggwab4rd486ayw9gkb5ja5p5fin5pn92xnrmz8cgwsfxq"; depends=[forge sparklyr tibble]; }; graphicalVAR = derive2 { name="graphicalVAR"; version="0.2.2"; sha256="1jzhqbdylpzc8d28vz2k34i9dpxx5x34bgvx73z8wjglnn6j27b8"; depends=[dplyr glasso glmnet igraph Matrix mvtnorm qgraph Rcpp RcppArmadillo]; }; graphicsQC = derive2 { name="graphicsQC"; version="1.0-8"; sha256="12vg93xfmkv73i19vkb10q2qngmsxd3y42z3l6izdywbdc3cdfkg"; depends=[XML]; }; graphkernels = derive2 { name="graphkernels"; version="1.6"; sha256="1gn3ihqz7m0rdvvc2fp7hsgq583wh5cnz7200a2ff89xc04zs3dc"; depends=[igraph Rcpp RcppEigen]; }; - graphlayouts = derive2 { name="graphlayouts"; version="0.1.0"; sha256="121fsp8bmvahxckrh8b042w2f3xrfp3yp65453scxhckc9amzc7l"; depends=[gbp igraph oaqc Rcpp scales]; }; + graphlayouts = derive2 { name="graphlayouts"; version="0.2.0"; sha256="009hy3byr5giysmylkjrkskzhb40zcmpw445a5yqyifjqpfvfm8g"; depends=[gbp igraph oaqc Rcpp scales]; }; graphon = derive2 { name="graphon"; version="0.3.2"; sha256="0bh542ffxklydb826srnacmw3cncd8cxnkj76r40mbkaxq7vxxlp"; depends=[Rdpack ROptSpace]; }; graphql = derive2 { name="graphql"; version="1.5"; sha256="0zi1l93yk5rlgdy4j2nph14w0h8kgvnbzk9fi2jfys8s3fz54ksr"; depends=[jsonlite Rcpp]; }; graphscan = derive2 { name="graphscan"; version="1.1.1"; sha256="1dgjb0grdymhimdgwnddjcivgy2i9r1i1nni4v9mx0447skcahk9"; depends=[ape rgl snowfall sp]; }; @@ -8060,13 +8171,14 @@ in with self; { graticule = derive2 { name="graticule"; version="0.1.2"; sha256="1yvrijvyjilfql72dxj32b3sczqv065zj61729wrrzn63xcifvmb"; depends=[raster sp]; }; grattan = derive2 { name="grattan"; version="1.7.1.2"; sha256="1dmy6shigybp3g7kjqc9f2c28niw9if7igi1xmc8qnf0azlnlrlz"; depends=[assertthat data_table fastmatch forecast hutils ineq magrittr Rcpp rsdmx zoo]; }; gravity = derive2 { name="gravity"; version="0.9.8"; sha256="1yx71gidv3ivjfip994ciaiwk2cvvm8z16yax4lwpwgl1fxj1p4k"; depends=[censReg dplyr glm2 lmtest magrittr MASS multiwayvcov purrr Rdpack rlang sandwich survival tibble tidyr]; }; - grec = derive2 { name="grec"; version="1.2.2"; sha256="0xr17xq4hvl6zaajj04cwymmpzfnbwb86z0ziarj5bc5wjfw0yb2"; depends=[imagine raster]; }; + grec = derive2 { name="grec"; version="1.3.0"; sha256="0fksxzjnm843wbcwjf06gcbbw4lfz7zk361bj6qdpnkcfcl22c1w"; depends=[imagine raster]; }; + greenclust = derive2 { name="greenclust"; version="1.0.0"; sha256="1qqlg40bzi088vn4yx33izf12jsviyqj63a24xw2426lg4lif3kv"; depends=[]; }; gremlin = derive2 { name="gremlin"; version="0.1.0.1"; sha256="1qsjj910lmwdnmbn0fxakw713sk7myavgrmp5xm86my7cm866hmb"; depends=[Matrix]; }; gren = derive2 { name="gren"; version="0.0.1"; sha256="1wb5wwdjxi7q36md7xzmbw5lrggcgghkz3pmxipjpxw8kfv804xp"; depends=[glmnet Iso pROC Rcpp RcppArmadillo]; }; greport = derive2 { name="greport"; version="0.7-1"; sha256="1h1g3khb30n3y8l1sxpas2s6s667az4yxvsq42x5dfx8fic42p6n"; depends=[data_table Formula ggplot2 Hmisc lattice latticeExtra rms survival]; }; greta = derive2 { name="greta"; version="0.3.0"; sha256="03yjf8cs4z2y1pjl7qvv2icp16f5xykd725mf1vs4zk04asq4xna"; depends=[coda future progress R6 reticulate tensorflow]; }; grex = derive2 { name="grex"; version="1.9"; sha256="0s6nan76rrmh3yhgvzb7pqdrzx2w9px8ay4v9yiib4bamy9wmhpb"; depends=[]; }; - greybox = derive2 { name="greybox"; version="0.5.2"; sha256="05ymcxk51y3w36fmrd7vzvxfnl2yd4xiki8c93wsnpcz3lz4zsr9"; depends=[forecast lamW nloptr numDeriv Rcpp]; }; + greybox = derive2 { name="greybox"; version="0.5.3"; sha256="0q57vyl5cz3xyl4ybij85nvnqqnmnfh7r4gw6gr9q1ynjsxam25h"; depends=[forecast lamW nloptr numDeriv Rcpp]; }; greyzoneSurv = derive2 { name="greyzoneSurv"; version="1.0"; sha256="115i0d4fy4p4g4vd419hj9f23hi8cbiyfilgpgmag91ilr1xpcdp"; depends=[Hmisc survAUC survival]; }; grf = derive2 { name="grf"; version="0.10.3"; sha256="10fp79w533b6ffrdy9ch94xq1xqzmlz8dsly5h3rznhcbidk8s46"; depends=[DiceKriging lmtest Matrix Rcpp RcppEigen sandwich]; }; gridBase = derive2 { name="gridBase"; version="0.4-7"; sha256="09jzw4rzwf2y5lcz7b16mb68pn0fqigv34ff7lr6w3yi9k91i1xy"; depends=[]; }; @@ -8079,21 +8191,21 @@ in with self; { gridSVG = derive2 { name="gridSVG"; version="1.7-0"; sha256="0wdjj6jyk1zflglhimjzhws51ifwz3yb044j5nfsynn6kjdgfn32"; depends=[jsonlite XML]; }; gridsample = derive2 { name="gridsample"; version="0.2.1"; sha256="062aryy26x07m31r6m0fj1zgnjhivlh1fikx9lv2rdgk0rh4yzz0"; depends=[data_table geosphere maptools raster rgdal rgeos sp spatstat spatstat_utils]; }; gridsampler = derive2 { name="gridsampler"; version="0.6"; sha256="0wqpqg9c372sv8zqks6v93gawiyfghw58hn7m8q45dxpqm16ss3k"; depends=[BiasedUrn ggplot2 plyr reshape2 shiny shinyBS shinythemes]; }; + gripp = derive2 { name="gripp"; version="0.2.19"; sha256="096mz1czp2mx4ny5q4frbqnx99ymw39p7lp5qfna7ydnwiiajkd2"; depends=[GA GenSA usethis]; }; grnn = derive2 { name="grnn"; version="0.1.0"; sha256="1dxcmar42g9hz4zlyszlmmnnsnja0gxfggav5jxv0gkp32rkd0wh"; depends=[]; }; groc = derive2 { name="groc"; version="1.0.6"; sha256="0x7rrf5bw05s257xhzklpc6hslpjnzjx02hlrz4r9zixbfffmawc"; depends=[MASS mgcv pls robust robustbase rrcov]; }; gromovlab = derive2 { name="gromovlab"; version="0.7-6"; sha256="02s7x23610dbpmrqh7pimspa10v3fnmj48fwmh0a6igd74rmj2mg"; depends=[ape cluster glpkAPI igraph quadprog]; }; groupICA = derive2 { name="groupICA"; version="0.1.1"; sha256="1wl828ligvvw55xic383gdn7aq4mbwsnkl4ym6f71jn5g3p36d0i"; depends=[MASS]; }; groupRemMap = derive2 { name="groupRemMap"; version="0.1-0"; sha256="1bfp746j0dx7kk44nyjqmimvgw14par9ayvqxnzldc05qsazjdwx"; depends=[]; }; - groupdata2 = derive2 { name="groupdata2"; version="1.1.0"; sha256="0xy112g8b9v1rqsan113qcm1hbv34nzvvn1jf1mmnv6ybv9y8nri"; depends=[dplyr numbers plyr rlang tibble]; }; + groupdata2 = derive2 { name="groupdata2"; version="1.1.1"; sha256="1hnr5gd9gqh8wf1vign6wa95n4jw2xn0vmwlxdgczy7b77xqbs24"; depends=[dplyr numbers plyr rlang tibble]; }; grouped = derive2 { name="grouped"; version="0.6-0"; sha256="1glxgacpwk7yjbkwg5ci6bmb2il6hf5zhydwi5bbq6hc032m9976"; depends=[MASS]; }; groupedSurv = derive2 { name="groupedSurv"; version="1.0.3"; sha256="15ah8v1mfyq9xi27kkl0vwwbhf16vd4hy9h809jlw1i7b1zwg4pm"; depends=[BH doParallel doRNG foreach qvalue Rcpp RcppEigen]; }; groupedstats = derive2 { name="groupedstats"; version="0.0.7"; sha256="087y0pb3hsk4djhf2pcfkflgia3pngjx1c6i9d79dm5wcrhhk4q4"; depends=[broomExtra crayon dplyr glue lme4 magrittr purrr rlang robust rstudioapi sjstats skimr tibble tidyr]; }; groupsubsetselection = derive2 { name="groupsubsetselection"; version="1.0.3"; sha256="118cj5xc8nbq4fs2gbzg1nhynixaflbl0si77gyy4ybw0drsz4nj"; depends=[]; }; grove = derive2 { name="grove"; version="1.1"; sha256="0fqsj5dx7py7cin3hvfkxglh8v3x0dwj6cxy4h5vbddjl687db5x"; depends=[Rcpp RcppArmadillo wavethresh]; }; - growcurves = derive2 { name="growcurves"; version="0.2.4.1"; sha256="0h96c1hd6cdzc2l2a9dakmxn2hspvr0fpx9938iscm4hi9ds97m2"; depends=[Formula ggplot2 Rcpp RcppArmadillo reshape2]; }; growfunctions = derive2 { name="growfunctions"; version="0.14"; sha256="1pvyiw20fxm3l4giyq4iizc67yy36i6wq4ch2qyqg4mfd4bki2g4"; depends=[ggplot2 mvtnorm Rcpp RcppArmadillo reshape2 spam]; }; growth = derive2 { name="growth"; version="1.1.1"; sha256="05yxjlbv1i4ly8yp3aqbxzq1z2mp7sfx7xyqw48qsdv0acqai7jy"; depends=[rmutil]; }; - growthPheno = derive2 { name="growthPheno"; version="1.0-13"; sha256="04xd3ys25j8wv9gr7rr63gdq1i60dr0i43qzxx62d0xi6cgm4xka"; depends=[dae GGally ggplot2 Hmisc RColorBrewer reshape XLConnect]; }; + growthPheno = derive2 { name="growthPheno"; version="1.0-15"; sha256="1wxjff9ylaxksn9w5wjhwka7bgc5z2qv29n10162wryr2ak6lps9"; depends=[dae GGally ggplot2 Hmisc RColorBrewer reshape XLConnect]; }; growthcurver = derive2 { name="growthcurver"; version="0.3.0"; sha256="0q7g00b9sxxlq8yscmmccr8r4mwzpc707arbrr46iii8ra9icvlb"; depends=[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]; }; @@ -8158,7 +8270,7 @@ in with self; { gwrr = derive2 { name="gwrr"; version="0.2-1"; sha256="1fjk217pimnmxsimqp9sn02nr1mwy3hw3vsr95skbfsd6vdda14d"; depends=[fields lars]; }; gym = derive2 { name="gym"; version="0.1.0"; sha256="0vcwzgawqwjsf65hr1mbjkz3px8zsibfkn42jpsg39n13jpfjq8v"; depends=[httr jsonlite]; }; gyriq = derive2 { name="gyriq"; version="1.0.2"; sha256="12vbnhianzi4l43czaxrbnbkz1h8lvmwjys0y3c2ml3g6dmwwfji"; depends=[CompQuadForm irlba mvtnorm survival]; }; - h2o = derive2 { name="h2o"; version="3.24.0.5"; sha256="0dwl7zj3f4qwycrghazd2g02qnx5bs6xz1qlgxmy3i05y5pl1pi0"; depends=[jsonlite RCurl]; }; + h2o = derive2 { name="h2o"; version="3.26.0.2"; sha256="1ldjk1gm6jb5zvk2rmlfah4zm827dpmj4c5q83ysd4arwqqz5gna"; depends=[jsonlite RCurl]; }; h2o4gpu = derive2 { name="h2o4gpu"; version="0.2.0"; sha256="06d2rrr27xvnsai6zjiaiw0jjfzdza1cc39c03d6pjkvnh0mqh2c"; depends=[magrittr reticulate]; }; h5 = derive2 { name="h5"; version="0.9.9"; sha256="14p7i1sj24ky87kd7qr3n9fc9l64s0bp0rwbyl6i2x69xn75gpsx"; depends=[Rcpp]; }; hBayesDM = derive2 { name="hBayesDM"; version="0.7.2"; sha256="0k1gcnjmblk8ign6fzv7cl9qv964mi6jaams5z22x82jnw1sx47c"; depends=[BH data_table ggplot2 loo Rcpp RcppEigen rstan StanHeaders]; }; @@ -8184,7 +8296,7 @@ in with self; { happybiRthday = derive2 { name="happybiRthday"; version="0.0.1"; sha256="0rrvi5kx09p74xwxvqcwibbh4qjlk4jxb89grx74chjxk9ak2yv8"; depends=[data_table dplyr gh lubridate tidyr]; }; happytime = derive2 { name="happytime"; version="0.1.0"; sha256="03iblwb6w2dh9sibfi4nlswidck13hzsn7123838zp4sxfnrp041"; depends=[]; }; hapsim = derive2 { name="hapsim"; version="0.31"; sha256="0jw6iw89d4y8wjy58biv40szp123ql7frz1mmdjdxljmwaby963h"; depends=[MASS]; }; - harmonicmeanp = derive2 { name="harmonicmeanp"; version="1.1"; sha256="1lfnxknj4hm7m64i3v4bwhv84w1r4b7bd45rhsyfhg3ag9lg93ka"; depends=[ape FMStable knitr]; }; + harmonicmeanp = derive2 { name="harmonicmeanp"; version="2.0"; sha256="08f3p2ig3lm1n70qr05chldp04ycv420fa8hvd4nmadas12gfb5m"; depends=[FMStable]; }; harrietr = derive2 { name="harrietr"; version="0.2.3"; sha256="0n6vsqysj4ijh06z6nqmj8x1z4w9711dxhbfp8p8fwi0l75pj0cj"; depends=[ape dplyr ggtree lazyeval magrittr rlang tidyr]; }; harrypotter = derive2 { name="harrypotter"; version="2.1.0"; sha256="151kpg47b1hyv6rc3cksykqw8pz0xqm0q9xf9sxa2w14ibymvc8k"; depends=[ggplot2 gridExtra]; }; hash = derive2 { name="hash"; version="2.2.6.1"; sha256="0b3fl0rvgwb992knl81vm99lsldg5clvaqjh6mamm6zqmb6dz056"; depends=[]; }; @@ -8193,7 +8305,7 @@ in with self; { hashmap = derive2 { name="hashmap"; version="0.2.2"; sha256="1qypmyi033rjxjk055rv94qfqa99gm5hj5gfd9fiiq1xln3z700j"; depends=[BH Rcpp]; }; hashr = derive2 { name="hashr"; version="0.1.0"; sha256="1ri2zz2l1rrc1qmpqamzw21d9y06c7yb3wr60izw81l8z4mmyc3a"; depends=[]; }; hasseDiagram = derive2 { name="hasseDiagram"; version="0.1.3"; sha256="1r9z6jc9lbdj2xc81gpnbswrl8rhs8zrlsnypfrny40g3j402iap"; depends=[graph Rgraphviz]; }; - haven = derive2 { name="haven"; version="2.1.0"; sha256="0x5fwc4q2gdxwwp5sxdd6q17jhpisd769y9kv0xgnjcm0cdwz8f0"; depends=[forcats hms Rcpp readr tibble]; }; + haven = derive2 { name="haven"; version="2.1.1"; sha256="12h64r2v2451igyl7v4w2kg0hzw9rnanph0m7smffq29ybkv9g4h"; depends=[forcats hms Rcpp readr tibble]; }; hawkes = derive2 { name="hawkes"; version="0.0-4"; sha256="1ghwq3icxwmrai3xn9r8cnvlh3z3j18lznhw1bm31h9mkkp2dk0a"; depends=[Rcpp RcppArmadillo]; }; hazer = derive2 { name="hazer"; version="1.1.1"; sha256="1d1qj6mamgxlvxq2hjik69zfzackjz5819iss98jf5gdbdngw41x"; depends=[]; }; hazus = derive2 { name="hazus"; version="0.1"; sha256="1c0ahjdy9di1683nk5k4rmr6rhb66523ny039nyv842rgqdy625j"; depends=[reshape2]; }; @@ -8211,6 +8323,7 @@ in with self; { hddplot = derive2 { name="hddplot"; version="0.59"; sha256="18llkpawm12cjxlcrlra60m16virfpjqiaqkvy9mb3wq1zif61rh"; depends=[MASS multtest]; }; hddtools = derive2 { name="hddtools"; version="0.8.2"; sha256="02gbqlzwxc77gllgz9sf2s73y4ngyb4warabdfyj2sm2g7jl6y12"; depends=[gdata Hmisc raster RCurl rgdal rnrfa sp stringr tibble XML zoo]; }; hdf5r = derive2 { name="hdf5r"; version="1.2.0"; sha256="10gynjwaaxks8y9c2fl8k040j0nbwn372nil70009yfk9wrkx0aq"; depends=[bit64 R6]; }; + hdfqlr = derive2 { name="hdfqlr"; version="0.6-0"; sha256="0hvg23fcx5basy8fnqbnrrkqaddmj0lkqldqgxkj5gdnwshrhkl3"; depends=[]; }; hdi = derive2 { name="hdi"; version="0.1-7"; sha256="1q58bvlqh59hv3vb3dw92r0w1nwyifnqm5ccss54fzmf2gjsj1cj"; depends=[glmnet linprog MASS scalreg]; }; hdlm = derive2 { name="hdlm"; version="1.3.1"; sha256="1zl6bksw0apkmn5shf8qjpxjyx6vb40dc4m4db76hhn5nhcp10ic"; depends=[foreach glmnet iterators MASS Matrix]; }; hdm = derive2 { name="hdm"; version="0.3.1"; sha256="1kibfc1fc94y1vk06nn0yfvpdzcm30a1jn89lqqfma70x5jpa25s"; depends=[checkmate Formula ggplot2 glmnet MASS]; }; @@ -8225,10 +8338,10 @@ in with self; { heatmap3 = derive2 { name="heatmap3"; version="1.1.6"; sha256="13aa9rd16k67b1fr6471bdz2a1i04k7279ck1i4rjdly9rbksnjx"; depends=[fastcluster]; }; heatmapFit = derive2 { name="heatmapFit"; version="2.0.4"; sha256="1rswp1wp58f21fpyjybcvvmnn53kr54ij83hp05qbvl7yn1fsnrb"; depends=[]; }; heatmaply = derive2 { name="heatmaply"; version="0.16.0"; sha256="1qhxk48qh61qjxdlhl0qffdh3yh8iiwccid5ssngdv433q0cmyc1"; depends=[assertthat colorspace dendextend ggplot2 htmlwidgets magrittr plotly RColorBrewer reshape2 scales seriation viridis webshot]; }; - heatwaveR = derive2 { name="heatwaveR"; version="0.3.6"; sha256="0bm6q4wgyvzs83hnkyhj21h422hpq5wnxajlp2bcrbmcr7r8nfwg"; depends=[data_table dplyr ggplot2 lubridate Rcpp RcppArmadillo RcppRoll tibble zoo]; }; + heatwaveR = derive2 { name="heatwaveR"; version="0.4.0"; sha256="184rm4jiw3s0xi0jsadbs7pzbwdcvgkqwcs2c7fl9aaayf4m7v1h"; depends=[data_table dplyr ggplot2 lubridate plotly Rcpp RcppArmadillo RcppRoll tibble zoo]; }; heavy = derive2 { name="heavy"; version="0.38.19"; sha256="15bg2qqkslkqfnsq3ixbgmq72xagh8laji0265l06xgf2l6045kx"; depends=[]; }; hedgehog = derive2 { name="hedgehog"; version="0.1"; sha256="1mvjnm2zlc4pvw9vnhxr0dj1g1sfqvlrnnhcipzfbvr147yan9l5"; depends=[rlang testthat]; }; - heemod = derive2 { name="heemod"; version="0.9.4"; sha256="1is1a7pibx898srpmq2zc44c81a0adhmyjgahab8w27x5hda08vk"; depends=[dplyr ggplot2 lazyeval memoise mvnfast plyr pryr tibble]; }; + heemod = derive2 { name="heemod"; version="0.10.0"; sha256="0vkmjsi8dya6zyhh6bxisvwaydk6w2q9k31gkbkvwjcjrv09dnnv"; depends=[dplyr ggplot2 lazyeval memoise mvnfast plyr pryr tibble]; }; heims = derive2 { name="heims"; version="0.4.0"; sha256="0vnq31jwn09grni4gdhf1hzd87b62as4f65b2qw7ky6mi38ahr5d"; depends=[bit64 data_table fastmatch hutils lubridate magrittr]; }; helixvis = derive2 { name="helixvis"; version="1.0.1"; sha256="113rnpnrcnw18ks78fgq79zdrw3kmpzpimlc45gvj0za2fbyci3p"; depends=[ggforce ggplot2 rlang]; }; hellno = derive2 { name="hellno"; version="0.0.1"; sha256="1j787rw9hh75bvkckmlz5xkgwc22gd7si3mgjd7v60dd6lykfa88"; depends=[]; }; @@ -8241,7 +8354,7 @@ in with self; { heritability = derive2 { name="heritability"; version="1.2"; sha256="18snrfsjj5jw5qicj92d5qch9v4ciqw1hbiwg6q8kfjka9nmqpma"; depends=[MASS]; }; hermite = derive2 { name="hermite"; version="1.1.2"; sha256="0j9s7ayvbvmgwybrvf703b72qbn8gskb105pis19ig2sslllzda3"; depends=[maxLik]; }; hero = derive2 { name="hero"; version="0.0.3"; sha256="166jqxlp2x459ixm83kw55ssd86041qiwfymsk035r5aaf7nvjq1"; depends=[]; }; - hesim = derive2 { name="hesim"; version="0.2.0"; sha256="1pb6xlxp69jmzqmv2gxgn2wq5mz7xp4smhvqgmb3n4zhrwhzpk25"; depends=[data_table flexsurv MASS R6 Rcpp RcppArmadillo survival]; }; + hesim = derive2 { name="hesim"; version="0.2.1"; sha256="1b8hsdyk88kpf6d1dkxg8zmp7qkfdbm2w6rkspkjam0034d2ni6q"; depends=[data_table flexsurv MASS R6 Rcpp RcppArmadillo survival]; }; het_test = derive2 { name="het.test"; version="0.1"; sha256="08kxp81dx32anh0k5b65x7w7madwnn9hiabdrk6ck6b6mx37x26v"; depends=[vars]; }; hetGP = derive2 { name="hetGP"; version="1.1.1"; sha256="1f0lb91hb6lp9cfil1qpbqf032xv697jazcqyc1y694hdbx0jwqj"; depends=[DiceDesign MASS Rcpp]; }; hett = derive2 { name="hett"; version="0.3-2"; sha256="1kmspw0738pdall5scmllsa79dynliai2glk1h5rzm4030r5rd6j"; depends=[lattice MASS]; }; @@ -8267,7 +8380,7 @@ in with self; { 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.7"; sha256="1yjsbi17qkz7x9q9x6i8312skwf4gjyisp2096wbg9s19dzvccvi"; depends=[]; }; - hierarchicalDS = derive2 { name="hierarchicalDS"; version="2.9"; sha256="0ckxy4pww5iik4m4kqs714f00g7lfzsarjdbpd0bcalvq4lmaal2"; depends=[coda ggplot2 Matrix mc2d mvtnorm rgeos truncnorm xtable]; }; + hierarchicalDS = derive2 { name="hierarchicalDS"; version="3.0"; sha256="16d6l3y21nhynfjk4swp3pnjr6vhcxq369djgxz907zsjby35gkz"; depends=[coda ggplot2 Matrix mc2d MCMCpack mvtnorm rgeos truncnorm xtable]; }; hierarchicalSets = derive2 { name="hierarchicalSets"; version="1.0.2"; sha256="0m5mnx1zmiscj0k1gnljr7fla4y1qhysi32a8q9jlah2q7grk7x9"; depends=[ggdendro ggplot2 gtable MASS Matrix RColorBrewer Rcpp scales]; }; hierband = derive2 { name="hierband"; version="1.0"; sha256="0d95hrgkd8b5sww3wsgs6v9zg9pm71ick8x8kj8d6vyib350h6yn"; depends=[]; }; hierfstat = derive2 { name="hierfstat"; version="0.04-22"; sha256="1fav2v2996v5kb1ffa6v5wxfm921syxg6as034vd3j4jfhdibyfx"; depends=[ade4 adegenet gtools]; }; @@ -8285,10 +8398,11 @@ in with self; { higrad = derive2 { name="higrad"; version="0.1.0"; sha256="0q9av8qyvmvgy6a3l7svcmbkjjgnp4iny1cld4g3qsbaz3yp3jaj"; depends=[Matrix]; }; hillR = derive2 { name="hillR"; version="0.4.0"; sha256="0wivagbn4clfm3vbxbl3p93d9yxms94gkvi7p15lh0jfdppzm4c9"; depends=[ade4 ape FD plyr tibble]; }; hillmakeR = derive2 { name="hillmakeR"; version="0.2"; sha256="1baynibgn4xqmpsxna8irggxvdc484mq5nza00rwg58vh1bc7wzq"; depends=[]; }; + hindex = derive2 { name="hindex"; version="0.1.0"; sha256="12w1zz467grihjvan1db7c30psm0j85k82p01fzqgwdam3cd8as3"; depends=[foreach ggplot2]; }; hindexcalculator = derive2 { name="hindexcalculator"; version="1.0.0"; sha256="06b4dn629avmnyqxb0l39m00wz9cg9dddmm6qhgwgnzlxh14ifgk"; depends=[]; }; hint = derive2 { name="hint"; version="0.1-1"; sha256="1n18j2hcb1qynhsln10nzryi20l5aqhr7i1aanww10y5dz573zi3"; depends=[]; }; hipread = derive2 { name="hipread"; version="0.2.1"; sha256="0zll3w0arwjaz16dr9dxns3s25p3fiq4ccnziq4nw7i552zaixd7"; depends=[BH R6 Rcpp rlang tibble]; }; - hisse = derive2 { name="hisse"; version="1.9.4"; sha256="1myv9m1pyfbszwsrf3dj6vzjrh0fzdd9apda42x97pivbb80i06h"; depends=[ape data_table deSolve diversitree GenSA nloptr phytools plotrix subplex]; }; + hisse = derive2 { name="hisse"; version="1.9.5"; sha256="05063gprbn7i2hpg8hx2ryfrd3rpmb66c2h5i60830v7s7x4fyb9"; depends=[ape data_table deSolve diversitree GenSA nloptr phytools plotrix subplex]; }; histmdl = derive2 { name="histmdl"; version="0.7-1"; sha256="0k6l3pfjzlgpxv55vy8dg4sl8zhh0460xcfszwp2k9sbzanwaamp"; depends=[]; }; histogram = derive2 { name="histogram"; version="0.0-25"; sha256="0yymc7fw4qkbigr8jiw2nzjyrw0ikkipz62pdn3bpz1f7nb7mi93"; depends=[]; }; historydata = derive2 { name="historydata"; version="0.1"; sha256="1h69x3iig542d43p9zm8x83p4dq48iwsw606j4fndnqhx99vzkw6"; depends=[]; }; @@ -8301,10 +8415,11 @@ in with self; { hkex_api = derive2 { name="hkex.api"; version="0.1"; sha256="0hqwihlrppchpaz2yaq92gf779yi5k8n7sxy1kbpjxs2qc18xvj2"; depends=[httr RCurl XML]; }; hmeasure = derive2 { name="hmeasure"; version="1.0-2"; sha256="0l4nlny532kddiaa1nmgd37971whhwzb54mb1pvbwax7fsg6hmhw"; depends=[]; }; hmi = derive2 { name="hmi"; version="0.9.16"; sha256="128rwbflxy9j49xpgmwjsw35jhsz586r5b0hn80jkjmpfshnffx3"; depends=[boot coda linLIR lme4 MASS Matrix MCMCglmm mice msm mvtnorm nlme nnet ordinal pbivnorm rlang tmvtnorm VGAM]; }; + hmlasso = derive2 { name="hmlasso"; version="0.0.1"; sha256="0ydcyz9pw30ji8ghrvkgcbmp27d661vajl97b8cwis52605a3gfx"; depends=[BH MASS Matrix Rcpp RSpectra]; }; hmm_discnp = derive2 { name="hmm.discnp"; version="2.1-5"; sha256="1nawdj5rxh54gxyrr9xw1zw1k1b20ds397mz07x6n7nyjmj4lak2"; depends=[nnet]; }; hmmm = derive2 { name="hmmm"; version="1.0-4"; sha256="1sbr85lcmcw3lv0ygqwfbarr91dp3br1xnlygy49145cvl93nfci"; depends=[MASS mvtnorm nleqslv quadprog]; }; - hms = derive2 { name="hms"; version="0.4.2"; sha256="1g6hslk3z0xga38r71irxq802wskg6nv804mp8y9f7i2wfrj0y55"; depends=[pkgconfig rlang]; }; - hmstimer = derive2 { name="hmstimer"; version="0.0.1"; sha256="0wjd6n21ac94dq5zgwjvfhrgr30khc70ql5602dnd7m7md1b31xf"; depends=[]; }; + hms = derive2 { name="hms"; version="0.5.0"; sha256="06snfqdczr0x0nbp7qnvwhlp2pw0wx9c2y3xb4gr1wrvbik74y58"; depends=[pkgconfig rlang vctrs]; }; + hmstimer = derive2 { name="hmstimer"; version="0.0.2"; sha256="0qv2pls6mplnv3mylbiwh83gnvq2qkdpnnjnxnhrgmwia9fapixs"; depends=[]; }; hnp = derive2 { name="hnp"; version="1.2-6"; sha256="12cbc353ipr2rcc93skf1766g38j1pvpdkqk3cswv0cxsjl2x7pl"; depends=[MASS]; }; hoa = derive2 { name="hoa"; version="2.1.4.1"; sha256="152vz6cddphmxvm7vi6f3b7jjpib0nsb6qv2k1wrmfrpvv3hgsxx"; depends=[statmod survival]; }; hoardeR = derive2 { name="hoardeR"; version="0.9.4-2"; sha256="1jdxfalmi4p7gwb7jndxbzbklv1fk0c57shnl4jz27s81lndg437"; depends=[bamsignals Biostrings data_table GenomicRanges GenomicTools_fileHandler httr IRanges KernSmooth knitr MASS R_utils RCurl rmarkdown Rsamtools S4Vectors seqinr stringr XML]; }; @@ -8318,12 +8433,12 @@ in with self; { homologene = derive2 { name="homologene"; version="1.4.68.19.3.27"; sha256="0d7wxisk0vqk1n165v1i19bc02zv78h5r5d3jqai5y6nkmwn01sh"; depends=[dplyr magrittr purrr R_utils readr]; }; homomorpheR = derive2 { name="homomorpheR"; version="0.2-2"; sha256="1iahq16nswlc3b87598206xdp24bg9v8acyjp1jivybl3fr4k3pq"; depends=[gmp R6 sodium]; }; homtest = derive2 { name="homtest"; version="1.0-5"; sha256="1lnqlg3dwq174ic6dbjllysw5fjy5kvvgbl6gvabjmcs66z27fp0"; depends=[]; }; - hopbyhop = derive2 { name="hopbyhop"; version="2.1"; sha256="0j4m1zz0ijf1kw2m12g7bww3418b8pyjvvrzkm8xcryjil2xfmim"; depends=[]; }; + hopbyhop = derive2 { name="hopbyhop"; version="3.41"; sha256="1dh502mjrk9dlqikn0ak4gh2dw9nrnp3zrz8j1xwa9cjn37al2wh"; depends=[ggplot2 pastecs]; }; hopit = derive2 { name="hopit"; version="0.9.0"; sha256="177kg6gqf76qhjlm259g8if0n4345mv0xxk6vi4qy5c64zx29arg"; depends=[MASS Matrix Rcpp RcppEigen Rdpack survey]; }; horizon = derive2 { name="horizon"; version="1.2"; sha256="0b8m9ghfabjgdl155wh4gc4ng2lsvyfyhsy62pldbcix757b4ck9"; depends=[raster]; }; hornpa = derive2 { name="hornpa"; version="1.0"; sha256="0pfvk2jkrwgvshgq9g55qijgpjh0677rpbya0r8759n92v3axbp4"; depends=[]; }; horserule = derive2 { name="horserule"; version="1.0.0"; sha256="0d348pn0ld7lr9lfl1z05905l9kl296j0xic1pib6r5l1c5600r9"; depends=[gbm ggplot2 inTrees MASS mvnfast randomForest RColorBrewer Rdpack]; }; - horseshoe = derive2 { name="horseshoe"; version="0.1.0"; sha256="19khsr7gfcygqasjswvm0v0ddna1i1grfbhars8jlvybfawswhgx"; depends=[]; }; + horseshoe = derive2 { name="horseshoe"; version="0.2.0"; sha256="1qhkw6agkhpmgf27429c3kqqhbvpg61l0dvfxg7n564y2ha76r3c"; depends=[]; }; 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.3"; sha256="12v88k3yz1bsxx9p5dx8y54ccqcglwknm2jr7ybygdj2yasjr5l0"; depends=[ineq lattice]; }; @@ -8350,7 +8465,7 @@ in with self; { htmlwidgets = derive2 { name="htmlwidgets"; version="1.3"; sha256="04jsdh14l2zifbjpbbh23w7bxz1wpsas0zb2gy2zwv4yqamzzr7i"; depends=[htmltools jsonlite yaml]; }; htree = derive2 { name="htree"; version="2.0.0"; sha256="15bi5c2p4aghihp3k12s78447j2x9hbsaq56b5lc8jmd1vf0jdwb"; depends=[]; }; hts = derive2 { name="hts"; version="5.1.5"; sha256="0mvsxrk7wkfn81hbk8a80fckiqiwdbvhq42k7c6lm69gamnbak2f"; depends=[forecast Matrix matrixcalc Rcpp RcppEigen SparseM]; }; - httk = derive2 { name="httk"; version="1.9.2"; sha256="1x5knzspkh1hb0g5mnz3883bkqx0b460dfj4bnywi3sk0638mlpj"; depends=[data_table deSolve magrittr msm mvtnorm survey truncnorm]; }; + httk = derive2 { name="httk"; version="1.10.0"; sha256="0bczjhykq03wcgjymzyhbk4i8vsd4sr0g6plx8lrfsjqirxf3k72"; depends=[data_table deSolve magrittr msm mvtnorm survey truncnorm]; }; httpRequest = derive2 { name="httpRequest"; version="0.0.10"; sha256="0f6mksy38p9nklsr44ki7a79df1f28jwn2jfyb6f9kbjzh98746j"; depends=[]; }; httpcache = derive2 { name="httpcache"; version="1.1.0"; sha256="11hdc1jj2jbgvsps1h55azq0cr2fl556k631ns9k0747sjfmy2k9"; depends=[digest httr]; }; httpcode = derive2 { name="httpcode"; version="0.2.0"; sha256="06k853ihwzkcx4z3jzazpb03p91frqkwz18jy4fwr8j2nwyqbhgv"; depends=[]; }; @@ -8406,7 +8521,9 @@ in with self; { iBreakDown = derive2 { name="iBreakDown"; version="0.9.6"; sha256="00vlm149ryak7xk059lnv2cic4h4fzlrp9c6jls2dffrpsn0ii02"; depends=[DALEX ggplot2]; }; iC10 = derive2 { name="iC10"; version="1.5"; sha256="1xq6xv582wxdb0nc2nia3q38155gx8z26idiqyx7h1rjb20hhwdl"; depends=[iC10TrainingData impute pamr]; }; iC10TrainingData = derive2 { name="iC10TrainingData"; version="1.3.1"; sha256="175ymib3h359296hk36psryksisipx63ybvacz8hys21irzx58j1"; depends=[]; }; - iCARH = derive2 { name="iCARH"; version="1.0.0"; sha256="1803xdsjwy9n6fd66xhg96ccvggdnxk2dp1fvnb79kcpcvjys50a"; depends=[abind ggplot2 igraph KEGGgraph MASS Matrix mc2d RCurl reshape2 rstan]; }; + iCARH = derive2 { name="iCARH"; version="2.0.0"; sha256="08krf7if4nlj7whchjqsr3gzvhz81w24wa2vxzs6znf9m0k5aqay"; depends=[abind ggplot2 igraph KEGGgraph MASS Matrix mc2d RCurl reshape2 rstan]; }; + iCellR = derive2 { name="iCellR"; version="1.0.0"; sha256="13hfzvi4lqpcngkp757nl7mixbq8bscpxp91wz0rd3gndrgiccv1"; depends=[ape ggdendro ggplot2 ggpubr ggrepel gridExtra Hmisc htmlwidgets knitr Matrix NbClust pheatmap plotly plyr RColorBrewer reshape Rtsne scatterplot3d shiny umap]; }; + iCiteR = derive2 { name="iCiteR"; version="0.1.0"; sha256="1h38m3blnpivrdz1hdgakl502zxb92gjkczra0a7izbq9fn19mfw"; depends=[httr jsonlite]; }; iClick = derive2 { name="iClick"; version="1.5"; sha256="0yq0r9nz1mf9ci6l30ylqxbgl8mf1ahyqzr7m6nks0ygxabipdnd"; depends=[boot car coefplot fBasics forecast lattice lmtest lubridate openair papeR rugarch sandwich timeDate timeSeries xts zoo]; }; iCluster = derive2 { name="iCluster"; version="2.1.0"; sha256="09j36xv87d382m5ijkhmp2mxaajc4k97cf9k1hb11ksk7fxdqz6r"; depends=[caTools gdata gplots gtools lattice]; }; iDINGO = derive2 { name="iDINGO"; version="1.0.2"; sha256="041yvp3nzk3ipjlx17xcn9yiwr1hlns0pd3vzqrck5v9glnp4sbr"; depends=[GGMridge glasso igraph mvtnorm scales visNetwork]; }; @@ -8431,6 +8548,7 @@ in with self; { 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]; }; iadf = derive2 { name="iadf"; version="0.1.0"; sha256="02zx9n4ncg10bbydrr05631vzc4w2b1jg3x6xiaffg7x5rh4mnyf"; depends=[dplR dplyr manipulate rlang tibble tidyr]; }; + iai = derive2 { name="iai"; version="1.0.0"; sha256="12alm0vhzaszacwpgzcbds00hj7xjfjq06zy337y81zqjgl8balp"; depends=[JuliaCall rlang stringr]; }; iarm = derive2 { name="iarm"; version="0.2.0"; sha256="0lg1q5z40hjm8wicniimv4wlb210qj7d5lmmknilzkpz4shwr44k"; depends=[eRm mRm PP psychotools vcdExtra]; }; ibd = derive2 { name="ibd"; version="1.5"; sha256="0rxvy4hn4fpbv6y214ggkmgfvzwns5mkanp4h8201rjk3v84mk2r"; depends=[car emmeans lpSolve multcomp]; }; ibdreg = derive2 { name="ibdreg"; version="0.2.5"; sha256="1kaa5q1byi30wzr0mw4w2cv1ssxprzcwf91wrpqwkgcsdy7dkh2g"; depends=[]; }; @@ -8454,6 +8572,7 @@ in with self; { icd = derive2 { name="icd"; version="4.0.6"; sha256="0zi56c6x2jy1yihrar6whhyb5csyhzwdxw0nr8c05xm28w1j6xwb"; depends=[rappdirs Rcpp RcppEigen]; }; icd_data = derive2 { name="icd.data"; version="1.0"; sha256="0cynr9327wfg88661w4hali48mb6ghyvlqgybsa38k9bbf57v8aa"; depends=[]; }; icdGLM = derive2 { name="icdGLM"; version="1.0.0"; sha256="1mh9kwn21n19v4lrmj33ghpna7dl66fx19gi6lcjanmrpzrkwdnz"; depends=[Matrix]; }; + icemelt = derive2 { name="icemelt"; version="1.0"; sha256="13pjbyh2ggns36m8s43m2cb0kvisjlfxq75gqscldp75zjli2wi8"; depends=[survival]; }; icenReg = derive2 { name="icenReg"; version="2.0.10"; sha256="184cl83rwr0h1b3dia1vd81zvfr0yqqmfszkzah3cqljkcirz8di"; depends=[coda foreach MLEcens Rcpp RcppEigen survival]; }; icensBKL = derive2 { name="icensBKL"; version="1.1"; sha256="12zx5x81jy48mp0l6a5ga0ikkjxvndv5cv2xf6d2lczfk7fz9lbp"; depends=[gtools Icens MASS mvtnorm smoothSurv survival TeachingDemos]; }; icensmis = derive2 { name="icensmis"; version="1.3.1"; sha256="1c0j43wffb5h99chlj8j45lpan7dpn2i0r4rr6b2kq16p1zabfjw"; depends=[Rcpp]; }; @@ -8470,9 +8589,9 @@ in with self; { idar = derive2 { name="idar"; version="1.0"; sha256="1yfv3na4rcldkpzybf7la227z4ynsl1scrziirl5gp072k7zrs01"; depends=[ape FD picante spatstat]; }; idbg = derive2 { name="idbg"; version="1.0"; sha256="1rxmj04hswxybrg7dfib3mjy8v8mdiv13zwbscp2q55z55hhf1m5"; depends=[]; }; idbr = derive2 { name="idbr"; version="0.3"; sha256="02syk7fmif0xnddl8189vnl329r8mwl3iwv2rsf6cw7mwg30fhyw"; depends=[countrycode dplyr httr jsonlite]; }; - idealstan = derive2 { name="idealstan"; version="0.7.1"; sha256="0mqwmky04bdkjsam132pkgg8avbp6c1njzxfx70xnnxm9954vvys"; depends=[bayesplot BH dplyr forcats gghighlight ggplot2 ggrepel lazyeval Rcpp RcppEigen rlang rstan rstantools shinystan StanHeaders stringr tidyr]; }; + idealstan = derive2 { name="idealstan"; version="0.7.2"; sha256="0nn7i6gr1ggk43xn9a454jbrxhqxw37srjvz4va0kcc02wy5pxq9"; depends=[bayesplot BH dplyr forcats gghighlight ggplot2 ggrepel lazyeval Rcpp RcppEigen rlang rstan rstantools scales shinystan StanHeaders stringr svDialogs tidyr]; }; ideamdb = derive2 { name="ideamdb"; version="0.0.9"; sha256="1f4dcv6c8ny7pik547f4840vhll26mzfcijnfsiqx31xhn0gsizd"; depends=[dplyr ggplot2 stringr tidyr]; }; - idefix = derive2 { name="idefix"; version="0.3.3"; sha256="0apgz4c0377y5w88pgv3x4mck1fjkq7xy577w925iish0hqpvni7"; depends=[dplyr gtools MASS maxLik mlogit Rcpp RcppArmadillo Rdpack scales shiny tmvtnorm]; }; + idefix = derive2 { name="idefix"; version="0.4.0"; sha256="03gmhmpdkiy0721k14ig6aaqj304kjgi3g9l9v5s59h716r1cfyv"; depends=[dplyr MASS mlogit Rcpp RcppArmadillo Rdpack scales shiny tmvtnorm]; }; idem = derive2 { name="idem"; version="4.0"; sha256="0zgc6b5gzgm5dhjqk1vkm94khizc8sngn3igv23z1v18g73vdxhi"; depends=[BH Rcpp RcppEigen rstan rstantools sqldf StanHeaders survival]; }; idendr0 = derive2 { name="idendr0"; version="1.5.3"; sha256="11c12d166bp2i498d8y6ipg5jhz1xsdsrmnhjqnrqqzp9avvrsjp"; depends=[tkrplot]; }; identity = derive2 { name="identity"; version="0.2-1"; sha256="1j5wb5cj5j49in2g6r1shdm4ri4cfzj22hpqazvcmq4dm291sdi9"; depends=[]; }; @@ -8480,6 +8599,7 @@ in with self; { ider = derive2 { name="ider"; version="0.1.0"; sha256="021s4fybki7a6mdsr6gkjrzfhaqdcg0m2a6r24y91jklxlxqxmws"; depends=[FNN]; }; idm = derive2 { name="idm"; version="1.8.2"; sha256="04f0i0kwdxywmj2i184knx5a5v9svx0lbam6wpz49hghg7qpy0w5"; depends=[animation ca corpcor dummies ggplot2 ggrepel]; }; idmTPreg = derive2 { name="idmTPreg"; version="1.1"; sha256="1329sjb4dnw3yiyg16whbj4l2v0kg8phg1x4ysvyp2kqkmw14yq6"; depends=[doParallel foreach survival]; }; + idmodelr = derive2 { name="idmodelr"; version="0.3.0"; sha256="0rnfv7jwl5x3a67nbj2k2cs15b7xqzdcs9v8nlx2zxfsnf95s68s"; depends=[deSolve dplyr furrr future ggplot2 magrittr purrr rlang stringr tibble tidyr viridis]; }; idr = derive2 { name="idr"; version="1.2"; sha256="05nvgw1xdg670bsjjrxkgd1mrdkciccpw4krn0zcgdf2r21dzgwb"; depends=[]; }; ids = derive2 { name="ids"; version="1.0.1"; sha256="1s6ga94gds5ydr9f8qbjfgfpg2dvbnkcrlybqlb33hk3c0c2l8dn"; depends=[openssl uuid]; }; idx2r = derive2 { name="idx2r"; version="1.0.0"; sha256="14d3rasnf8mghwzpg6h4larybgy7drrv0jh71x28qwry49acsqyh"; depends=[]; }; @@ -8501,24 +8621,26 @@ in with self; { iheatmapr = derive2 { name="iheatmapr"; version="0.4.8"; sha256="0rypfhr05x3yqaywpkkd2mjn1vwbj6hw7v8nkwm2mbff9z87aam7"; depends=[fastcluster ggdendro htmlwidgets jsonlite knitr magrittr plyr RColorBrewer S4Vectors scales]; }; ihs = derive2 { name="ihs"; version="1.0"; sha256="1c5c9l6kdalympb19nlgz1r9zq17575ivp3zrayb9p6w3fn2i06h"; depends=[maxLik]; }; iilasso = derive2 { name="iilasso"; version="0.0.2"; sha256="043m1n5840459zsknkb54801apb0a2cqfprncmj2wp235rbqj832"; depends=[BH Matrix Rcpp]; }; - ijtiff = derive2 { name="ijtiff"; version="2.0.1"; sha256="0yv68pnvz9ggf9nylkpa0sjzidic833fivijjqxi17267mdc7m6d"; depends=[checkmate dplyr filesstrings fs glue magrittr purrr Rcpp readr rlang stringr withr]; }; + ijtiff = derive2 { name="ijtiff"; version="2.0.2"; sha256="0i1bs5pns83r1f97ypr0xbq4z7kwgldkaff2iwvqrnalj0rgfm8b"; depends=[checkmate dplyr filesstrings fs glue magrittr purrr Rcpp readr rlang stringr withr]; }; 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]; }; imageData = derive2 { name="imageData"; version="0.1-59"; sha256="096y589r1mrbvzax5i7sdczkl613kyn8g93qcddqb6jjljw03qmi"; depends=[dae GGally ggplot2 Hmisc RColorBrewer reshape XLConnect]; }; imager = derive2 { name="imager"; version="0.41.2"; sha256="19fqgjhg04garbipx20g72h9dd6k0jj4ac48nby6km4h665vrs4v"; depends=[Cairo downloader igraph jpeg magrittr plyr png purrr Rcpp readbitmap stringr]; }; imagerExtra = derive2 { name="imagerExtra"; version="1.3.2"; sha256="1f6mxfn7am4ph9acbbx53r4bk4vsm73p7arh8rvrsic9pgma3gqf"; depends=[fftwtools imager magrittr Rcpp]; }; imageviewer = derive2 { name="imageviewer"; version="0.1.0"; sha256="1rsrwy5v0gnsmbay1zqijhvll2l1bs844m52w65588j9nlx4fci9"; depends=[htmlwidgets]; }; - imagine = derive2 { name="imagine"; version="1.4.0"; sha256="1v0rds64i0f3xgg7ca14ncw4nrcc80gvjf1fbp498idq38z79qzc"; depends=[Rcpp]; }; + imagine = derive2 { name="imagine"; version="1.5.2"; sha256="1k017a1qw7bahk1aif3ky7f1aynvrppmhvxbcmai646pmx99kbxn"; depends=[Rcpp]; }; imbalance = derive2 { name="imbalance"; version="1.0.0"; sha256="1pfhwf4844m0a8qsm852am63x18vlkbs6m1s9izrpd219616skpr"; depends=[bnlearn C50 FNN ggplot2 KernelKnn mvtnorm Rcpp RcppArmadillo smotefamily]; }; imdbapi = derive2 { name="imdbapi"; version="0.1.0"; sha256="11v7c0s7qqf02b186md5lhgkgmywkn8lmmanlz3gfcxca26g047y"; depends=[dplyr httr stringr]; }; imfr = derive2 { name="imfr"; version="0.1.6"; sha256="0dvhz16wfmrrs21pcys8hjlwa9xkwc78pn76zj2aq1vyj9qby0wj"; depends=[dplyr httr jsonlite]; }; + imgpalr = derive2 { name="imgpalr"; version="0.2.1"; sha256="0ppzk0rza1rbaz69i8rxjmj7j1q26q75cn2yim8ji31j5hknqj23"; depends=[downloader dplyr jpeg magrittr tibble]; }; + imgrec = derive2 { name="imgrec"; version="0.1.0"; sha256="1v4q2hxil7f0jnj4nql44d9dssh8kz1mnj8ah5slndnn1fbymy8f"; depends=[base64enc dplyr httr jsonlite knitr rlang]; }; imguR = derive2 { name="imguR"; version="1.0.3"; sha256="14f7ghgc8rbrpqb21rinfbrj1wh80i6ii0awwi814152v5qzj4b3"; depends=[httr jpeg png]; }; imgw = derive2 { name="imgw"; version="0.1.0"; sha256="1x9di7imfk5mrwx19j3xjsanykdng5w9w2dpk3xfkwzvvqyrlpg1"; depends=[RCurl XML]; }; iml = derive2 { name="iml"; version="0.9.0"; sha256="15rv943q1kqilsr1h0pkm2gci1cl7775xma4swjfmbqmdc6acjq0"; depends=[checkmate data_table foreach Formula ggplot2 glmnet gridExtra Metrics partykit prediction R6 yaImpute]; }; immer = derive2 { name="immer"; version="1.1-35"; sha256="1nmf9wxxyq3p8b5kikpsr8b0v4s84zjpahg1rxvcrhc8blg26hjq"; depends=[CDM coda MASS psychotools Rcpp RcppArmadillo sirt TAM]; }; imp4p = derive2 { name="imp4p"; version="0.7"; sha256="1hpxx1jpwd4v19xnpjjbwcvfzvb63jfd0jq3vcq000w7am9pwwba"; depends=[Iso norm Rcpp truncnorm]; }; impimp = derive2 { name="impimp"; version="0.3.1"; sha256="0xkxph4f1rcpkryx9v339bfbsnq3xwdj1flb4j2dgh99apj126sq"; depends=[]; }; - implyr = derive2 { name="implyr"; version="0.2.4"; sha256="1xc5c8wpq1bdvfm4rkqmvykgkil9fm9n1q9ndjv701jbdr4rnisd"; depends=[assertthat DBI dbplyr dplyr rlang tidyselect]; }; + implyr = derive2 { name="implyr"; version="0.3.0"; sha256="1i0m95azyi46wnh59dcs52l78i1yqy677rlr4b6c0r945m67advn"; depends=[assertthat DBI dbplyr dplyr rlang tidyselect]; }; r_import = derive2 { name="r_import"; version="1.1.0"; sha256="0blf9539rbfwcmw8zsb4k58slb4pdnc075v34vmyjw752fznhcji"; depends=[]; }; importar = derive2 { name="importar"; version="0.1.1"; sha256="0xv445fmjhsbdlsq03k2rlycnggn3rcyq5a49zrg4jvjamzr0rgr"; depends=[]; }; imprProbEst = derive2 { name="imprProbEst"; version="1.0.1"; sha256="09y8yd9sw0b79ca45ryi7p82vy5s8cx0gg603rlc39lgwcdv45i3"; depends=[inline lpSolve]; }; @@ -8529,8 +8651,8 @@ in with self; { imputeMulti = derive2 { name="imputeMulti"; version="0.6.4"; sha256="0ngjbj8pl5mwprrgy234a5p9dhf615z7ymfv8184hby1z6ib3mgl"; depends=[DBI gtools Rcpp RSQLite]; }; imputePSF = derive2 { name="imputePSF"; version="0.1.0"; sha256="0xfd2mybg0cbi3n35j28s4xq4iwr5rq4mqwgdqml7l2rlzidcwc8"; depends=[PSF]; }; imputeR = derive2 { name="imputeR"; version="2.1"; sha256="1xsawars52jhxfpl4hx8ghhndrvqk9vrrgajrrz2xrzi88kf6in2"; depends=[reshape2]; }; - imputeTS = derive2 { name="imputeTS"; version="2.7"; sha256="12y6qzy00kb7jap4h92f3zpgdazlw3y4zydhv7gzfsmx1ka7nsfm"; depends=[forecast magrittr Rcpp stinepack]; }; - imputeTestbench = derive2 { name="imputeTestbench"; version="3.0.2"; sha256="138rkkxkghch6c80j15z77qs6rc62c37aqnv9aq766fkzk2fffwf"; depends=[dplyr forecast ggplot2 imputeTS reshape2 tidyr zoo]; }; + imputeTS = derive2 { name="imputeTS"; version="3.0"; sha256="0dr6mb2rzfkrm63j4mygf5kji12blycwl6bslbsb5fz64q5xc6dn"; depends=[forecast magrittr Rcpp stinepack]; }; + imputeTestbench = derive2 { name="imputeTestbench"; version="3.0.3"; sha256="0yc1l3r7g7x2pgyli6j08ikvsbvr24kijnn7pdj54blw7c0pdmm2"; depends=[dplyr forecast ggplot2 imputeTS reshape2 tidyr zoo]; }; imputeYn = derive2 { name="imputeYn"; version="1.3"; sha256="1b21w1aa5f7yiq8k0wa86wvbg4ij7f6ldwn6asfqwb0b90rvsgvs"; depends=[boot emplik mvtnorm quadprog survival]; }; imsig = derive2 { name="imsig"; version="1.0.0"; sha256="01ww48x9a189dvr81bangfhchr70l0sg26jdpcxf41nh2fmslfxx"; depends=[ggplot2 gridExtra HiClimR igraph RColorBrewer survival]; }; in2extRemes = derive2 { name="in2extRemes"; version="1.0-3"; sha256="1lgsqm29zmjyf8kynyra2p3q7bs4fyd7ac4v6s3pbahzhhzdk94y"; depends=[extRemes]; }; @@ -8547,7 +8669,7 @@ in with self; { indelmiss = derive2 { name="indelmiss"; version="1.0.9"; sha256="0i4qnvc0xb3ngnk8xdscmx7qnicfs7s6czawf6schb1nh2pjpzyq"; depends=[ape numDeriv phangorn Rcpp]; }; indicspecies = derive2 { name="indicspecies"; version="1.7.6"; sha256="0a7s37k3bg4cnzkvn833nrwi6hnfa5f6jxa8ra954v4sp55g6i5d"; depends=[permute]; }; indirect = derive2 { name="indirect"; version="0.2.0"; sha256="1k7xwsx655nzl43s1mkaysyn5gydq973gynmqip67lssnm7cnch4"; depends=[gplots MASS]; }; - inegiR = derive2 { name="inegiR"; version="2.0.0"; sha256="00bhb3zvqhir2rqza3axk98lxhq98s41apwpsm242pqb7wsnmg95"; depends=[jsonlite plyr XML zoo]; }; + inegiR = derive2 { name="inegiR"; version="3.0.0"; sha256="1rhkdmpz7mxi7ddyygss5rlh3c8hgxhzdk3fnvnlizc1l55cc6c0"; depends=[jsonlite lubridate plyr tibbletime XML zoo]; }; ineq = derive2 { name="ineq"; version="0.2-13"; sha256="09fsxyrh0j7mwmb5hkhmrzgcy7kf85jxkh7zlwpgqgcsyl1n91z0"; depends=[]; }; infer = derive2 { name="infer"; version="0.4.0.1"; sha256="0klb1zvmr8fplby8799yca1k6bs3dmacxm1sa0jja9ar23kcq09n"; depends=[dplyr ggplot2 glue magrittr rlang tibble]; }; inference = derive2 { name="inference"; version="0.1.0"; sha256="0j92isfkbhk13yx2hd3a5dd7ikcbgjc04zisd1n5kmg6ajw2aj6r"; depends=[sandwich]; }; @@ -8575,9 +8697,9 @@ in with self; { inplace = derive2 { name="inplace"; version="0.1.0"; sha256="1lmvfjxgficlzxbn953wvfa1n9lys9gqprix6zbqqr4d6vkm0srj"; depends=[Rcpp]; }; insect = derive2 { name="insect"; version="1.2.0"; sha256="0lbck8jbhymzkhm1iqd2y2xg8a26yjizw7x31b1l1kqc1l0p3kmv"; depends=[ape aphid kmer openssl phylogram RANN seqinr xml2]; }; insideRODE = derive2 { name="insideRODE"; version="2.0"; sha256="1ffndk8761cpkririb3g1qsq9nwmh82lcrpql9i5fksdprvdjzcw"; depends=[deSolve lattice nlme]; }; - insight = derive2 { name="insight"; version="0.3.0"; sha256="1r288hc01cpyrk3nias30fw783z2vw20qr1k67vr65anh7mwm7vb"; depends=[]; }; + insight = derive2 { name="insight"; version="0.4.1"; sha256="1lw1r3mb97z5p9z25jfzlhs0sbnwp6v8kzysf0am01x4m7l3iz82"; depends=[]; }; insol = derive2 { name="insol"; version="1.2"; sha256="14ikz05375pjn9hby7kwkhcnykjilbnkdy5i8lsl7c5qdbhmqcm5"; depends=[raster rgdal]; }; - inspectdf = derive2 { name="inspectdf"; version="0.0.3"; sha256="14a639y5l160lrx73xr3m91da2qhza1p2r5wdf9fkd80xlf4qgxm"; depends=[dplyr ggfittext ggplot2 magrittr progress Rcpp tibble tidyr]; }; + inspectdf = derive2 { name="inspectdf"; version="0.0.4"; sha256="0ydhh4nilmvf1gfba9cv7sgpvw60krqy2xk1p76d2vh0rzx8sacd"; depends=[dplyr ggfittext ggplot2 magrittr progress Rcpp tibble tidyr]; }; inspectr = derive2 { name="inspectr"; version="1.0.0"; sha256="04rpr5ajpdx1d49y327dryxwxk27yljj4c96i9qglf02i9kmplkg"; depends=[openxlsx]; }; instaR = derive2 { name="instaR"; version="0.2.4"; sha256="0c4m471ragkpksr0h21cdgnjxcknf01xqz543dahxgzjg9ncjwhg"; depends=[httr jsonlite]; }; install_load = derive2 { name="install.load"; version="1.2.1"; sha256="148q0rjal5hfcb8ilxzd1bz38mn8vxqrsfg5x4jy48psk00fk3d9"; depends=[]; }; @@ -8594,7 +8716,7 @@ in with self; { intensity_analysis = derive2 { name="intensity.analysis"; version="0.1.6"; sha256="1ydmn7njqk6i2667zaha8mvfndss4im39czadg1f3z6sndp2lsji"; depends=[diffeR ggplot2 raster reshape2 rgdal]; }; interAdapt = derive2 { name="interAdapt"; version="0.1"; sha256="06ki36l1mrnd9lbm696a6gapr488dz8na4wvl9y1fif9hfv4zk25"; depends=[knitcitations knitr mvtnorm RCurl shiny]; }; interactionTest = derive2 { name="interactionTest"; version="1.2"; sha256="0ycr839l07xahakr4r2jvlmd0fcxfm4qi3g8agnyh24c2kwl3ck2"; depends=[]; }; - interactions = derive2 { name="interactions"; version="1.1.0"; sha256="1k3rz5r5f5by2v9qqhk4hnilj1qcm4pyryhz21s0qzhpsv818717"; depends=[cli crayon ggplot2 jtools rlang tibble]; }; + interactions = derive2 { name="interactions"; version="1.1.1"; sha256="0xsqsylfgqgdy7bh32v8x0yn5naf1jclv05dvpyvhladgd0q1c0m"; depends=[cli crayon generics ggplot2 jtools rlang tibble]; }; intercure = derive2 { name="intercure"; version="0.1.0"; sha256="0j71dqcbcfl1zpfidh3xys5h3ggyhrzq3avkdm9v18pv464x8xlv"; depends=[foreach iterators MASS Matrix survival]; }; interep = derive2 { name="interep"; version="0.2.0"; sha256="18f5qkfq3rcr4n2vpdp4xp56cbg5z30cpk6wdchh64gly6g28bi0"; depends=[Rcpp RcppArmadillo]; }; interferenceCI = derive2 { name="interferenceCI"; version="1.1"; sha256="19ky10nn6ygma6yy5h1krxx61aikh3yx5y39p68a944mz8f72vsn"; depends=[gtools]; }; @@ -8609,11 +8731,14 @@ in with self; { 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=[]; }; + intervcomp = derive2 { name="intervcomp"; version="0.1.2"; sha256="1l6x1fl84li6is3b92b96q3fbv0rpgqy2lvw9cbi2cq8nh9imnyx"; depends=[]; }; interventionalDBN = derive2 { name="interventionalDBN"; version="1.2.2"; sha256="0wpp4bfi22ncvl0vdivniwwvcqgnpifpgxb4g5jbyvr0z735cd9w"; depends=[]; }; + intkrige = derive2 { name="intkrige"; version="1.0.0"; sha256="1x0jg4vdbf3ipns1slw2pb1myiswnpka9lyxma69lgk2nmwmz9p2"; depends=[gstat raster Rcpp RcppArmadillo Rdpack sp]; }; intoo = derive2 { name="intoo"; version="0.3.1"; sha256="0i1141r95zv8sv6l047avsgyq1kbxilczrhsn6gkvjg5vkmqn9rr"; depends=[]; }; intrinsicDimension = derive2 { name="intrinsicDimension"; version="1.2.0"; sha256="0cka20ifxx9njnvp18bzhrvmh3cwjnxkc0a23qzi43dahc51ijbc"; depends=[yaImpute]; }; introgress = derive2 { name="introgress"; version="1.2.3"; sha256="1j527gf7pmfy5365p2j2jbxq0fb0xh2992hj4d7dxapn4psgmvsk"; depends=[genetics nnet RColorBrewer]; }; intrval = derive2 { name="intrval"; version="0.1-1"; sha256="1p66cjpn43xib7rrnyv3jqr6bb49d3dxf888p8hxnr7kx9wfalkn"; depends=[]; }; + intsurv = derive2 { name="intsurv"; version="0.2.0"; sha256="1y6q7jyb5f01w3z7slwlpjz89m4vl77jg1pw4lab8q0aw27kfrfd"; depends=[Rcpp RcppArmadillo]; }; intsvy = derive2 { name="intsvy"; version="2.4"; sha256="19anm90rqhvdv0fsr2hbzkwsr3zc7pimq4gcg2mgj06gxqbwhym7"; depends=[foreign ggplot2 Hmisc memisc plyr reshape]; }; intubate = derive2 { name="intubate"; version="1.0.0"; sha256="03ikqwai7wdahdfyzdy42xs8qpdhl9gmbak2qd82yxjl62956i8c"; depends=[]; }; inum = derive2 { name="inum"; version="1.0-1"; sha256="16d09391l65w557dkzhhx1aqn1ljamcmjj3yh42pwq037k0r8brw"; depends=[libcoin]; }; @@ -8644,7 +8769,7 @@ in with self; { ipptoolbox = derive2 { name="ipptoolbox"; version="1.2"; sha256="0scbny4crgr23qcp0vgsxhwmj5g5q5c1c4mb5mmb5njyvc34s01l"; depends=[AlgDesign copula evd kolmim triangle]; }; ipred = derive2 { name="ipred"; version="0.9-9"; sha256="0vs1hqfx7yd0xdbmfsf2gim7spkni0845cj6gswn0nhdfdq7ma0d"; depends=[class MASS nnet prodlim rpart survival]; }; iprior = derive2 { name="iprior"; version="0.7.3"; sha256="15qzqwikxy85fcd7psz363b5wb0kpi85icfyb47hbgdhln8fi2qb"; depends=[doSNOW foreach ggplot2 mvtnorm Rcpp RcppEigen reshape2 scales]; }; - ips = derive2 { name="ips"; version="0.0-7"; sha256="0r4394xbchv6czad9jz4ijnfz8ss3wfdvh7ixrdxic2xrw0ic90v"; depends=[ape colorspace XML]; }; + ips = derive2 { name="ips"; version="0.0.11"; sha256="02jxanfhsjrabj33nwjv71vdc87hiyzikyqrfdj9ix6dky6lm199"; depends=[ape phangorn plyr seqinr XML]; }; iptmnetr = derive2 { name="iptmnetr"; version="0.1.5"; sha256="02lljbbr2sm90sgyjv6a17mbh758n93qqxfr900g0m557nsv35i8"; depends=[httr jsonlite]; }; iptools = derive2 { name="iptools"; version="0.6.1"; sha256="143gawwp3aja5vycl43n6x5hzg3yvagi8x10v9y92hkif9v075qq"; depends=[AsioHeaders BH Rcpp readr stringi triebeard]; }; ipumsr = derive2 { name="ipumsr"; version="0.4.2"; sha256="1y1s1grmfkaax04i9ig57lv1l64hcwdn420kv1w51f3jh28hbdgg"; depends=[cli crayon dplyr haven hipread pillar purrr R6 raster Rcpp readr rlang tibble tidyselect xml2 zeallot]; }; @@ -8670,7 +8795,7 @@ in with self; { island = derive2 { name="island"; version="0.2.4"; sha256="1jwqyrkxljhrxnd4jnfzm2bdgg192865nm1pxizbr7ws0b4z9fyi"; depends=[]; }; islasso = derive2 { name="islasso"; version="1.1.0"; sha256="1kp94lscl738wlw0hn1xakcgi10zbxpnvkpvzj5ybwvpbjy3qb9a"; depends=[glmnet Matrix]; }; ismev = derive2 { name="ismev"; version="1.42"; sha256="19giigxwf62cdkf7mglsca649n2ignb9bxyg9zl7im1vm3ngnmqd"; depends=[mgcv]; }; - isni = derive2 { name="isni"; version="1.0"; sha256="04s8v4ncg8hc2m1kbb0xv01qwwh10k3ibjrrgy34f6zl8535zv80"; depends=[Formula lme4 matrixcalc mixor mvtnorm nlme nnet]; }; + isni = derive2 { name="isni"; version="1.1"; sha256="0m7z8gxam4f3d0ggyk502c42aaxvjanxcv5c1p62jv13vgb0jrik"; depends=[Formula lme4 matrixcalc mixor mvtnorm nlme nnet]; }; isnullptr = derive2 { name="isnullptr"; version="1.0.1"; sha256="0kwjxq59n3qncdw63vsdvz7v5mzbl5lmckdfgiiw35pzmahnxzh9"; depends=[]; }; isoband = derive2 { name="isoband"; version="0.2.0"; sha256="1r023s73qypnvpx18znr9ymylr022m90v65mz2jasn0a1kjrfcbq"; depends=[Rcpp testthat]; }; isocat = derive2 { name="isocat"; version="0.2.3"; sha256="162pgvqdra1pbcdlm66088d1hgjcgqm8m61l3l6pr0023m1yic5v"; depends=[dplyr foreach magrittr plyr raster sp]; }; @@ -8680,6 +8805,7 @@ in with self; { isoph = derive2 { name="isoph"; version="1.1.3"; sha256="0905qw3aa7l09ljzm4q78pgy1z8kzv0jzhxa49293z9jy6g3x0mm"; depends=[Iso survival]; }; 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]; }; + ispd = derive2 { name="ispd"; version="0.1"; sha256="0dq7dkb2bvrw0yxh2i19ncjim641rqyph9kq9np00wsb3aiz1559"; depends=[ibd]; }; isqg = derive2 { name="isqg"; version="1.2"; sha256="1g4nwngljx6sp2k29pn2v8zgp2nh61w75bg36ihlq093hiq6w7gd"; depends=[BH R6 Rcpp]; }; istacr = derive2 { name="istacr"; version="0.1.0"; sha256="0vzf4zvh4qk7nflndmicz510859hh6sxwh0agwzygg80pbdrf02c"; depends=[curl jsonlite]; }; isva = derive2 { name="isva"; version="1.9"; sha256="05qx9q0kg4ma23v4abhihw0vz017nq6hv2jzsiqx4d20ngh1dl4z"; depends=[fastICA JADE qvalue]; }; @@ -8689,12 +8815,12 @@ in with self; { iteRates = derive2 { name="iteRates"; version="3.1"; sha256="1dycmlm3vldc60wz2jjdfbla14383911zfahgal5mx8whxwq95c5"; depends=[ape apTreeshape geiger gtools MASS partitions VGAM]; }; itemanalysis = derive2 { name="itemanalysis"; version="1.0"; sha256="1ksbd69mca45jlr2gpars87cf4jfm5rx6sz009sv6a83x831x5rq"; depends=[car ggplot2 polycor]; }; iterLap = derive2 { name="iterLap"; version="1.1-3"; sha256="079d4hxf1ha8pgibzb4r1yk7xqpzndd7hjbp8294qb26jvvcnd8q"; depends=[quadprog randtoolbox]; }; - iterators = derive2 { name="iterators"; version="1.0.10"; sha256="1s3iykfvccpnzs73z90rx18qvbvgw2dgl4nfcrvm5m1850qb5qd9"; depends=[]; }; + iterators = derive2 { name="iterators"; version="1.0.12"; sha256="0jwzxaa3jm1xzgfv5pn0xqkk7rhm0xwvgn85w7xaw8xx1vb33gwn"; depends=[]; }; iterpc = derive2 { name="iterpc"; version="0.4.1"; sha256="0q08bdr5v849z2431f2sdh9f7aagjxm34si0kn0bp85dnlqri8rx"; depends=[arrangements gmp iterators]; }; 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_analysis = derive2 { name="its.analysis"; version="1.4.0"; sha256="0pfvkhpyqjjpj1i2jf32pj9i86a31qwwwm41i6vj25j68krlyz8q"; depends=[boot car forecast ggplot2 plyr]; }; + its_analysis = derive2 { name="its.analysis"; version="1.4.1"; sha256="0f3wn7d3j6c0hhg2gp439y5m3namlswgdln18xxbvzzr4s8kz0wx"; depends=[boot car forecast ggplot2 plyr]; }; itsadug = derive2 { name="itsadug"; version="2.3"; sha256="0wzdy82h05264n9cr84w5j98vz24was9hh1y0wdp56ws3dfbav9m"; depends=[mgcv plotfunctions]; }; itsmr = derive2 { name="itsmr"; version="1.9"; sha256="0dmijaq6q31irwrjqv5gq1yfbgggwb3m6rwbg4lx1r9l3cqays7i"; depends=[]; }; itunesr = derive2 { name="itunesr"; version="0.1.3"; sha256="1czwkrqy3jqw1x0z5zj2kvp4p11s5zdiswwhx9jfxdcsg86zhr45"; depends=[curl jsonlite lubridate xml2]; }; @@ -8708,13 +8834,16 @@ in with self; { ivregEX = derive2 { name="ivregEX"; version="1.0"; sha256="0zh3rqvhn8ald6lxv9kywy2v1p0nr9ijv6plhpbxc6k51zzsgyl8"; depends=[AER Formula lmtest sandwich]; }; ivtools = derive2 { name="ivtools"; version="2.2.0"; sha256="183lfv18r763jki8i37b8hk1k1kiglmhvjnfzigqzkzqc4cwibm1"; depends=[ahaz data_table nleqslv numDeriv Rcpp survival]; }; ivx = derive2 { name="ivx"; version="1.0.0"; sha256="0gxq0w9cmgg17y7kdjxfzaq8nr4knashfav0vjpq6ba9jh5grk9l"; depends=[magrittr Rcpp RcppArmadillo tibble]; }; + jSDM = derive2 { name="jSDM"; version="0.1.0"; sha256="0lkapg6v5lh53vnsg5hcr9qis8qimb6ilds23dqcyhi6w3dys9nb"; depends=[coda corrplot Rcpp RcppArmadillo RcppGSL]; }; jSonarR = derive2 { name="jSonarR"; version="1.1.1"; sha256="054q3ly471xa64yyz2as6vkr440ip1y8n5wl6s3zbhqy3bqkdqif"; depends=[jsonlite RCurl]; }; - jaatha = derive2 { name="jaatha"; version="3.2.0"; sha256="00886j0cabrq6a69w8s1gsfkmx1wqs1vpxjafpm71msk54r0dj55"; depends=[assertthat R6]; }; + jaatha = derive2 { name="jaatha"; version="3.2.1"; sha256="0zqvylknvymggw5jl40cfyahfjy64wb25f0qymh78xbamv1hc85w"; depends=[assertthat R6]; }; jaccard = derive2 { name="jaccard"; version="0.1.0"; sha256="1dmla6qc1k8iw2d7zfjqhf13gqd2lpsrj09yh47ljf994fpab936"; depends=[dplyr magrittr qvalue Rcpp]; }; + jackalope = derive2 { name="jackalope"; version="0.1.2"; sha256="0mjlilsjh8y3rwskqa1xqhdz4f2za1a25jvhl4d3j54rc6ldkj0k"; depends=[ape R6 Rcpp RcppArmadillo RcppProgress Rhtslib zlibbioc]; }; jackknifeKME = derive2 { name="jackknifeKME"; version="1.2"; sha256="0c5shl6s46kz7a623gccqk2plrrf2g29nwr6vbny6009pq3jvzam"; depends=[imputeYn]; }; jackstraw = derive2 { name="jackstraw"; version="1.3"; sha256="02qcaf2p0fyni6n2zhd7vp65kniz74di0pf5jzz79jwj15cfd1b0"; depends=[cluster ClusterR corpcor irlba lfa qvalue rsvd]; }; jacpop = derive2 { name="jacpop"; version="0.6"; sha256="0kq6rn33civ2g6i5nwfqvcgmnn5k2dwmw60lkmz4ywm0y4xxlkai"; depends=[]; }; - jagsUI = derive2 { name="jagsUI"; version="1.5.0"; sha256="0cfixhv4fabka13xvnglwacgpadhdr12w6lk563zfz83192r7h8g"; depends=[coda lattice rjags]; }; + jaggR = derive2 { name="jaggR"; version="0.1.1"; sha256="0qd4kwcc8zcvg2p1njcv7z4y5ssg77zsylph5bcaqdjxq996q7rv"; depends=[formatR glue]; }; + jagsUI = derive2 { name="jagsUI"; version="1.5.1"; sha256="1samj54hyarx9j6k652jl988y3fhxsqg50hfzxdwairg0m2mlgmq"; depends=[coda lattice rjags]; }; james_analysis = derive2 { name="james.analysis"; version="1.0.1"; sha256="1b2n4ds4ivfk564z87s2rxjl9j0y4drd3cmyv8jqpccmdvx1137d"; depends=[naturalsort rjson]; }; janeaustenr = derive2 { name="janeaustenr"; version="0.1.5"; sha256="1wyn4qc28a3sval8shmyi2d7s4nl3jh96s8pzq871brxcmrncbwr"; depends=[]; }; janitor = derive2 { name="janitor"; version="1.2.0"; sha256="131bld44bkjahpby0aqscl9sh1abc31dx2822vbdvib55hls45ay"; depends=[dplyr magrittr purrr rlang snakecase tidyr]; }; @@ -8726,7 +8855,7 @@ in with self; { jdx = derive2 { name="jdx"; version="0.1.3"; sha256="0d9m0sbdrlh8jfijn5mrfw8y2bpj5vxm0bcjlcc42ipxj47962l9"; depends=[rJava]; }; jeek = derive2 { name="jeek"; version="1.1.1"; sha256="15n0k0i1wwp72g8zqrjmglnckab3p65q3rnpg6d6h8hjcpv82i7g"; depends=[igraph lpSolve pcaPP]; }; jenkins = derive2 { name="jenkins"; version="1.0"; sha256="02yqadbwnpbscnyjf6xqdfz9j7dqyz3741nrwz4cn9d4j4c3sjdi"; depends=[curl jsonlite]; }; - jetpack = derive2 { name="jetpack"; version="0.4.2"; sha256="1mzd26hlnjf2q2yq38z4c2jf5wfn8nm8y9qqlk2dmp0lc2xxxdpg"; depends=[crayon desc docopt packrat remotes]; }; + jetpack = derive2 { name="jetpack"; version="0.4.3"; sha256="16l4wkrkf4ihhhpwzd62gvz30n8lxyvail70vmcg41gzdyw76hbl"; depends=[crayon desc docopt packrat remotes]; }; jetset = derive2 { name="jetset"; version="3.4.0"; sha256="0c99h5npsv2gf5d59s4qhkaqmjhbwa3prcykk24wzhnpfq6y6xhp"; depends=[AnnotationDbi org_Hs_eg_db]; }; jiebaR = derive2 { name="jiebaR"; version="0.10.99"; sha256="0gk5plifahwjrqkd3nqlcjhbkzw3gdkkxydrdmlh1lsrys2z54f6"; depends=[jiebaRD Rcpp]; }; jiebaRD = derive2 { name="jiebaRD"; version="0.1"; sha256="1wadpcdca4pm56r8q22y4axmqdbb2dazsh2vlhjy73rpymqfcph4"; depends=[]; }; @@ -8738,7 +8867,7 @@ in with self; { jmdl = derive2 { name="jmdl"; version="0.3.0"; sha256="0167yj368lh1n79jwbqs4g2asb67hfmgh97519linmfpx0n6xdpa"; depends=[boot Formula MASS minqa mnormt mvtnorm]; }; jmetrik = derive2 { name="jmetrik"; version="1.1"; sha256="1if1kxx8apgkbxpkjnlj2lpsfnyj2splsg1p3j5vxa7q6wx70f9j"; depends=[]; }; jmotif = derive2 { name="jmotif"; version="1.0.3"; sha256="1llmrksajrd35kfdzq2vqfm17yv5kwark6gz3rvyzcmbrqk5spqv"; depends=[Rcpp RcppArmadillo]; }; - jmuOutlier = derive2 { name="jmuOutlier"; version="1.5"; sha256="0iqfg0vyd4l1sz74wbb8n607y4r4bsj9iymh750w7ajfpqmf5dyv"; depends=[]; }; + jmuOutlier = derive2 { name="jmuOutlier"; version="2.1"; sha256="0nmaxmqx0h7qmv0cl0j51945glxvchlvvbj58i90gds61fngi5wh"; depends=[]; }; jmv = derive2 { name="jmv"; version="0.9.6.1"; sha256="10b59415wb48k2wv2n74v89acgj843qk4pp0jkpns6nhymw41m0q"; depends=[afex BayesFactor car emmeans GGally ggplot2 ggridges GPArotation jmvcore lavaan MASS multcomp mvnormtest nnet PMCMR psych R6 ROCR vcd vcdExtra]; }; jmvconnect = derive2 { name="jmvconnect"; version="1.0.8"; sha256="0r2idgvhhz2dqh3svc4l8is29h4zwl0qicv8961v646c8k1pdl0i"; depends=[BH evaluate httr jmvcore rappdirs Rcpp]; }; jmvcore = derive2 { name="jmvcore"; version="1.0.0"; sha256="1agwzmd24b22x303dpmb5qjbzsrxp287n52c7iavzx42sfishayi"; depends=[base64enc R6 rjson rlang stringi]; }; @@ -8747,13 +8876,14 @@ in with self; { joineR = derive2 { name="joineR"; version="1.2.4"; sha256="05wr7gr3mnsfj8a1m5v1b71gh3fc4pyhj6rqapls7iwrkywbf1b6"; depends=[lattice MASS nlme statmod survival]; }; joineRML = derive2 { name="joineRML"; version="0.4.2"; sha256="06a7iicq3fngsmmi8qcz2fdzdzvym5s70s3aaqlzxnl4sj9km3g2"; depends=[cobs doParallel foreach ggplot2 lme4 MASS Matrix mvtnorm nlme randtoolbox Rcpp RcppArmadillo survival]; }; joineRmeta = derive2 { name="joineRmeta"; version="0.1.1"; sha256="0d9wwb3v43v30xjy67j366mhwixzz79bm67j01fqmcdsnmn3qpjn"; depends=[ggplot2 gridExtra gtools JM joineR lme4 MASS Matrix meta msm nlme statmod survival]; }; - joint_Cox = derive2 { name="joint.Cox"; version="3.3"; sha256="1h2ql3pzpi5ci5xiigsh7rdzlmsw0k4fjp6yvs8b71lvf4gbssyw"; depends=[survival]; }; + joinet = derive2 { name="joinet"; version="0.0.1"; sha256="0yljnyfba49pzayhlq7ksfbkyx30r6ychky79041g57bdil85ywj"; depends=[cornet glmnet palasso]; }; + joint_Cox = derive2 { name="joint.Cox"; version="3.4"; sha256="0xq7rvqbc6mrxpn90a7wid4kx5fhq42mynsxnhdnppwshb9zr46y"; depends=[survival]; }; jointDiag = derive2 { name="jointDiag"; version="0.3"; sha256="0pra70jcnkqkzrxz5vc6lzi637rp5w8n9wbv9ix718vnd0j3fm3n"; depends=[]; }; jointMeanCov = derive2 { name="jointMeanCov"; version="0.1.0"; sha256="1cai5g63n11dirn9fldzkqxcnkxc20ndr9ygrr9rk0s1qz8x63pb"; depends=[glasso]; }; jointNmix = derive2 { name="jointNmix"; version="1.0"; sha256="0ibh7hqkpzlfk3bk4d2dd64jhr8cvw563k082vwnljiam7k5nj4b"; depends=[]; }; jointPm = derive2 { name="jointPm"; version="2.3.1"; sha256="1c2cn9sqwfyv9ksd63w8rrz0kh18jm2wv2sfdkgncjb7vfs4hbv9"; depends=[]; }; jointseg = derive2 { name="jointseg"; version="1.0.2"; sha256="0zilkxk30w3l9mwikmsgvpy5misjggs98c3bjrjy1pfc4b0is943"; depends=[acnr DNAcopy matrixStats]; }; - jomo = derive2 { name="jomo"; version="2.6-8"; sha256="097zfdcqc3a45ay8xxbraqh8xsfyivskkdmc2b4ca4n979lx8vyb"; depends=[lme4 MASS ordinal survival]; }; + jomo = derive2 { name="jomo"; version="2.6-9"; sha256="16ychdhhv8cii8zrdfdf5gzgnvmfaq573bmi00xqdf323q3lf3xr"; depends=[lme4 MASS ordinal survival]; }; josaplay = derive2 { name="josaplay"; version="0.1.3"; sha256="0q6kjk3mjxwbqvq3zz0ylpi1viznp9pxzngqpjzv5sibv0ndh0lf"; depends=[magrittr utf8]; }; jose = derive2 { name="jose"; version="1.0"; sha256="1yna3x4hi0vn23dqi605nn1y313brwh2wcv527bm3mdbscgsi2jf"; depends=[jsonlite openssl]; }; jpeg = derive2 { name="jpeg"; version="0.1-8"; sha256="05hawv5qcb82ljc1l2nchx1wah8mq2k2kfkhpzyww554ngzbwcnh"; depends=[]; }; @@ -8767,7 +8897,7 @@ in with self; { js = derive2 { name="js"; version="1.1"; sha256="1xsdr14k4djcd1nqybvfzhviics4igsj8yz3r0j2nqhin2wjynlf"; depends=[V8]; }; jsTree = derive2 { name="jsTree"; version="1.0.1"; sha256="0n754illyw29bprll676k9qm5vk5h8qss6gb8lls57kdzj51x2jz"; depends=[data_table htmlwidgets jsonlite]; }; jskm = derive2 { name="jskm"; version="0.3.5"; sha256="19r1517ismcm5393gi1vwjd32zhgwk65zr3ghaxrn1br6sgdy57s"; depends=[ggplot2 gridExtra plyr scales survey survival]; }; - jsmodule = derive2 { name="jsmodule"; version="0.9.2"; sha256="0r760dn37xcvjrnjj3l2phrgdljdw6hb7qgd8d1khmgs4dw3mi53"; depends=[data_table devEMF DT epiDisplay geepack GGally ggplot2 haven Hmisc jskm jstable labelled MatchIt maxstat pROC purrr readxl rstudioapi see shiny shinycustomloader shinyWidgets survC1 survey survIDINRI survival tableone timeROC]; }; + jsmodule = derive2 { name="jsmodule"; version="0.9.9"; sha256="1hzw7ib59l4dckmwqf8xv5h34y7xiglg9jll6qv459nqj3nwjyw7"; depends=[data_table devEMF DT epiDisplay geepack GGally ggplot2 haven Hmisc jskm jstable labelled MatchIt maxstat pROC purrr readxl rstudioapi see shiny shinycustomloader shinyWidgets survC1 survey survIDINRI survival tableone timeROC]; }; json64 = derive2 { name="json64"; version="0.1.3"; sha256="19q8qgf4wnd3np12ajy180klpjy0g2csw5micwb4sl7qfzl6wc7j"; depends=[jsonlite]; }; jsonify = derive2 { name="jsonify"; version="0.2.1"; sha256="1jrc7w9i0riy6ls18d127i5ac6wlpc03n01bw74kkrwl4f6f17fn"; depends=[BH rapidjsonr Rcpp]; }; jsonld = derive2 { name="jsonld"; version="2.1"; sha256="0lp0lp9nbk31dia2nq6xba29ymak9h5wl4zbq4pdqw6qm9iwz6ww"; depends=[curl jsonlite V8]; }; @@ -8775,12 +8905,12 @@ in with self; { jsonstat = derive2 { name="jsonstat"; version="0.0.2"; sha256="0p0d3snl1971p5ikrkmwqrjjh4fy0b89qk3rnd1dayfb0r80xnnj"; depends=[cli dplyr jsonlite rlang]; }; jsonvalidate = derive2 { name="jsonvalidate"; version="1.1.0"; sha256="1vxklvkva547mzbgi7hll46sfx274c6j4m70algygphz783x3dsx"; depends=[V8]; }; jsr223 = derive2 { name="jsr223"; version="0.3.3"; sha256="0i00nbsj6b4mx9pgp5rana1kj57hi4lz3lsiniv7baz5avmhp65n"; depends=[curl jdx R6 rJava]; }; - jstable = derive2 { name="jstable"; version="0.8.3"; sha256="15mym9pqvd7arqflii091r7mx45pxnbcvjj5yd0vcl451a8hilfd"; depends=[coxme data_table dplyr geepack labelled lme4 magrittr purrr survey survival tableone tibble]; }; + jstable = derive2 { name="jstable"; version="0.8.5"; sha256="00l88jxrrxkp1ijvfswr32xy5sqzqaa8q783layc0jf9b8fgf59z"; depends=[car coxme data_table dplyr geepack labelled lme4 magrittr purrr survey survival tableone tibble]; }; jstor = derive2 { name="jstor"; version="0.3.6"; sha256="00sd4mq21al8f8ixgy8f65xbgp90if1jpp7mcm50jrbajdwwflmk"; depends=[cli crayon dplyr furrr magrittr pryr purrr readr rlang stringr tibble tidyr xml2]; }; jtGWAS = derive2 { name="jtGWAS"; version="1.5.1"; sha256="06cgsncgrqslxcc7s0lb3zwa85bhzkmjzz3f04716xpzwa186vxq"; depends=[Rcpp]; }; jtools = derive2 { name="jtools"; version="2.0.1"; sha256="03c3nii7il8wjdpv99xqlbpf12hjpw7ni4vdqxmkffybra6c97nx"; depends=[crayon ggplot2 magrittr pander pkgconfig rlang tibble]; }; jtrans = derive2 { name="jtrans"; version="0.2.1"; sha256="18zggqdjzjhjwmsmdhl6kf35w9rdajpc2nffag4rs6134gn81i3m"; depends=[]; }; - jubilee = derive2 { name="jubilee"; version="0.2.5"; sha256="0j16325vxlr797gr39g6mdrgfas1qvxhajfsrmzr4hflqibw03gk"; depends=[data_table readxl xts yaml zoo]; }; + jubilee = derive2 { name="jubilee"; version="0.3.1"; sha256="1wdm5k9hy3v3kahjyhifqqivqn13c8h3bcxg2z2qam7hcafvdc1l"; depends=[data_table readxl xts yaml zoo]; }; junctions = derive2 { name="junctions"; version="1.1"; sha256="1v5jx4mw6x4q3fivsvidd49b8czzbvv5icj39h6jrpmqvrnc8w32"; depends=[Rcpp]; }; junr = derive2 { name="junr"; version="0.1.3"; sha256="0wcglpziyi6z4n7w70srziljba3jkb27iqxbxz4kk6774c7valbf"; depends=[httr jsonlite]; }; justifier = derive2 { name="justifier"; version="0.1.0"; sha256="14795pf94bzcnnaf5w0xqzy06vqvs76gdvr1rn4ihqh2az00l6n7"; depends=[data_tree DiagrammeR purrr ufs yum]; }; @@ -8805,7 +8935,7 @@ in with self; { kcpRS = derive2 { name="kcpRS"; version="1.0.0"; sha256="067j91rhw56kf15h7hxpm9qr6i59fvy5fh9ycfdqcps83wjgx62x"; depends=[doParallel foreach RColorBrewer Rcpp roll]; }; kde1d = derive2 { name="kde1d"; version="0.4.0"; sha256="0sgq85fn5zfdczazq6wb8rgiv7bab6j3zh8gl2bsm1925h8k4x0p"; depends=[BH cctools qrng Rcpp RcppEigen]; }; kdecopula = derive2 { name="kdecopula"; version="0.9.2"; sha256="0g5c12wm3byd4chd8i9mxv599gsf4ip4qghx83j3mmhsmn05zf4y"; depends=[lattice locfit qrng quadprog Rcpp RcppArmadillo]; }; - kdensity = derive2 { name="kdensity"; version="1.0.0"; sha256="0di027xjcd8xllkbygmkmpvp9wchh3haf15vrw7sjck3yvh68k5f"; depends=[assertthat EQL knitr rmarkdown]; }; + kdensity = derive2 { name="kdensity"; version="1.0.1"; sha256="1iinwbyn3d10gsh7i43sm9hf93baqla3gd5s10kiik76r7d97pdc"; depends=[assertthat]; }; kdetrees = derive2 { name="kdetrees"; version="0.1.5"; sha256="1plf2yp2vl3r5znp5j92l6hx1kgj0pzs7ffqgvz2nap5nf1c6rdg"; depends=[ape distory ggplot2]; }; kdevine = derive2 { name="kdevine"; version="0.4.2"; sha256="15hw27y4rlifz3kyirm7yacca38xqdwr42k21gg67dhmbdplbnz0"; depends=[cctools doParallel foreach kdecopula KernSmooth MASS qrng Rcpp VineCopula]; }; kdist = derive2 { name="kdist"; version="0.2"; sha256="18q7njvsb9sbm412c6ms4b4nxg768z9qahws5rnin06gvb25nfcx"; depends=[]; }; @@ -8825,6 +8955,7 @@ in with self; { kerndwd = derive2 { name="kerndwd"; version="2.0.2"; sha256="0nf5hyb274gn02n4lygwryv1jaqff77i040bd8gs1xykgvy6jxny"; depends=[]; }; kernelFactory = derive2 { name="kernelFactory"; version="0.3.0"; sha256="001kw9k3ivd4drd4mwqapkkk3f4jgljiaprhg2630hmll064s89j"; depends=[AUC genalg kernlab randomForest]; }; kernelPSI = derive2 { name="kernelPSI"; version="1.0.0"; sha256="1a5pg8y4p86558d6rkvzzw41vadkpvw0vxnnksc2lrc6xj7nx25y"; depends=[CompQuadForm kernlab lmtest pracma Rcpp RcppArmadillo tmg]; }; + kernelTDA = derive2 { name="kernelTDA"; version="0.1.1"; sha256="0rghj0yx32r6565mb06k83qfmnf7lajdhdg2zf8kjd9jyzidqdrn"; depends=[BH mvtnorm Rcpp RcppEigen Rdpack]; }; kernelboot = derive2 { name="kernelboot"; version="0.1.5"; sha256="0m31akhya7390lbkw0cjxcrzw28njbz4smd35m93aarb2lgpcj4k"; depends=[future future_apply Rcpp]; }; kernhaz = derive2 { name="kernhaz"; version="0.1.0"; sha256="1cxwjnfyhxfjdbhs21airycs704jic21pdpsbxsx37wkl11cxpai"; depends=[doParallel foreach GA rgl]; }; kernlab = derive2 { name="kernlab"; version="0.9-27"; sha256="1m0xqf6gyvwayz7w3c83y32ayvnlz0jicj8ijk808zq9sh7dbbgn"; depends=[]; }; @@ -8892,6 +9023,7 @@ in with self; { komadown = derive2 { name="komadown"; version="0.2.0"; sha256="0mw1bcrg10yy1y844lpik70979420h0nsar48v5p3qk783pymbdp"; depends=[bookdown rmarkdown]; }; komaletter = derive2 { name="komaletter"; version="0.3.0"; sha256="09yvb8ijm1s5d89mrl8j56n8x8q1lq2siprw8191ys3jidmk6ha7"; depends=[rmarkdown]; }; konfound = derive2 { name="konfound"; version="0.1.2"; sha256="1sza54hvg16jxrl37zmsrqvdlxjqhyd0kaxpb9fqd7rkbjqdp0m2"; depends=[broom dplyr ggplot2 margins pbkrtest purrr rlang tidyr]; }; + kosel = derive2 { name="kosel"; version="0.0.1"; sha256="1gdsy4i58byqxddpsm5nk1r3hlgik5gs2b8jqcm8n1r4ib6pg0ay"; depends=[glmnet ordinalNet]; }; kpcalg = derive2 { name="kpcalg"; version="1.0.1"; sha256="1gd5bisyfwb12l9jmwhi2arlxrabc01vgv4m1qqs23vybsd6yh52"; depends=[energy graph kernlab mgcv pcalg RSpectra]; }; kpeaks = derive2 { name="kpeaks"; version="0.1.0"; sha256="1qxpncwyshv35h1190py6a69mljabfcjjs7v17a2rb5asahy3rk8"; depends=[]; }; kpmt = derive2 { name="kpmt"; version="0.1.0"; sha256="15d26khc0v3kc1c7l1avqp48pfqmc6xj32029mv7myivr41ashk3"; depends=[matrixStats]; }; @@ -8907,7 +9039,8 @@ in with self; { kst = derive2 { name="kst"; version="0.5-2"; sha256="0xkmwr4222h4r5dzmfgr0zk8gx7bplm865p5snw2q6h46rbfsasv"; depends=[proxy relations sets]; }; kstIO = derive2 { name="kstIO"; version="0.3-0"; sha256="0pmgb7n4gvslzc6qhqga39593k45vimj1y774bfsxhsacsb1ad9l"; depends=[kstMatrix MASS pks relations sets stringr]; }; kstMatrix = derive2 { name="kstMatrix"; version="0.1-2"; sha256="1z5gs0x80dq549mba2sy1nfhsphrpkrydalj2jiwqb7fmwqknm3r"; depends=[]; }; - ktsolve = derive2 { name="ktsolve"; version="1.1.1"; sha256="031z0pnx3ghflsz7p9b3xacnz8c7li82bid526zwqc8mvqy6ay4x"; depends=[BB nleqslv]; }; + ktaucenters = derive2 { name="ktaucenters"; version="0.1.0"; sha256="15ddjr4c90b5hc4977gk35zb2kswrcvai3xighy7qj6g9lgiszgf"; depends=[dbscan dplyr GSE MASS]; }; + ktsolve = derive2 { name="ktsolve"; version="1.2"; sha256="1606b9anlqjwcbf3jp1rpwzvyx94k79q6zw3p9j0a4nxdvgxlx1j"; depends=[BB nleqslv rootSolve]; }; ktspair = derive2 { name="ktspair"; version="1.0"; sha256="1v63982jidxlcf2syahcb29myv34kc790l7lwyfxx9l50ssb812n"; depends=[Biobase]; }; kuiper_2samp = derive2 { name="kuiper.2samp"; version="1.0"; sha256="0gcgayh7qdic9zprdvs6r8qvpqs467zrm0qzp2acb7alcp01jhpi"; depends=[]; }; kulife = derive2 { name="kulife"; version="0.1-14"; sha256="070ayy6fr9nsncjjljikn2i5sp2cx3xjjqyc64y2992yx74jgvvd"; depends=[]; }; @@ -8923,8 +9056,8 @@ in with self; { l1kdeconv = derive2 { name="l1kdeconv"; version="1.2.0"; sha256="1mk92sz9nsmxsn7yplhfcz07k022lrr61114ckrmm0x8hfd89zj8"; depends=[ggplot2 mixtools]; }; l2boost = derive2 { name="l2boost"; version="1.0.1"; sha256="0f2gapzpvjnr8n1jgn60jpmcas4s8nk2q8q4k5v4ypwvpfqp7kk1"; depends=[MASS]; }; laGP = derive2 { name="laGP"; version="1.5-3"; sha256="1bn7mj42kjgqa350ikkk7dlvash3l1fw9wdzrbjb2y41mnv8ipav"; depends=[tgp]; }; - labdsv = derive2 { name="labdsv"; version="1.8-0"; sha256="0rbf7cswnj534jdi5hfaai12nbxj6l96f02c73ynraqvdqxb1bnz"; depends=[cluster MASS mgcv]; }; - label_switching = derive2 { name="label.switching"; version="1.7"; sha256="1p4cgqf79zppvzrhh5gcxnm7f8qj03fzfmjx43mjhsr1vqig4c78"; depends=[combinat lpSolve]; }; + labdsv = derive2 { name="labdsv"; version="2.0-1"; sha256="099rzl9hy70rmb5fg0vx26mlhr4ra2s0hl3jgv22s8hqpvlmakas"; depends=[cluster MASS mgcv Rtsne]; }; + label_switching = derive2 { name="label.switching"; version="1.8"; sha256="0xwwhn249aibip12yxjwlrpyqj6zvc95zc7n9jf2vjjpashyc3yk"; depends=[combinat lpSolve]; }; labelVector = derive2 { name="labelVector"; version="0.1.0"; sha256="08ydgmvks09hbln10zmqxv9hxgiha0n9w5cgych9bnkqdca74gah"; depends=[]; }; labeledLoop = derive2 { name="labeledLoop"; version="0.1"; sha256="0gq392h0sab8k7k8bzx6m7z5xpdsflldhwbpdf92zbmkbzxsz00m"; depends=[]; }; labeling = derive2 { name="labeling"; version="0.3"; sha256="13sk7zrrrzry6ky1bp8mmnzcl9jhvkig8j4id9nny7z993mnk00d"; depends=[]; }; @@ -8933,6 +9066,7 @@ in with self; { labstatR = derive2 { name="labstatR"; version="1.0.9"; sha256="1ysk23dwan1lsfwnf9v86yqyzc8wsgzmy18ycz34s4d9biq6y1zd"; depends=[]; }; labstats = derive2 { name="labstats"; version="1.0.1"; sha256="1780slp9l1rqwr5ika6hv606jzbaa3g1ywzkjkd3ff2gb0cby3ni"; depends=[]; }; lacm = derive2 { name="lacm"; version="0.0.3"; sha256="0qhvffiw2bcpnv6l4y4h12ss59yc2j0hwsg2nr4a7w4nh6yk9fwc"; depends=[numDeriv statmod]; }; + lacunaritycovariance = derive2 { name="lacunaritycovariance"; version="1.0-8"; sha256="1dya5jbrr76p20k37v07g8wck8vrdr2j3r04pqhmwq6i7h0w2c30"; depends=[RcppRoll spatstat]; }; laeken = derive2 { name="laeken"; version="0.5.0"; sha256="1g9r3y7b0gl91hijk9awa8rjk97mqpkxinzq2cgmx0m38ng9ylpa"; depends=[boot MASS]; }; laercio = derive2 { name="laercio"; version="1.0-1"; sha256="0la6fxv5k9zq4pyn8dxjiayx3vs9ksm9c6qg4mnyr9vs12z53imm"; depends=[]; }; lagged = derive2 { name="lagged"; version="0.3-0"; sha256="0bm3d6pgb25rw1njarki60j4d7mx7rni25a21iw1l650slg7sscm"; depends=[]; }; @@ -8948,7 +9082,7 @@ in with self; { landsat = derive2 { name="landsat"; version="1.0.8"; sha256="07zvj1yyryxk7rwgcrf1kl32p2karkkqz6xrnwy1096dg9iw2js7"; depends=[lmodel2 mgcv rgdal sp]; }; landsat8 = derive2 { name="landsat8"; version="0.1-10"; sha256="169b5ka98ka9chbmksz6syaygc9wgl8i2gz1h2xkxj3lk9jcg01r"; depends=[rgdal sp]; }; landscapeR = derive2 { name="landscapeR"; version="1.2"; sha256="1zm5mj861ycbc2m28yjqnkifx8grc4l718mf8r422m78jfakvcjy"; depends=[raster Rcpp]; }; - landscapemetrics = derive2 { name="landscapemetrics"; version="1.1"; sha256="0qd72nvx8k1kg47mpqycd90cwzsisv2mgm0hlkgbcbpi0ccvz0q4"; depends=[cli crayon ggplot2 raster Rcpp RcppArmadillo sp tibble]; }; + landscapemetrics = derive2 { name="landscapemetrics"; version="1.2"; sha256="0k9algml4yj4yp0zsj742vcmjwml1sqfval8759060v0fbn4fj5h"; depends=[cli ggplot2 raster Rcpp RcppArmadillo sp tibble]; }; landscapetools = derive2 { name="landscapetools"; version="0.5.0"; sha256="11zp6r414nkj8vhsbryzhkxmpal2bva8msaxf1v69xax70ilxyf1"; depends=[ggplot2 raster Rcpp tibble]; }; landsepi = derive2 { name="landsepi"; version="0.0.7"; sha256="00ckjjyq33y362xhwjic8rwz06ml3s5l8wxxf7cgh0xkzv5hwcnr"; depends=[fields maptools MASS Matrix Rcpp rgdal rgeos sf sp splancs]; }; languageR = derive2 { name="languageR"; version="1.5.0"; sha256="1iipnr2b4hd2w718prbh075j56m5xnchlcb2vg26m16qpydp6afn"; depends=[]; }; @@ -8972,10 +9106,10 @@ in with self; { lattice = derive2 { name="lattice"; version="0.20-38"; sha256="0b8abkz7syscq883mrgv63pkwaqkcpwfx8rgbqy9vgfva0z5xszx"; depends=[]; }; latticeDensity = derive2 { name="latticeDensity"; version="1.1.0"; sha256="0amxkdf240pgqaydkfvmv1mgsl17jv57938sl96clw1bzd4ilnld"; depends=[sp spam spatstat spdep splancs]; }; latticeExtra = derive2 { name="latticeExtra"; version="0.6-28"; sha256="1hkyqsa7klk5glj9y1hg3rxr5qilqw8h0017zc4c3nps7lr9a1kq"; depends=[lattice RColorBrewer]; }; - lava = derive2 { name="lava"; version="1.6.5"; sha256="13rlqdg42ylnz4hc932bl50xismrcr4d9ykcd9zs19cw5mckjx0f"; depends=[numDeriv SQUAREM survival]; }; + lava = derive2 { name="lava"; version="1.6.6"; sha256="0nfab5fgnmxh8cplg8rd8cp34fny5j0k5wn4baj51r6ck7fq9g3s"; depends=[numDeriv SQUAREM survival]; }; lava_tobit = derive2 { name="lava.tobit"; version="0.5"; sha256="15dlcjgnvrpdxymcwf4rvk72ssr650dy1ayp50zlrp2va0p6h4kw"; depends=[lava mets mvtnorm survival]; }; lavaSearch2 = derive2 { name="lavaSearch2"; version="1.5.4"; sha256="0zq5i568pd0xwjbxwi0ndhmjxglyd9y2x8yfvnrmg3pq1wxqys6h"; depends=[doParallel ggplot2 lava MASS Matrix multcomp mvtnorm nlme Rcpp RcppArmadillo reshape2 sandwich]; }; - lavaan = derive2 { name="lavaan"; version="0.6-3"; sha256="0hw856kv11zqn6nd4216rh19i6xbnc1rh044r7jvvxkhzgbqkyxz"; depends=[MASS mnormt numDeriv pbivnorm]; }; + lavaan = derive2 { name="lavaan"; version="0.6-4"; sha256="1zf0sxpms35rhq2syb7r3sshhc8kjvc3pv97dk9x0gf4xl7pck4g"; depends=[MASS mnormt numDeriv pbivnorm]; }; lavaan_shiny = derive2 { name="lavaan.shiny"; version="1.2"; sha256="0qgswdpxb5af0l3v70sg0jrgsdwr88gz6zzwbk3pw5x6qnvnwb6r"; depends=[lavaan psych semPlot shiny shinyAce]; }; lavaan_survey = derive2 { name="lavaan.survey"; version="1.1.3.1"; sha256="133hpy8s00y6jzwwzl9brdh70w26jycdm3n1c6bcryghwh3ai4xr"; depends=[lavaan MASS survey]; }; lavaanPlot = derive2 { name="lavaanPlot"; version="0.5.1"; sha256="01bx1snd3zhc8dmq0f407qhw2d00f6d38qpr791qc1mq5kr3d8qj"; depends=[DiagrammeR lavaan stringr]; }; @@ -8987,6 +9121,7 @@ in with self; { lazyeval = derive2 { name="lazyeval"; version="0.2.2"; sha256="1m10i059csrcqkcn59a8wspn784alxsq3symzhn24mhhl894346n"; depends=[]; }; lazyrmd = derive2 { name="lazyrmd"; version="0.2.0.1"; sha256="0yzamy1bfq0d7mnrr24wzvvw6lq7rhfs6qnqypfmym65j5kfj0f8"; depends=[digest htmltools htmlwidgets knitr rmarkdown]; }; lazysql = derive2 { name="lazysql"; version="0.1.3"; sha256="18vff80rl8ckjwfqi9dhzs1q35a1wrxvynidji6dy2kvvk38xnpa"; depends=[checkmate magrittr plyr]; }; + lazytrade = derive2 { name="lazytrade"; version="0.3.4"; sha256="1j1da1848vjkvvnc6x3svmdy0fjn5pkn24llriy7w3mj8lr4bdpb"; depends=[dplyr h2o lubridate magrittr openssl ReinforcementLearning tidyverse]; }; lba = derive2 { name="lba"; version="2.4.4"; sha256="0izqndm992zv3sg8v5lpnxbdbxhpxl6hq3bf6xgq3pnw8vl3f6nb"; depends=[alabama MASS plotrix rgl scatterplot3d]; }; lbfgs = derive2 { name="lbfgs"; version="1.2.1"; sha256="0p99g4f3f63vhsw0s1m0y241is9lfqma86p26pvja1szlapz3jf5"; depends=[Rcpp]; }; lbfgsb3 = derive2 { name="lbfgsb3"; version="2015-2.13"; sha256="1jpy0j52w8kc8qnwcavjp3smvdwm1qgmswa9jyljpf72ln237vqw"; depends=[numDeriv]; }; @@ -8998,11 +9133,12 @@ in with self; { lclGWAS = derive2 { name="lclGWAS"; version="1.0.3"; sha256="03b6ijqvyirv96hc3dsqf4f0zzqlmq5451mcb14d2mw3s6xy1vmq"; depends=[BH Rcpp]; }; lcmm = derive2 { name="lcmm"; version="1.8.1"; sha256="1n7g4m8r8n2zi53ah35gn0nx666fh6brbysgbsyb2yv4hjrf5v08"; depends=[survival]; }; lconnect = derive2 { name="lconnect"; version="0.1.0"; sha256="0wk1kx0awj6d9w4sn0csws0sksx9cb4b4l9xpjqnyavc4zfhxj8l"; depends=[igraph sf]; }; - lcopula = derive2 { name="lcopula"; version="1.0.3"; sha256="0rs8lzywbajdzxmrbc8xx0vr2zs052rpbi9fcm1mpai2w8zfba2l"; depends=[copula pcaPP Rcpp]; }; + lcopula = derive2 { name="lcopula"; version="1.0.4"; sha256="11rjymm4zj3brifzrrfwqv9v8rzkzqk072xlzyjxm2p08dd11xxb"; depends=[copula pcaPP Rcpp]; }; lcpm = derive2 { name="lcpm"; version="0.1.0"; sha256="1miyq9pxwbn6l9099dbb5i4fnrjrnyj9yq5j6lv76bv7ih1kxp4a"; depends=[Matrix numDeriv plyr]; }; lctools = derive2 { name="lctools"; version="0.2-7"; sha256="1pllm5jf9mpy4nf4bn4vifhr173kddabzybjwq4rg9cni92zm3dn"; depends=[MASS pscl reshape weights]; }; lcyanalysis = derive2 { name="lcyanalysis"; version="1.0.3"; sha256="0nkqrm8r5iyvw2gbixvi0bnqx2wafg67cqz9mn99halzk9hpynl9"; depends=[quantmod TTR xts zoo]; }; lda = derive2 { name="lda"; version="1.4.2"; sha256="03r4h5kgr8mfy44p66mfj5bp4k00g8zh4a1mhn46jw14pkhs21jn"; depends=[]; }; + lda_svi = derive2 { name="lda.svi"; version="0.1.0"; sha256="1x72zqks8163qpmld21n5vn5q3jazp6g54arf53038rd0c59191q"; depends=[BH Rcpp RcppArmadillo Rdpack reshape2 tm]; }; ldamatch = derive2 { name="ldamatch"; version="1.0.1"; sha256="1dmmjw7h0rrgwga7235bryzzvmx68gmkpy5v1pwvnkk4rxp8xamh"; depends=[car data_table entropy foreach gmp iterators iterpc kSamples MASS RUnit]; }; ldat = derive2 { name="ldat"; version="0.2.0"; sha256="04l544js7xzaywd2mj3kcz40gxn98primzmzd1ihk35lqmpd7h8y"; depends=[BH lvec Rcpp]; }; ldatuning = derive2 { name="ldatuning"; version="1.0.0"; sha256="021k91a76yxjpda2850jcnxvawlrisvw35rw2p6ylfwkylaf4sz9"; depends=[ggplot2 reshape2 Rmpfr scales slam topicmodels]; }; @@ -9012,7 +9148,7 @@ in with self; { ldr = derive2 { name="ldr"; version="1.3.3"; sha256="1c48qm388zlya186qmsbxxdcg1mdv3nc3i96lqb40yhcx2yshbip"; depends=[GrassmannOptim Matrix]; }; leabRa = derive2 { name="leabRa"; version="0.1.0"; sha256="08yiwyfg9bp4i9w5yyw9p63wyvgj39kd64y3h21j2jmpw8zxncdq"; depends=[plyr R6]; }; leaderCluster = derive2 { name="leaderCluster"; version="1.2"; sha256="1lqhckarqffm2l3ynji53a4hrfn0x7zab7znddia76r2h6nr02zb"; depends=[]; }; - leafR = derive2 { name="leafR"; version="0.2"; sha256="0wkniz6m5zar8p5vjn9wjz6whi8xal28kvhk9axbxifb9gykyyzl"; depends=[data_table lazyeval lidR raster sp]; }; + leafR = derive2 { name="leafR"; version="0.3"; sha256="0bb05y0py2q0qmvapbv3ibrycjb8i4adl25807i8l7g768y3llsr"; depends=[data_table lazyeval lidR raster sp]; }; leafSTAR = derive2 { name="leafSTAR"; version="1.0"; sha256="16zfaj0v6dx6mhy6m126lxa6w0dzfw4acm83jlbrizaz52amhv6a"; depends=[]; }; leafem = derive2 { name="leafem"; version="0.0.1"; sha256="0yjbwhxjifhf1yw3phc12hlrr080y4331dwgpxdg62x7v0y5xl31"; depends=[htmltools htmlwidgets leaflet raster sf sp]; }; leaflet = derive2 { name="leaflet"; version="2.0.2"; sha256="051i5qmwa0zbk4jpjrx9kzk4g8qg9c3cavvhw19yj08fjhh8si7s"; depends=[base64enc crosstalk htmltools htmlwidgets magrittr markdown png raster RColorBrewer scales sp viridis]; }; @@ -9020,6 +9156,7 @@ in with self; { leaflet_extras = derive2 { name="leaflet.extras"; version="1.0.0"; sha256="0li7651cwlz7sg04xdrmvhkrf0n6amaydck7gqz0wkb6wq8hcyzw"; depends=[htmltools htmlwidgets leaflet magrittr stringr]; }; leaflet_minicharts = derive2 { name="leaflet.minicharts"; version="0.5.4"; sha256="17lrchpry3in36jdkinsxs9lzqnx65xyk9g939knc8nmjw6z2j2r"; depends=[htmltools leaflet]; }; leaflet_opacity = derive2 { name="leaflet.opacity"; version="0.1.0"; sha256="19dkl105sf7c9wrpl8kzwsjwwc7r9qb4c1g85w2lavpj0pbyazxw"; depends=[htmltools htmlwidgets]; }; + leaflet_providers = derive2 { name="leaflet.providers"; version="1.8.0"; sha256="1rbx3n59hrbh3ncfzcv442shdyx64d67nlviisyfixvc1jlmjr2h"; depends=[htmltools]; }; leafletCN = derive2 { name="leafletCN"; version="0.2.1"; sha256="1rg39n4bjacwss9nbdnz8y2zh8hxlc7a5ygndhjbmzajnbxfh09b"; depends=[htmltools jsonlite leaflet magrittr rgeos sp]; }; leafletR = derive2 { name="leafletR"; version="0.4-0"; sha256="0j1i971dl3smq8rcsa5s4rfmmk936k2q6xa4hppfzwhrxs3xkkkx"; depends=[brew jsonlite]; }; leafpm = derive2 { name="leafpm"; version="0.1.0"; sha256="06d2k5x6bnv7bf4aw2bayi8sh5bw8z6akwnp7da5s7454hyqn0vv"; depends=[dplyr htmltools htmlwidgets jsonlite leaflet sf]; }; @@ -9030,7 +9167,6 @@ in with self; { leaps = derive2 { name="leaps"; version="3.0"; sha256="11gjmn1azrjw5xlvdb4gknj9985kck9x8zb9np1rnk2smp6pka2m"; depends=[]; }; learNN = derive2 { name="learNN"; version="0.2.0"; sha256="0q0j25vi7hrwaf38y10m24czf3rsvj937jvkz3ns12bd8srlflah"; depends=[]; }; learnPopGen = derive2 { name="learnPopGen"; version="1.0.4"; sha256="04wxina3n2bspxdp3d4bgqrwyxqxx46pfp8zgzr3rsj89ml8if9l"; depends=[gtools phytools]; }; - learningCurve = derive2 { name="learningCurve"; version="1.1.2"; sha256="02dl5rlvwa8dvhknf4kdfg3aial54shnxrq7k2k8yj2dj0qh062c"; depends=[ggplot2 gridExtra scales tibble]; }; learningr = derive2 { name="learningr"; version="0.29"; sha256="1nr4ydcq2mskv4c0pmf0kxv5wm8pvjqmv19xz5yaq0j834b0n5q7"; depends=[plyr]; }; learnr = derive2 { name="learnr"; version="0.9.2.1"; sha256="0jbk0g6fkw7zs8ykzhsvh9vvz8xmc4v03bqzjsa5mmpxpqan5vx5"; depends=[evaluate htmltools htmlwidgets jsonlite knitr markdown rappdirs rmarkdown rprojroot shiny withr]; }; learnrbook = derive2 { name="learnrbook"; version="0.0.2"; sha256="1k17dk8ahn1ifwid1hhx0k7fpgc62zg82y66bbf6nhd4dgdbbv2p"; depends=[]; }; @@ -9039,12 +9175,12 @@ in with self; { leerSIECyL = derive2 { name="leerSIECyL"; version="1.0.2"; sha256="1zx28gpnys9mmhq7wwljfnq92wj1h1vxgqiirnfmn36z942nvmxl"; depends=[RCurl]; }; lefse = derive2 { name="lefse"; version="0.1"; sha256="1zdmjxr5xa5p3miw79mhsswsh289hgzfmn3mpj1lyzal1qgw1h5m"; depends=[ape fBasics geiger picante SDMTools vegan]; }; legocolors = derive2 { name="legocolors"; version="0.2.0"; sha256="06jbq12jzga1p5jajhnnkk11s9gjw5ngmnrvhmbvirhsbafp0fjv"; depends=[]; }; - leiden = derive2 { name="leiden"; version="0.2.3"; sha256="0w0wpnhh6qx33da9gnsmnfr9kbvn6b3jkcfaa2h9g5yp67ghh11v"; depends=[reticulate]; }; + leiden = derive2 { name="leiden"; version="0.3.1"; sha256="19gq27zin4gf4sh7h24gyq3f8jjir20n2l36a7pk1pbzcr4ixyhp"; depends=[igraph Matrix reticulate]; }; leiv = derive2 { name="leiv"; version="2.0-7"; sha256="15ay50886xx9k298npyksfpva8pck7fhqa40h9n3d7fzvqm5h1jp"; depends=[]; }; lemon = derive2 { name="lemon"; version="0.4.3"; sha256="0wsn5bfg10wq4dnrgpyraz2bzx9p19c7hf1pwj3h4zmpqfgsdbpw"; depends=[ggplot2 gridExtra gtable knitr lattice plyr scales]; }; lenses = derive2 { name="lenses"; version="0.0.3"; sha256="08akwzlc5gk2rxbh9xp67n5ahdcld60932ascczjv0accrkxizhk"; depends=[magrittr rlang tidyselect]; }; lero_lero = derive2 { name="lero.lero"; version="0.2"; sha256="03ll7jzcay0swwpmxyf0y9k2h8mxx4p5v3ggm9dgdz4j99934l70"; depends=[]; }; - lessR = derive2 { name="lessR"; version="3.8.6"; sha256="1yw9wvhv1vysdd48jl9vy88nv9x7rlic4my2sy30jgr1h33r5f41"; depends=[colorspace ellipse foreign lattice latticeExtra leaps openxlsx png rmarkdown robustbase sas7bdat triangle viridisLite wesanderson]; }; + lessR = derive2 { name="lessR"; version="3.8.8"; sha256="1izkxy1cwsii0075xby3lkjrbgycpgkn9yk6akq6wgl758qpw5ab"; depends=[colorspace ellipse foreign lattice latticeExtra leaps openxlsx png rmarkdown robustbase sas7bdat triangle viridisLite wesanderson]; }; lest = derive2 { name="lest"; version="1.0.0"; sha256="06ng0dpj37bhhwc34ilpks2ics97m9yjdpj4q993h3s2fn8kdgxw"; depends=[]; }; lestat = derive2 { name="lestat"; version="1.9"; sha256="1skxymdf3ncmdbskh7711xxgwsmwxfxnl52gcgw06jscx6s6wrsd"; depends=[MASS]; }; letsR = derive2 { name="letsR"; version="3.1"; sha256="0wyqqq7w21k87md3pwsz3kdaws345fdhh2xgavwiiywalg0gvxxx"; depends=[fields geosphere maps maptools raster rgdal rgeos sp XML]; }; @@ -9053,7 +9189,7 @@ in with self; { lexicon = derive2 { name="lexicon"; version="1.2.1"; sha256="0x7rscsh6par2lj11sby7bmz41cxn63iiw51lgh29z09cg8j606c"; depends=[data_table syuzhet]; }; lexiconPT = derive2 { name="lexiconPT"; version="0.1.0"; sha256="0w53gnr29nzc1ib54rnxdycs0c5f7vpv586qmvxxzy4ar16kisaq"; depends=[]; }; lfactors = derive2 { name="lfactors"; version="1.0.4"; sha256="1r8qlwj3zsm233jfx9ag0q5g1knvjmbwl3785pwcd12zi6f68dcc"; depends=[]; }; - lfda = derive2 { name="lfda"; version="1.1.2"; sha256="0y59iigcpmyrmsiwrpv5agja6vz3wxmxd9sl5hbf1ybm4d0lyky4"; depends=[plyr rARPACK]; }; + lfda = derive2 { name="lfda"; version="1.1.3"; sha256="0sk409jx4chs2wzhpfw7rlg9pwpdqg32ncfl3w243ypq73jq0qv3"; depends=[plyr rARPACK]; }; lfe = derive2 { name="lfe"; version="2.8-3"; sha256="0hpgk0k0xq47p71002xvl9p9xhw5yv9vsh0c4xyg1sjd5mdvhvy4"; depends=[Formula Matrix sandwich xtable]; }; lfl = derive2 { name="lfl"; version="1.4.2"; sha256="0lr7r04jpsrp54g4flpwihymvwa3idxhzfjxfbx4ah16rd47nk5x"; depends=[e1071 foreach forecast plyr Rcpp tseries zoo]; }; lfstat = derive2 { name="lfstat"; version="0.9.4"; sha256="0lm9fyw45kdkkjldkmagykn9p3l3jlw2ky3h00f7j6rqkizjm6r0"; depends=[dygraphs lattice latticeExtra lmom lmomRFA plyr xts zoo]; }; @@ -9073,9 +9209,10 @@ in with self; { librarysnapshot = derive2 { name="librarysnapshot"; version="0.1.2"; sha256="0v4x564zpm58kxs5n84bi6mcjhbzjg6a2lc30vsc8kbm3qy0nq38"; depends=[]; }; libsoc = derive2 { name="libsoc"; version="0.7"; sha256="1r548rvj98wl0yp6jx5d2qhvy1y4883qp0w3jjk97vp07a1cywn8"; depends=[]; }; libstableR = derive2 { name="libstableR"; version="1.0.2"; sha256="1gkcgbc8a7ks9x8mqmlz98hk55q3qy62izam7csz1s0r5dzsyqcr"; depends=[Rcpp RcppGSL]; }; - lidR = derive2 { name="lidR"; version="2.0.3"; sha256="0dpxw2gh55l11kzfnz5miq522zz63cblbgkkxlkbqhxd9a1l04w3"; depends=[BH data_table future gdalUtils geometry glue gstat imager lazyeval raster Rcpp RCSF rgdal rgeos rgl rlas sf sp]; }; + lidR = derive2 { name="lidR"; version="2.1.0"; sha256="1rpln2ngqy7p5809ip557xila4c4xvmm7skmh4l7q07lmplxc5wl"; depends=[BH data_table future gdalUtils geometry glue gstat imager lazyeval raster Rcpp RcppArmadillo RCSF rgdal rgeos rgl rlas sf sp]; }; lifecontingencies = derive2 { name="lifecontingencies"; version="1.3.6"; sha256="0v8xrnmviq938x779f3h55iq8bhvbkwgz35v1dxgzbxwclj7jycl"; depends=[markovchain Rcpp]; }; lifecourse = derive2 { name="lifecourse"; version="2.0"; sha256="1m8ihqvzhzpq2m2pdvh37bpq9pdbj23r3y0jkl3q8farh3qj473d"; depends=[TraMineR]; }; + lifecycle = derive2 { name="lifecycle"; version="0.1.0"; sha256="11rk7hkw63rfrf4aqmb4xrb88kg95xh8hajpjvjfwjym2v02h74n"; depends=[glue rlang]; }; lifelogr = derive2 { name="lifelogr"; version="0.1.0"; sha256="1wygvw61ygpww0kahxhmjdncwg4zc2cshs0brzw18nfqaj8vpfav"; depends=[dplyr fitbitScraper ggplot2 lazyeval lubridate modelr plyr R6 shiny stringr tibble tidyr]; }; lift = derive2 { name="lift"; version="0.0.2"; sha256="0ynsyl6lw7z7bvwzk2idgxzzqji5ffnnc3bll9h4gwdw666g7fln"; depends=[]; }; liftLRD = derive2 { name="liftLRD"; version="1.0-8"; sha256="1m24f4mc70l808cpkcdm91hzb5b3bkzibvgyfi9zs6cs8apcvmy3"; depends=[adlift nlt]; }; @@ -9127,6 +9264,7 @@ in with self; { listless = derive2 { name="listless"; version="0.0-2"; sha256="1gr6l4vih7j28kg2mj1xj2yhlpwjc4p894vsxri25vq0r9kgcdym"; depends=[magrittr tidyr]; }; listviewer = derive2 { name="listviewer"; version="2.1.0"; sha256="09jkrrq4zyzgi66vkpm5n7isxpbckx5hjk39nik766hzarj5i7rs"; depends=[htmltools htmlwidgets shiny]; }; liteq = derive2 { name="liteq"; version="1.1.0"; sha256="0w3w9f6374qwvlrqknavqh9b38n5q1r6aw5zmz5lahvadalwdbwi"; depends=[assertthat DBI rappdirs RSQLite]; }; + litteR = derive2 { name="litteR"; version="0.4.1"; sha256="1348vljlm546j00bh9x8dfjjrvvclamx5cb7ik9bganj1i9dvjmk"; depends=[dplyr fs ggplot2 purrr readr rlang rmarkdown stringr tidyr yaml]; }; littler = derive2 { name="littler"; version="0.3.8"; sha256="0g4aw031fsv69i7ah1g308dj0jsb9gpz0pbixji0agqqivhsf63a"; depends=[]; }; liureg = derive2 { name="liureg"; version="1.1.2"; sha256="1zhc5fs47whjvvwwiivykxfchzbjbldyvdmqh9rp7ccwba2q3956"; depends=[]; }; live = derive2 { name="live"; version="1.5.10"; sha256="17wz3cs6pjghc31965wblm3lm3x1pr5bk5j1wi84vyyl0sni3qx4"; depends=[breakDown data_table dplyr e1071 forestmodel ggplot2 gower MASS mlr shiny]; }; @@ -9173,7 +9311,7 @@ in with self; { lmviz = derive2 { name="lmviz"; version="0.1.2"; sha256="06pl0gzsbpk6l7l5np2c2rv37d2b3mr7qhxd7z4yiqiaffdrmrpz"; depends=[lmtest mgcv shiny shinyjs]; }; loa = derive2 { name="loa"; version="0.2.44.2"; sha256="16yrkl8l4wa4i3iizncm58l75l46acfr2lf4vn53crcci9xra333"; depends=[lattice MASS mgcv plyr png RColorBrewer RgoogleMaps]; }; loadr = derive2 { name="loadr"; version="0.1.2"; sha256="1zqg90hxw6c3k3gd0caj8fh5ym3f97gsr9cvi6ndlzqh4957cd5n"; depends=[]; }; - lobstr = derive2 { name="lobstr"; version="1.1.0"; sha256="1ii4ah9b0dn5xm6ql6yvm4r88iflh3gymz4d2mxcqfk792yp1pkb"; depends=[crayon Rcpp rlang]; }; + lobstr = derive2 { name="lobstr"; version="1.1.1"; sha256="0vkif17825x33cz8r89j0qph4wj5l8fzfgl8nh2g7m2v140cxjdq"; depends=[crayon Rcpp rlang]; }; localICE = derive2 { name="localICE"; version="0.1.0"; sha256="0pch4mdn0bj3rlqsai3lqrkv6pw04238n9qvlwzwcwii3wyqhkgs"; depends=[checkmate ggplot2]; }; localIV = derive2 { name="localIV"; version="0.2.1"; sha256="09z5iqqa9ia4v88fbgf23ww8wxywpyndhzl5mhsp5dvpnj0vyhx1"; depends=[KernSmooth mgcv sampleSelection]; }; localModel = derive2 { name="localModel"; version="0.3.11"; sha256="1qy5qpczyp0dbnbfmznzn84cgakvlbsq6cgdn6r08dkdh339d6fb"; depends=[ggplot2 glmnet ingredients partykit]; }; @@ -9185,6 +9323,7 @@ in with self; { locpol = derive2 { name="locpol"; version="0.7-0"; sha256="1p915n0l09kbwkly627074jslxl01yssp1rf0c7sygvsw6sgy5lm"; depends=[]; }; lodGWAS = derive2 { name="lodGWAS"; version="1.0-7"; sha256="0g5b44d3wb5hnx5l2n76myb1pc9ml3a052n1a4gvgqapa5as35s2"; depends=[rms survival]; }; loder = derive2 { name="loder"; version="0.2.0"; sha256="0m6g8c25dmq0wgpy8y6cbggymxdvqwb6lp2yzs5bgpq183512spb"; depends=[]; }; + lodi = derive2 { name="lodi"; version="0.9.0"; sha256="06ljky3r168navs9dys3dv22cb35lnz47wa3pqkxaiy94h254hvh"; depends=[rlang]; }; loe = derive2 { name="loe"; version="1.1"; sha256="1n16pgfxg9vcn729xxjbbvavg2ywbdcch9v2ph8nv3z7psc0q46c"; depends=[MASS]; }; log4r = derive2 { name="log4r"; version="0.3.0"; sha256="14d66xgv1z8v8wqxkycjhpl4r0z14cx9i6lxxs5y844454hh4pcf"; depends=[]; }; logKDE = derive2 { name="logKDE"; version="0.3.2"; sha256="09gachibj0klqa9ijw572lwphbh9qj6zqray5byq1dh7zsiq516q"; depends=[pracma Rcpp]; }; @@ -9196,7 +9335,7 @@ in with self; { logcondens_mode = derive2 { name="logcondens.mode"; version="1.0.1"; sha256="1i2c2prk5j863p3a3q3xnsv684igfi5czz3dib7zfjldpf0qyaq7"; depends=[distr logcondens]; }; logcondiscr = derive2 { name="logcondiscr"; version="1.0.6"; sha256="08wwxsrpflwbzgs6vb3r0f52hscxz1f4q0xabr1yqns06gir1kxd"; depends=[cobs Matrix mvtnorm]; }; logger = derive2 { name="logger"; version="0.1"; sha256="00gfy2i58qn5na8cxxrkm1pvsw85xx2gdk0y6dzxhcjfx3wyplaw"; depends=[]; }; - logging = derive2 { name="logging"; version="0.9-107"; sha256="0qkg4ar0qn6zjqy3ymjpfiq39lxzfdh5pg3khrpyx6z2s5w426dp"; depends=[]; }; + logging = derive2 { name="logging"; version="0.10-108"; sha256="13gd40ygx586vs6xcp6clg69a92aj8zxlk1rn3xzkx8klfjimjc5"; depends=[]; }; loggit = derive2 { name="loggit"; version="1.1.1"; sha256="1w9a3mbf863dk6lnd95mwr15rxjpv1rra1z45jnqk8w56g1s7q4d"; depends=[dplyr jsonlite]; }; loggle = derive2 { name="loggle"; version="1.0"; sha256="0r1r8m2ckva17vbvwkzhq1lx6bap0kbfj9hxyk46adslcf3xxrxp"; depends=[doParallel foreach glasso igraph Matrix sm]; }; logiBin = derive2 { name="logiBin"; version="0.3"; sha256="06y5bqm3j6xdr1cd607v2sqkghnd2bv6bvxc6cz8dvp8jabqa0zm"; depends=[data_table doParallel foreach iterators partykit]; }; @@ -9208,7 +9347,7 @@ in with self; { logitnorm = derive2 { name="logitnorm"; version="0.8.37"; sha256="1a9plxsxy29j9xpvwsznbbj150h9daay5zfzlmkh5y0f7f15w3a9"; depends=[]; }; loglognorm = derive2 { name="loglognorm"; version="1.0.1"; sha256="0rhx769a5nmidpbpngs2vglsbkpgw9badz3kj3jfmpj873jfnbln"; depends=[]; }; logmult = derive2 { name="logmult"; version="0.7.1"; sha256="0y9z5l93hm8p3r1rd6g11miqg1a02b9hy5mgcxv2q0hm1pg2vh0q"; depends=[gnm qvcalc]; }; - lognorm = derive2 { name="lognorm"; version="0.1.5"; sha256="00l7nx6brhn5z7sk59n4bjw8h2wzf3r273ma6i62zhdc2nglz479"; depends=[Matrix]; }; + lognorm = derive2 { name="lognorm"; version="0.1.6"; sha256="05a6djz06jblnx51x2r5gwb57l4wq6giz6kknsslzsl64xj275z1"; depends=[Matrix]; }; logspline = derive2 { name="logspline"; version="2.1.13"; sha256="1mhv23r7whragw2rg8hcwll2mki1z85mrp82zxn5pkljl5yndagh"; depends=[]; }; lokern = derive2 { name="lokern"; version="1.1-8"; sha256="1dlyvgd2i4dckd8ic3x75r4sikwalch9b2f13xp5rhkzmfzbprxq"; depends=[sfsmisc]; }; lolog = derive2 { name="lolog"; version="1.2"; sha256="1vd80ngq4558ahan1vhsql0wc578imm13fgrrgnzlrd91xncnnjf"; depends=[BH ggplot2 intergraph Matrix network Rcpp reshape2]; }; @@ -9216,7 +9355,7 @@ in with self; { longCatEDA = derive2 { name="longCatEDA"; version="0.31"; sha256="0dji41lsknfwmgb2fczzm37dm97wvi45rh878w7pwlzwdh9vq8va"; depends=[]; }; longROC = derive2 { name="longROC"; version="1.0"; sha256="1fs11vqi4hy99d7shzzdvd6ic5gay6rh2027w6j0qpd04n8q88m8"; depends=[survival]; }; longRPart2 = derive2 { name="longRPart2"; version="0.2.3"; sha256="1vqcsxi6c4hqrpk3ns7yhghfryin1psxl38qkz2xz8cvyn58f685"; depends=[formula_tools ggplot2 MASS nlme rpart]; }; - longclust = derive2 { name="longclust"; version="1.2.2"; sha256="1yxxz8apbl1vaqzrsiq7r5ss87j2li595bkvibpkwslgwzv47dcs"; depends=[]; }; + longclust = derive2 { name="longclust"; version="1.2.3"; sha256="1g45d5pak2vhbjrcmxxrk9jyrdxkqwy45phzpsw6b2bjyrgr4i7g"; depends=[]; }; longitudinal = derive2 { name="longitudinal"; version="1.1.12"; sha256="1d83ws28nxi3kw5lgd5n5y7865djq7ky72fw3ddi1fkkhg1r9y6l"; depends=[corpcor]; }; longitudinalData = derive2 { name="longitudinalData"; version="2.4.1"; sha256="0lnvcfgj721bawl1ciz0jw83mfsnzkhg6jn824vr3qdm4rbib2vd"; depends=[class clv misc3d rgl]; }; longitudinalcascade = derive2 { name="longitudinalcascade"; version="0.3.1.1"; sha256="1xm2w8qif34sv2f57996pxf1j52lyrmzaswmszpxiy1lvf2h362g"; depends=[dplyr ggplot2 lubridate rlang scales survival tidyr zoo]; }; @@ -9226,6 +9365,7 @@ in with self; { loo = derive2 { name="loo"; version="2.1.0"; sha256="0zg8a11qhifg1p3hisxin1q47wlykjig4k3dz5zmflfihpps3x0v"; depends=[checkmate matrixStats]; }; lookupTable = derive2 { name="lookupTable"; version="0.1"; sha256="0ipy0glrad2gfr75kd8p3999xnfw4pgpbg6p064qa8ljqg0n1s49"; depends=[data_table dplyr]; }; loon = derive2 { name="loon"; version="1.2.2"; sha256="1mb6jys2pipac31x8a7rm265zvx1l11w1gl2b82afl8as2v7s90j"; depends=[gridExtra]; }; + loon_data = derive2 { name="loon.data"; version="0.0.5"; sha256="0hvgvsv1vxx7m1fh8kjj7kfpl0c44n8xw9v8vaxlnz30s8rwhplc"; depends=[]; }; 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]; }; loose_rock = derive2 { name="loose.rock"; version="1.0.16"; sha256="0vk9zmiy730c1d397v5p7v8ywjv1wv9vabmhdjyrfdx7bijfy57m"; depends=[digest dplyr futile_options ggplot2 MASS reshape2]; }; @@ -9235,11 +9375,11 @@ in with self; { lori = derive2 { name="lori"; version="2.1.3"; sha256="09wk6pfrfazh8s4zc7v1x5gsra9klh7whc3jnpasvhgnna5515ys"; depends=[data_table FactoMineR rARPACK svd]; }; lotri = derive2 { name="lotri"; version="0.1.1"; sha256="1zqp56hxqyf9a820p2d272ykqnrym2qc5sbmah68qv8ql9n1z9qg"; depends=[Matrix]; }; lowmemtkmeans = derive2 { name="lowmemtkmeans"; version="0.1.2"; sha256="08zhdw48rzw47yzhg4s37bkliyngxs46cyb57dvng1s3m0w0dhvi"; depends=[Rcpp RcppArmadillo]; }; - lpSolve = derive2 { name="lpSolve"; version="5.6.13.1"; sha256="1f10ywlaaldgjj84vs108ly0nsbkrdgbn5d6qj7nk93j1x1xrn3a"; depends=[]; }; - lpSolveAPI = derive2 { name="lpSolveAPI"; version="5.5.2.0-17.1"; sha256="006dzb1pmyqqdrivhb2mqvn9lp97bv9h9wrmp42r1mh7vqn740ww"; depends=[]; }; + lpSolve = derive2 { name="lpSolve"; version="5.6.13.2"; sha256="0fc5m259ayc880f5hvnq59ih6nb2rlp394n756n1khmxbjpw1w3m"; depends=[]; }; + lpSolveAPI = derive2 { name="lpSolveAPI"; version="5.5.2.0-17.3"; sha256="116adayi5xwg7l049bszz7452avfbyphivnzvy9l3k48awfimfi9"; depends=[]; }; lpbrim = derive2 { name="lpbrim"; version="1.0.0"; sha256="1cbkzl23vgs9hf83ggkcnkmxvvj8867k5b9vhfdrznpqyqv1f2gp"; depends=[Matrix plyr RColorBrewer]; }; lpc = derive2 { name="lpc"; version="1.0.2.1"; sha256="1g1dzm7pcrbrdk1dmhbdhj58j69dzar41al3i8q4gysf3adqzsvv"; depends=[]; }; - lpdensity = derive2 { name="lpdensity"; version="0.2.3"; sha256="1126kk71vnhwn0vbdmjbx36pi33xd22a71j91d1mqhqkql6mis8y"; depends=[ggplot2]; }; + lpdensity = derive2 { name="lpdensity"; version="1.0"; sha256="1rmddq8drvwdlqw9ggf3h8dcvx64hh6ha2v9zdxfjmi50zlcirg5"; depends=[ggplot2]; }; lpint = derive2 { name="lpint"; version="2.0"; sha256="0p1np8wlfbax0c7ysc5fs9dai8s00h1v0gan89dbd6bx06307w2r"; depends=[]; }; lpirfs = derive2 { name="lpirfs"; version="0.1.5"; sha256="015009c930jilspmpk8w27lixda3mynqrlv1klss0xaj7ih286yq"; depends=[doParallel dplyr foreach ggplot2 lmtest plm Rcpp RcppArmadillo sandwich]; }; lplyr = derive2 { name="lplyr"; version="0.1.12"; sha256="1wcab8wwdzpgb61q83gfn2d34vsrd3qa4xyb9sqna6krss1ii1in"; depends=[bazar dplyr lazyeval magrittr]; }; @@ -9259,7 +9399,7 @@ in with self; { lsei = derive2 { name="lsei"; version="1.2-0"; sha256="1xl06fb3is744pxlh42wx5hn1h0ab1k31wnmsmh0524kxzcyp0a7"; depends=[]; }; lshorth = derive2 { name="lshorth"; version="0.1-6"; sha256="0nbjakx0zx4fg09fv26pr9dlrbvb7ybi6swg84m2kwjky8399vvx"; depends=[]; }; lsl = derive2 { name="lsl"; version="0.5.6"; sha256="1hwzklx1qp5ljc059j2hridg3caw4cgn7rbqs8xh2arzcvqdw3rb"; depends=[ggplot2 lavaan reshape2]; }; - lslx = derive2 { name="lslx"; version="0.6.6"; sha256="1zian0xagmqz7d9yf2nz87q91pkwy6kgv960n3lsfg4m9v6dnpdz"; depends=[ggplot2 R6 Rcpp RcppEigen]; }; + lslx = derive2 { name="lslx"; version="0.6.8"; sha256="0x1xfgk0k77k3qvsqqi5cy73v1a2ra5rbfwvhm3wdjk928n1c9dv"; depends=[ggplot2 lavaan R6 Rcpp RcppEigen]; }; lsm = derive2 { name="lsm"; version="0.1.8"; sha256="0h7gyc4wb0y3hvs21h22l57czdd3xfycg400ncz5c9s63r47wzx3"; depends=[]; }; lsmeans = derive2 { name="lsmeans"; version="2.30-0"; sha256="1z35dzfgib0fk201gzjhgmnryhl3mkz50gz8g6nfv4mj9kzc5x5f"; depends=[emmeans]; }; lspartition = derive2 { name="lspartition"; version="0.3"; sha256="1pz636g60vp01z50kl9qp9yfb9bm83x761s0i901absdsqjs35a8"; depends=[combinat dplyr ggplot2 MASS matrixStats mgcv pracma]; }; @@ -9283,7 +9423,7 @@ in with self; { lulcc = derive2 { name="lulcc"; version="1.0.4"; sha256="00ymbp20kbjyzrsrxa262y0y7fj4jgsbqf56aapb657xvafxvy5q"; depends=[lattice raster rasterVis ROCR]; }; lumberjack = derive2 { name="lumberjack"; version="0.3.0"; sha256="00br82x9n6x96ksqqgahc1ydffl9cv8lysm57pk2mxm0fzbcph2p"; depends=[R6]; }; lunar = derive2 { name="lunar"; version="0.1-04"; sha256="0nkzy6sf40hxkvsnkzmqxk4sfb3nk7ay4rjdnwf2zym30qax74kk"; depends=[]; }; - lutz = derive2 { name="lutz"; version="0.2.0"; sha256="1ypi61b0l5pig2lvvq9lmqkqcsxhnf154lxridp0amv5rcmf2fxy"; depends=[V8]; }; + lutz = derive2 { name="lutz"; version="0.3.1"; sha256="15b8gzwykxyqycjba319jpsbny07j8ny9y4lnrg8mcf488ycz57y"; depends=[lubridate Rcpp]; }; luzlogr = derive2 { name="luzlogr"; version="0.2.0"; sha256="0n0cm94aianwcypa0gwdjvyy3dwbkfv6zi1gq2jn57b41fg20lq5"; depends=[assertthat]; }; lvec = derive2 { name="lvec"; version="0.2.2"; sha256="0n1l26n4khlalqd0b9bi7vc3kr5jh6mr56ca0rmnnl6bl9742nr5"; depends=[BH Rcpp]; }; lvm4net = derive2 { name="lvm4net"; version="0.3"; sha256="1iq93mrdhymdixnk7y7rkibm3cqljl4y9qkjq4mzkcwcp4960y5q"; depends=[corpcor ellipse ergm glmmML igraph MASS mvtnorm network]; }; @@ -9327,10 +9467,10 @@ in with self; { magclass = derive2 { name="magclass"; version="4.107.0"; sha256="0yl2w9dim462dv9nxsqvdv0ydq6njkk9bywmjanzbqqxnxb9fall"; depends=[abind maptools reshape2 sp]; }; magic = derive2 { name="magic"; version="1.5-9"; sha256="0snmdh6vk0p6ar1swsihisinxrx7l8371dri5lk0z24ysgr5w7gs"; depends=[abind]; }; magicLamp = derive2 { name="magicLamp"; version="0.1.0"; sha256="1nfcnbqd6vawz8l3vgkbhmm462xdvaa4pn6axzmz8hl05xv2k3cv"; depends=[httr tibble]; }; - magicaxis = derive2 { name="magicaxis"; version="2.0.7"; sha256="121z8rgdfp24r8lbhharmb6cdpdkiz3v65qfvns4k9alx2lxb1vj"; depends=[celestial mapproj MASS plotrix sm]; }; + magicaxis = derive2 { name="magicaxis"; version="2.0.10"; sha256="053l455si22mddc5cgihhnpkmxr2anfqvbzsa89djjpw5ah2vg1x"; depends=[celestial mapproj MASS plotrix RColorBrewer sm]; }; magicfor = derive2 { name="magicfor"; version="0.1.0"; sha256="07l33fczr1x42sfxrsqq4q6r65sdflin6l8f5cgclnvx1858jdip"; depends=[]; }; - magick = derive2 { name="magick"; version="2.0"; sha256="18y465325mhf48x2jn3jz9khwq1z2aj13wfbdkv8k3hln1sd572m"; depends=[curl magrittr Rcpp]; }; - magickGUI = derive2 { name="magickGUI"; version="1.0.1"; sha256="06yklhv0r3pa62j6kmrs3pzvjr4whqklmxl83jc972w0bfmw47ck"; depends=[magick]; }; + magick = derive2 { name="magick"; version="2.1"; sha256="1pz71maz05gx4ds1wfw0alggc8nn2w75lj12dg1zr72s3kybhkzg"; depends=[curl magrittr Rcpp]; }; + magickGUI = derive2 { name="magickGUI"; version="1.1.0"; sha256="1grwrp7jj0p2h5aafmrbwdi3d49ck6k6bjqv9742apdvlcq8ydj7"; depends=[magick]; }; magree = derive2 { name="magree"; version="1.0"; sha256="1qkd6p5g3aigcb0f4d08gc5323alvahzmazm3bzsmz1w033xd1hh"; depends=[]; }; magrittr = derive2 { name="magrittr"; version="1.5"; sha256="1s1ar6rag8m277qcqmdp02gn4awn9bdj9ax0r8s32i59mm1mki05"; depends=[]; }; mail = derive2 { name="mail"; version="1.0"; sha256="1m89cvw5ba4d87kp2dj3f8bvd6sgj9k56prqmw761q919xwprgw6"; depends=[]; }; @@ -9339,9 +9479,9 @@ in with self; { makeFlow = derive2 { name="makeFlow"; version="1.0.2"; sha256="0r7a0klgx144rnks0fhjflnf8vfyyx2544n86nnxkp6cdvw0b4pw"; depends=[dplyr RColorBrewer]; }; makeParallel = derive2 { name="makeParallel"; version="0.1.1"; sha256="1zm8k3gzxcirq221lh1vbxsjym68vc5s58lxd03s194pgixbwydr"; depends=[CodeDepends codetools whisker]; }; makeProject = derive2 { name="makeProject"; version="1.0"; sha256="09q8xa5j4s5spgzzr3y06l3xis93lqxlx0q66s2nczrhd8nrz3ca"; depends=[]; }; - makedummies = derive2 { name="makedummies"; version="1.2.0"; sha256="157nd44jhx5d4dcaa7s6brn75zgsyajz2rmskm70c8hqxyak9f63"; depends=[tibble]; }; + makedummies = derive2 { name="makedummies"; version="1.2.1"; sha256="062rvijhy2dybpgxzp44cg46bfyb8lp9yasv3mhskhf3yg717sqp"; depends=[tibble]; }; malani = derive2 { name="malani"; version="1.0"; sha256="1jps28gfkiysr356ackxf1my5xz6rpx3a2bv68pziy2614hrqbs9"; depends=[e1071]; }; - malariaAtlas = derive2 { name="malariaAtlas"; version="0.0.3"; sha256="1vvralhrh4sk742f4yb05lfchxwmpl7n0yqw7hhfga4fc1qxnd9l"; depends=[curl dplyr ggplot2 gridExtra httr raster rgdal rlang sp stringi tidyr xml2]; }; + malariaAtlas = derive2 { name="malariaAtlas"; version="0.0.4"; sha256="0hvbzknh4qv1d7by5pgyq85b1accinwx57f9a24jg4cw4307dncg"; depends=[curl dplyr ggplot2 gridExtra httr raster rgdal rlang sp stringi tidyr xml2]; }; mallet = derive2 { name="mallet"; version="1.0"; sha256="06rksf5nvxp4sizgya7h4sb6fgw3yz212a01dqmc9p5a5wqi76x0"; depends=[rJava]; }; managelocalrepo = derive2 { name="managelocalrepo"; version="0.1.5"; sha256="180b7ikas1kb7phm4l2z1d8wi45wi0qyz2c8rl8ml3f71b4mlzgc"; depends=[assertthat stringr]; }; mandelbrot = derive2 { name="mandelbrot"; version="0.2.0"; sha256="04a288jj8h1a04r584a02wg9dm3c6zifhqwj964ybsvgb4m6g99s"; depends=[reshape2]; }; @@ -9352,7 +9492,7 @@ in with self; { manifestoR = derive2 { name="manifestoR"; version="1.3.0"; sha256="1bxmlg6fmr4ky9m7b65rrylspwhwc8k9s1cbxnx9dyl33wh39ci6"; depends=[base64enc dplyr DT functional htmltools htmlwidgets httr jsonlite magrittr NLP psych tibble tm zoo]; }; manipulate = derive2 { name="manipulate"; version="1.0.1"; sha256="1klknqdfppi5lf6zbda3r2aqzsghabcsaxmvd3vw3cy3aa984zky"; depends=[]; }; manipulateWidget = derive2 { name="manipulateWidget"; version="0.10.0"; sha256="1zagrbwkn2d50zzw8i2vyb1hsq4cydmfsqiy1a2qlp6zrv8a6q9x"; depends=[base64enc codetools htmltools htmlwidgets knitr miniUI shiny webshot]; }; - manymodelr = derive2 { name="manymodelr"; version="0.1.0"; sha256="00kizk9mjb7fmz2qzw3ja57718skq9vldx1n6f7x2zwbygv51q8z"; depends=[caret dplyr e1071 magrittr Metrics plyr reshape2 tibble tidyr]; }; + manymodelr = derive2 { name="manymodelr"; version="0.2.2"; sha256="02jswli6k4m9662zf48maix28lr7w93rgwvzgm0nv1zf2mdrh6qb"; depends=[caret dplyr e1071 magrittr Metrics plyr purrr reshape2 tibble]; }; mapReasy = derive2 { name="mapReasy"; version="1.0"; sha256="13va0z967ckwxnnianki5aj66km0x6r37nj4mz9qd3b0bps4g2kj"; depends=[Hmisc rgdal sp]; }; mapStats = derive2 { name="mapStats"; version="2.4"; sha256="18pp1sb9p4p300ffvmzjrg5bv1i7f78mhpggq83myc26c3a593na"; depends=[classInt colorspace Hmisc lattice maptools RColorBrewer reshape2 sp survey]; }; mapcan = derive2 { name="mapcan"; version="0.0.1"; sha256="1a4135wc1h4nzcv6xq0bg75i744wyq8p7q0ix7y2x2gb6s35w46k"; depends=[dplyr ggplot2 magrittr]; }; @@ -9384,9 +9524,9 @@ in with self; { marked = derive2 { name="marked"; version="1.2.1"; sha256="138m1clidyhahpz111iblff2w44m8zp0302vcj46frk1c60c46qi"; depends=[coda expm lme4 Matrix numDeriv optimx R2admb Rcpp TMB truncnorm]; }; markmyassignment = derive2 { name="markmyassignment"; version="0.8.2"; sha256="1jrx72k3glwv5nci3h3qbqbs0x9mqld92v4irw2sfjzcmb7qyma3"; depends=[checkmate codetools httr lazyeval rlang testthat yaml]; }; markophylo = derive2 { name="markophylo"; version="1.0.7"; sha256="09rg5rwm0dm881fpm9yzygd6d3dyrxjsrvl0yhfpkzbpdihfympn"; depends=[ape numDeriv phangorn Rcpp RcppArmadillo]; }; - markovchain = derive2 { name="markovchain"; version="0.6.9.14"; sha256="0szv913zi34yv58kj6cic8fkrfyrl60m1ym11sgsjha0pjlv3hlw"; depends=[expm igraph matlab Matrix Rcpp RcppArmadillo RcppParallel]; }; + markovchain = derive2 { name="markovchain"; version="0.6.9.16"; sha256="1mi9wr5s1a422v6fhjxjw2038bmaip1dij90v4ckg8nqp0q9zm14"; depends=[expm igraph matlab Matrix Rcpp RcppArmadillo RcppParallel]; }; marl = derive2 { name="marl"; version="1.0"; sha256="0rndnf3rbcibv3gsrw1kfp5zhg37cw9wwlz0b7dbwprd0m71l3pm"; depends=[]; }; - marmap = derive2 { name="marmap"; version="1.0.2"; sha256="03xmp7jz2jja7m92yczc2nlcyv4qlcy7lnj3nk5wb3alh1vxlyga"; depends=[adehabitatMA DBI gdistance geosphere ggplot2 ncdf4 plotrix raster reshape2 RSQLite shape sp]; }; + marmap = derive2 { name="marmap"; version="1.0.3"; sha256="0hjy58kk2kg7v2nq7kfw5rdcrpfhikwr30lz71pfgis34833i7yy"; depends=[adehabitatMA DBI gdistance geosphere ggplot2 ncdf4 plotrix raster reshape2 RSQLite shape sp]; }; marqLevAlg = derive2 { name="marqLevAlg"; version="1.1"; sha256="1wmqi68g0flrlmj87vwgvyxap0miss0n42qiiw7ypyj4jw9kwm8j"; depends=[]; }; mase = derive2 { name="mase"; version="0.1.2"; sha256="1023xvv6yngbc183hb13057spjildywqd0jw2w9jway3zv4dbw9v"; depends=[boot dplyr foreach glmnet magrittr Matrix Rdpack rpms survey]; }; mason = derive2 { name="mason"; version="0.2.6"; sha256="01ppc7f18kf4xv4lrhib0cfm85v658grmxpny3h3kdb4pi4rbspy"; depends=[broom dplyr lazyeval magrittr tidyr]; }; @@ -9407,10 +9547,11 @@ in with self; { matlib = derive2 { name="matlib"; version="0.9.2"; sha256="09afscydrn5bk91qb26r8w7f33nhxp1ih4h55y6adcw7p6hjrw27"; depends=[car MASS rgl xtable]; }; matpow = derive2 { name="matpow"; version="0.1.1"; sha256="1a6q21ba16qfdpykmjwgmrb1kkvvyx48qg8cbgpdmch0vhibcgcp"; depends=[]; }; matrixLaplacian = derive2 { name="matrixLaplacian"; version="1.0"; sha256="1ixqdv3sz3sc79wn3vqhlq79j7x7cvl878m5hgvbcg6klfvlmmci"; depends=[scatterplot3d]; }; - matrixNormal = derive2 { name="matrixNormal"; version="0.0.0"; sha256="1m3qvvw02fqisjjsvlpz4dpy71cmn0ds6pajdmzj2shfvyyh6q4d"; depends=[mvtnorm]; }; + matrixNormal = derive2 { name="matrixNormal"; version="0.0.1"; sha256="1nvsgcp8x691pa2rjz2fgknybwpni6fppm16l5bjkrg47ka0pbcd"; depends=[mvtnorm]; }; matrixProfile = derive2 { name="matrixProfile"; version="0.5.0"; sha256="0nd54k878xf7hzwxawh03c3na4jfvb68afarkwrmmffjlp3i8a9g"; depends=[fftw signal TTR zoo]; }; matrixStats = derive2 { name="matrixStats"; version="0.54.0"; sha256="0vx00ldsg2zvdrjn49jxczk2c9iaabgvzgpdka5j02ihh7hv83cg"; depends=[]; }; - matrixTests = derive2 { name="matrixTests"; version="0.1.4"; sha256="07k4g2d1yy2g3zppwq6warv8p47y096fvz6b4113nk9ss2p9sand"; depends=[matrixStats]; }; + matrixStrucTest = derive2 { name="matrixStrucTest"; version="1.0.0"; sha256="06la9xmpi1viyjml4m1akbna3lwkz5lnq95v1nnf73i9zpfwz03k"; depends=[]; }; + matrixTests = derive2 { name="matrixTests"; version="0.1.5"; sha256="0grgvi4avlf3l4kmpn60ihnyvaxlw1fz14sx3ycgynip7b17kb24"; depends=[matrixStats]; }; matrixcalc = derive2 { name="matrixcalc"; version="1.0-3"; sha256="1c4w9dhi5w98qj1wwh9bbpnfk39rhiwjbanalr8bi5nmxkpcmrhp"; depends=[]; }; matrixpls = derive2 { name="matrixpls"; version="1.0.5"; sha256="04sshb88rq2mp3y4rrs6nkzr4kc380vx380r911c7j975l55a183"; depends=[assertive lavaan MASS matrixcalc psych]; }; matrixsampling = derive2 { name="matrixsampling"; version="1.1.0"; sha256="1q0vcail34iwxc0wnwg2nw9n710fsjg5lgil5hib74vwrww1x1h7"; depends=[keep]; }; @@ -9436,7 +9577,7 @@ in with self; { mblm = derive2 { name="mblm"; version="0.12.1"; sha256="1fipb3bryaimr30lcxsxrn0ymv24z39swca7s4z7p9xcfg3ban1b"; depends=[]; }; mbmdr = derive2 { name="mbmdr"; version="2.6"; sha256="0ss5w66hcgd8v8j9bbbp12a720sblhr2hy9kidqfr8hgjaqlch86"; depends=[logistf]; }; mboost = derive2 { name="mboost"; version="2.9-1"; sha256="02ia3y0fxfjl02fb1nnl93j640fyl18jm15cgxyybhf27w4jdvb7"; depends=[lattice Matrix nnls partykit quadprog stabs survival]; }; - mboxr = derive2 { name="mboxr"; version="0.1.5"; sha256="10rsym78dzyyynyc1c62l178j6llgii0rklj8dirx3dfi9p942dl"; depends=[dplyr lubridate magrittr purrr reticulate tibble]; }; + mboxr = derive2 { name="mboxr"; version="0.1.6"; sha256="11fakbrhpphjbc4p0src0f3l39dillhbz8030cc79zdann9jfp4p"; depends=[dplyr lubridate magrittr purrr reticulate tibble]; }; mbrglm = derive2 { name="mbrglm"; version="0.0.1"; sha256="0yxq1xk8qy5hpiqqldyrs78lp4ggdp5lj2lmh8rqq1xvsfr6nrh4"; depends=[enrichwith nleqslv]; }; mc_heterogeneity = derive2 { name="mc.heterogeneity"; version="0.1.0"; sha256="1jrj7kkykhw9qj71cfjrn5gbm3qyrbdcc4cj3mfz62wlvny18233"; depends=[metafor]; }; mc2d = derive2 { name="mc2d"; version="0.1-18"; sha256="1ljw8ms661bsdqbfpjvvrif9n0c2i6lzxyqj4rxhxsp3dj18w3g3"; depends=[mvtnorm]; }; @@ -9462,10 +9603,11 @@ in with self; { mclcar = derive2 { name="mclcar"; version="0.1-9"; sha256="0bwnivmajsrvmwskhk44qhz4nnc0irxq83g0kzbj4wshhivnwryp"; depends=[fields maxLik nleqslv rsm spam spdep]; }; mcll = derive2 { name="mcll"; version="1.2"; sha256="0i9zqbh0l9a9mv4558gbdq9mh52chanykyfwmiymmxygxhp809sz"; depends=[locfit statmod]; }; mclogit = derive2 { name="mclogit"; version="0.6.1"; sha256="1flq3g5jbp8nnx066wz35bg8wzlnnp9jp731w87vba483amakcds"; depends=[Matrix memisc]; }; - mclust = derive2 { name="mclust"; version="5.4.4"; sha256="039ymr57bq5327gypizw0v2qb81j6bkqhjdh8yj23qa5sh51phyc"; depends=[]; }; + mclust = derive2 { name="mclust"; version="5.4.5"; sha256="0whandnda1fnjn5k3hgxdbp3b0xr7nlzy1j37saqb536h8q9dwkm"; depends=[]; }; mclustcomp = derive2 { name="mclustcomp"; version="0.3.1"; sha256="0jdfdmgd46w7b38nbpd0lj9vqzi2nnf8fv0crj08lfin5ng7jvaa"; depends=[Rcpp RcppArmadillo Rdpack]; }; mcmc = derive2 { name="mcmc"; version="0.9-6"; sha256="1fc6a6asn53lx7x7pnlb5mb716nv4pcmbp99f1i30y4hzygihfj4"; depends=[]; }; - mcmcabn = derive2 { name="mcmcabn"; version="0.1"; sha256="0cyqgkz55vc3hihls7krci4d83d48cqc0x355qkzxijwj5xd7bgg"; depends=[abn coda cowplot ggplot2 ggpubr gRbase]; }; + mcmcabn = derive2 { name="mcmcabn"; version="0.2"; sha256="0mn12dkag1wlr0sdzfxxl1hkwkkwl9p2c4imnm4nzhw510zaa4fj"; depends=[abn coda cowplot ggplot2 ggpubr gRbase]; }; + mcmcderive = derive2 { name="mcmcderive"; version="0.0.1"; sha256="12asjw8rnnr7249fb7z7mp5w8y5vb0zig93jzsf77gghhfjmp4dl"; depends=[abind checkr err mcmcr purrr]; }; mcmcplots = derive2 { name="mcmcplots"; version="0.4.3"; sha256="0187z79gmvcrwqybxh3ckhcrqi0nqhvcvlczgxfkpq95y5czprdq"; depends=[coda colorspace denstrip sfsmisc]; }; mcmcr = derive2 { name="mcmcr"; version="0.2.0"; sha256="0jiyr0ncwhkgvkq4jb27iv1pxra9jbrjkv57lla71afr6glisqp2"; depends=[abind checkr coda err]; }; mcmcse = derive2 { name="mcmcse"; version="1.3-2"; sha256="0yz0zhqhsxxg1b0cf15ijxfj4q8csjng18bmq45anabllq16ymkj"; depends=[ellipse Rcpp RcppArmadillo]; }; @@ -9487,7 +9629,7 @@ in with self; { mdir_logrank = derive2 { name="mdir.logrank"; version="0.0.4"; sha256="0bhsr005dq9v85sjm2g9xlpksxwzsmsk14g0q5v3hkjvm5wk6xmv"; depends=[MASS]; }; mdmb = derive2 { name="mdmb"; version="1.3-18"; sha256="0jvwwdblky080j8cwfjna2d11z7hr672cdw9bkjz7ngd44blyp8x"; depends=[CDM coda miceadds Rcpp RcppArmadillo sirt]; }; mdpeer = derive2 { name="mdpeer"; version="1.0.1"; sha256="1vsqhah8h47s8k687fwa352549mdz16mwk1g7rcmhx75c2k85w2q"; depends=[boot ggplot2 glmnet magic nlme nloptr psych reshape2 rootSolve]; }; - mds = derive2 { name="mds"; version="0.2.1"; sha256="01md6h3va2pvgx2yx30rmildn529zhqr8ars6k2kjr8q1wq92jar"; depends=[lubridate parsedate]; }; + mds = derive2 { name="mds"; version="0.3.0"; sha256="098ynvwra7ylli1pklmmfl9xnmiyd13iw5zd7g2xlqmg3rrphysg"; depends=[lubridate parsedate]; }; mdsOpt = derive2 { name="mdsOpt"; version="0.4-1"; sha256="02na4hrv1id06gv2fwn8nxbddiz4bs4lgf3yzgxsca1k9qbsj99q"; depends=[animation clusterSim plotrix smacof smds spdep symbolicDA]; }; mdscore = derive2 { name="mdscore"; version="0.1-3"; sha256="10cl5r6kd9chdik5v0q91x40xpw2cjvvyi220z4bvngpb0989x8j"; depends=[MASS]; }; mdsdt = derive2 { name="mdsdt"; version="1.2"; sha256="0nbzc54jac4wmfyrs821ycxh749cb1zfxcws0nbpk35rydqkc627"; depends=[ellipse mnormt polycor]; }; @@ -9496,14 +9638,16 @@ in with self; { mdw = derive2 { name="mdw"; version="2017.12-03"; sha256="054vssnypbik0yf6smicggnkrqf6kx8k21nbf5rminsh00sx39k1"; depends=[]; }; meaRtools = derive2 { name="meaRtools"; version="1.0.4"; sha256="1nxyvdq4670696mhg0svxxlvk9hnr8szai8b18pw6754kmw1bjvn"; depends=[emdist ggplot2 gridExtra gtools lattice plyr Rcpp reshape2]; }; meanShiftR = derive2 { name="meanShiftR"; version="0.53"; sha256="1pla9hr9nbbnc3hcmk0ywfh6129zng5lp3dmjqb3cgdrmwkdrx9i"; depends=[]; }; - meanr = derive2 { name="meanr"; version="0.1-1"; sha256="080x21jnbsl6qlrgv12p9qd332ciph3lh18fgs9jagfyygf4f9hg"; depends=[]; }; + meanr = derive2 { name="meanr"; version="0.1-2"; sha256="0w9jgncbnf82x747pxrpbbbvajmksc1dq79cc4hxr2cpvqsqyfsh"; depends=[]; }; measuRing = derive2 { name="measuRing"; version="0.5"; sha256="0yblqkv5444y75jkb6d0zs728i6vybm294h7b5622pwfjqlfhnh2"; depends=[dplR pastecs png tiff]; }; measurements = derive2 { name="measurements"; version="1.4.0"; sha256="1kihavs9vgxwqjm9z1zjjngkmcwfsv8dg7nn9nrv5r06k5hv8bz6"; depends=[]; }; measures = derive2 { name="measures"; version="0.2"; sha256="1pp6nz30fbsqsvznim9j4vvz3z57sq5r234807flxfy0w7knydbd"; depends=[]; }; meboot = derive2 { name="meboot"; version="1.4-7"; sha256="1i0h71aj49hyj889447s611gz668ys7xlr1i82b5nvaf6chfbfin"; depends=[dynlm nlme]; }; + medExtractR = derive2 { name="medExtractR"; version="0.1"; sha256="08hzl5kk3jqs8vc53zrd1qj5g24dkpvwwvswqp57719c4ybi3ia3"; depends=[stringr]; }; mederrRank = derive2 { name="mederrRank"; version="0.0.8"; sha256="1fvvik3bhjm6c0mhi2ma915986k2nj3lr2839k5hfrr7dg3lw3f4"; depends=[BB numDeriv]; }; medfate = derive2 { name="medfate"; version="0.8.2"; sha256="0f86cpczzkpx8sy6krx970zy1fmsn93mjkm9mq00w2nw91kqjrh6"; depends=[ggplot2 GSIF meteoland Rcpp sp spdep]; }; medflex = derive2 { name="medflex"; version="0.6-6"; sha256="04cjqhyihxf1imbl9y9s58qpy6lmxsh2gwy4bras03hx52slzl5r"; depends=[boot car Matrix multcomp sandwich]; }; + mediacloudr = derive2 { name="mediacloudr"; version="0.1.0"; sha256="1r11mpz44msla71lqw45r9s8z7rwvbnqi026l0ljx6crby183h0w"; depends=[httr jsonlite rvest xml2]; }; mediation = derive2 { name="mediation"; version="4.4.7"; sha256="0nd4nli1qsvhgf404v1y16bc8q7axmpzyhbn38vncranb6lc235l"; depends=[Hmisc lme4 lpSolve MASS Matrix mvtnorm sandwich]; }; medicalrisk = derive2 { name="medicalrisk"; version="1.2"; sha256="1zdxv3rj7768kbyxfvr9n0hp4z7y0sf3r7ssqv731hjjp656l6xp"; depends=[hash plyr reshape2]; }; medicare = derive2 { name="medicare"; version="0.2.1"; sha256="00a1gml2khzisdavnaip6ap4bw45b17nbl9cqb1mqrm4y0p9gm16"; depends=[]; }; @@ -9529,19 +9673,20 @@ in with self; { memoria = derive2 { name="memoria"; version="1.0.0"; sha256="05nx6xkgf1mkn1ajjizwp66xhn7ddbvgdnmkdbcl4s7sq456vczw"; depends=[cowplot ggplot2 HH ranger stringr tidyr viridis viridisLite zoo]; }; memuse = derive2 { name="memuse"; version="4.0-0"; sha256="1g63nssxrgqgzw8qjz8202qpwhps8fbck6pn77j2wsc82dm73y7v"; depends=[]; }; mephas = derive2 { name="mephas"; version="1.0.0"; sha256="0338kr7hjbdrz2239lpyn3rplsg216hxvj532v80zrva0skrbzzf"; depends=[DescTools ggfortify ggplot2 gridExtra pastecs plotROC pls psych reshape Rmisc ROCR shiny spls stargazer survival survminer xtable]; }; - merDeriv = derive2 { name="merDeriv"; version="0.1-6"; sha256="1wjhzqg3riwf32lb775amm49azl5v1xg2hahigg6jkbg8zq0h92g"; depends=[lme4 Matrix nonnest2 sandwich]; }; + merDeriv = derive2 { name="merDeriv"; version="0.1-7"; sha256="0zvsbpz8v8bw458rvafw4cm8dwxbnvakm01ry3bxvq34hzg8ffg6"; depends=[lavaan lme4 Matrix nonnest2 sandwich]; }; merTools = derive2 { name="merTools"; version="0.5.0"; sha256="19qf3nn57hvd80x2l0m34w2jaky0jgsgc4nh0vdqjl8kpx4044cr"; depends=[abind arm blme broom dplyr foreach ggplot2 lme4 mvtnorm shiny]; }; + mergeTrees = derive2 { name="mergeTrees"; version="0.1.3"; sha256="17aqgfd1ky5zq6i9s1djvdqjdd8lzkblf0cdw82i9mpzfhcz1fav"; depends=[Rcpp]; }; mergedblocks = derive2 { name="mergedblocks"; version="1.0.0"; sha256="0g209f9vr5gjgsljnb6i8jr48azv982dbfc1anggfip82qivicqn"; depends=[randomizeR]; }; merlin = derive2 { name="merlin"; version="0.0.1"; sha256="14k8kz8icj3wgd3li83v0wfl61pdc97r7qjcsmmc5srp36kbw1i9"; depends=[MASS randtoolbox statmod survival]; }; merror = derive2 { name="merror"; version="2.0.2"; sha256="13d9r5r83zai8jnzxaz1ak40876aw20zbpr244gs55rvj5j7f87q"; depends=[]; }; messaging = derive2 { name="messaging"; version="0.1.0"; sha256="0q19cqp1zgh0yhk1ql0jqf414bhx6jwhkairq6wx2cmkli2g7k1y"; depends=[dplyr glue magrittr rlang stringr]; }; - metR = derive2 { name="metR"; version="0.3.0"; sha256="0dkmfrqdkl2f92kp94l10n0y9d29gn7ralgnpiry32w5c7ala1yy"; depends=[checkmate curl data_table digest dplyr fields Formula formula_tools ggplot2 gridExtra gtable lubridate maps maptools Matrix memoise plyr RCurl scales sp stringr]; }; + metR = derive2 { name="metR"; version="0.4.0"; sha256="1j4y2nn2r1i29h2invid8s695nv7b1lfanqspc281gjkrkns77ps"; depends=[checkmate curl data_table digest dplyr fields Formula formula_tools ggplot2 gridExtra gtable lubridate maps maptools Matrix memoise plyr purrr RCurl scales sp stringr]; }; metRology = derive2 { name="metRology"; version="0.9-28-1"; sha256="1syjwblyd18myxrs0hx4m91fgb6zs3r4g7w701j2f2pw6j9mvz0y"; depends=[MASS numDeriv robustbase]; }; metScanR = derive2 { name="metScanR"; version="1.2.2"; sha256="07j9y54z039gnrp8w6xi0xj4xzl8x2qjlzgf4nh9frmwqd6cld2i"; depends=[geosphere leaflet matlab plyr RCurl]; }; meta = derive2 { name="meta"; version="4.9-5"; sha256="1yk8akhxa6nzmj4y6q82jgyhfjdv5bz2x52ppp5jdrw61nmx4qc3"; depends=[lme4 metafor]; }; meta4diag = derive2 { name="meta4diag"; version="2.0.8"; sha256="1ila8x9r1rdmlwfpzfx1zj5yx1m4yrbhyb74db4wqbh1dswn7zsm"; depends=[caTools shiny shinyBS sp]; }; metaBLUE = derive2 { name="metaBLUE"; version="1.0.0"; sha256="0ppn4bvr10z32pghmv4wjv86k6n5y5bkfxc6h5mvb556v6jnl6d8"; depends=[Matrix]; }; - metaBMA = derive2 { name="metaBMA"; version="0.3.9"; sha256="14c3q4aw89r3apzm0ils886xsc6agbn8d2wgp47dc2ddwf5n8p58"; depends=[coda LaplacesDemon logspline mvtnorm runjags]; }; + metaBMA = derive2 { name="metaBMA"; version="0.6.1"; sha256="1m6q027hf3ysdjajv348x3cdwgxmf0x273swfpmg88h7p91xn1j7"; depends=[BH bridgesampling coda LaplacesDemon logspline mvtnorm Rcpp RcppEigen rstan rstantools StanHeaders]; }; metaDigitise = derive2 { name="metaDigitise"; version="1.0.0"; sha256="04hycv9dpy39l8fhql69mcn5w97f7sjxrhiz5vbpbawvfbkl0f0l"; depends=[magick purrr]; }; metaLik = derive2 { name="metaLik"; version="0.43.0"; sha256="1li40pgd9z00nrph9njwn6wysb1i9dkpqzcp6fzds6asvcxlqqfl"; depends=[]; }; metaMA = derive2 { name="metaMA"; version="3.1.2"; sha256="1mjyz06q1kc8lhfixpym4ndpnisi1r849fj3da6riwfd6ab1v181"; depends=[limma SMVar]; }; @@ -9551,10 +9696,11 @@ in with self; { metaSEM = derive2 { name="metaSEM"; version="1.2.2"; sha256="09riif6ia0si97zn8kcx23k40iyj38vfvli73y0044npymirz2sx"; depends=[ellipse lavaan MASS Matrix mvtnorm numDeriv OpenMx]; }; metaboGSE = derive2 { name="metaboGSE"; version="1.2.1"; sha256="169m59y2g3618rpjjlmwsj1alkfcjfhpsyzhz9010vn38bbwgmxr"; depends=[AnnotationDbi ape Matrix sybil sys topGO]; }; metacart = derive2 { name="metacart"; version="2.0-1"; sha256="1dv4vq3pxbmjg8xxjjxxqnl3njy4v7j20ha90sj1i2dd814y0r72"; depends=[ggplot2 gridExtra Rcpp rpart]; }; - metacoder = derive2 { name="metacoder"; version="0.3.2"; sha256="1vnrmcwzcbrkd9rp6rbzf5id5fk9hz958a1jz4znmnds35hv2sv6"; depends=[ape biomformat cowplot crayon dplyr GA ggfittext ggplot2 ggrepel igraph lazyeval magrittr phyloseq phylotate RColorBrewer Rcpp RCurl readr reshape reshape2 rlang scales seqinr stringr svglite taxa taxize tibble traits vegan viridisLite zoo]; }; + metacoder = derive2 { name="metacoder"; version="0.3.3"; sha256="0d7fpx5zpggc8k3y882mlw4szn7ghzckyiaxj9x652xink8zi397"; depends=[ape biomformat cowplot crayon dplyr GA ggfittext ggplot2 ggrepel igraph lazyeval magrittr phylotate RColorBrewer Rcpp RCurl readr reshape reshape2 rlang scales seqinr stringr svglite taxa taxize tibble traits vegan viridisLite zoo]; }; metacom = derive2 { name="metacom"; version="1.5.1"; sha256="18n3mbmjna3db44gscsdgv1j8f11jhikiw7yg3vbw2a9v5w3ypkv"; depends=[vegan]; }; metacor = derive2 { name="metacor"; version="1.0-2"; sha256="04k3ph0yg3jp8x4g6l1h4m0qwl51mx0626xmm0fzr1pv4b4a1ypw"; depends=[gsl rmeta]; }; - metadynminer = derive2 { name="metadynminer"; version="0.1.4"; sha256="06aricb1cp4sm56fr5skrxrs8ckccgq80rwbap7b0cp9y3sdgpcl"; depends=[Rcpp]; }; + metadynminer = derive2 { name="metadynminer"; version="0.1.5"; sha256="0lbhw29ymgp23cffn0qq451fngwqqsr9a9azx8qfwfjl40gh86j1"; depends=[Rcpp]; }; + metadynminer3d = derive2 { name="metadynminer3d"; version="0.0.1"; sha256="0riqr2hhk4h0rm7m4njb2dd2f24jff7lzf9chh83sq4q3wldgpz5"; depends=[metadynminer misc3d Rcpp rgl]; }; metafolio = derive2 { name="metafolio"; version="0.1.0"; sha256="18s78lljwnn3j0l3mqc0svszcb3c8yzyzlpnimndbiq9yxagxnnf"; depends=[colorspace MASS plyr Rcpp RcppArmadillo]; }; metafor = derive2 { name="metafor"; version="2.1-0"; sha256="009x5w163g4pbak23i5xw3ipk5s9xljkdj9py5vir3vpxxazk267"; depends=[Matrix nlme]; }; metaforest = derive2 { name="metaforest"; version="0.1.2"; sha256="0ppv9vdwxggccn2202snl13vid3v2kx5ps81cadghg2kcd8axfbs"; depends=[ggplot2 gtable metafor mmpf ranger]; }; @@ -9590,7 +9736,7 @@ in with self; { mev = derive2 { name="mev"; version="1.12"; sha256="1vq2l6znwagxs6h216lzf8x14656x192ylwvc5gr3b0y7ry0rqdf"; depends=[alabama boot evd nleqslv nloptr Rcpp RcppArmadillo TruncatedNormal]; }; mewAvg = derive2 { name="mewAvg"; version="0.3.0"; sha256="16gc78ccjffp9qgc7rs622jql54ij83ygvph3hz19wpk22m96glm"; depends=[]; }; mexhaz = derive2 { name="mexhaz"; version="1.6"; sha256="18gaji566hwfmpfznhlcvvk6f667vhadap3qcklpgddjaca2yc0v"; depends=[MASS numDeriv statmod survival]; }; - mfGARCH = derive2 { name="mfGARCH"; version="0.1.7"; sha256="086596dj6xz7by6rwddvyl7ap341q5hmpc6pslcjn0yvbc7j0wkh"; depends=[numDeriv Rcpp zoo]; }; + mfGARCH = derive2 { name="mfGARCH"; version="0.1.8"; sha256="1pzzn4s98fsyqkrldnpqgxg7ia60dikq73bbfn6xgc63gr6l78r2"; depends=[maxLik numDeriv Rcpp zoo]; }; mfbvar = derive2 { name="mfbvar"; version="0.4.0"; sha256="1bxfs7081nd7l0lknag2n184rd1d91cr5sgsnjsfwgdbws8sl8d3"; depends=[ggplot2 pbapply Rcpp RcppArmadillo]; }; mfe = derive2 { name="mfe"; version="0.1.2"; sha256="0vckvabk50zmrspjwc36g8l216rfcyc33ah1f4sg1nsi6g8i03k3"; depends=[cluster e1071 infotheo MASS rpart rrcov]; }; mfp = derive2 { name="mfp"; version="1.5.2"; sha256="1i90ggbyk2p1ym7xvbf4rhyl51kmfp6ibc1dnmphgw15wy56y97a"; depends=[survival]; }; @@ -9615,18 +9761,18 @@ in with self; { miRNAss = derive2 { name="miRNAss"; version="1.4"; sha256="0p852vyn44g84i4hzm7b02m5cxyqajnczx0s9x9373rn7fi6r98c"; depends=[CORElearn Matrix Rcpp RSpectra]; }; 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]; }; - miWQS = derive2 { name="miWQS"; version="0.0.9"; sha256="183r52ryi5171155ridfsjyznqhmnr0fzrzxvch7ylg4pjzwm0f3"; depends=[coda ggplot2 glm2 Hmisc invgamma rlist Rsolnp survival tidyr truncnorm]; }; + miWQS = derive2 { name="miWQS"; version="0.1.0"; sha256="03617f85zz09rlh6a8fsqry186d578w6vd1aybdjbpj3zi5y798j"; depends=[coda ggplot2 glm2 Hmisc invgamma MASS rlist Rsolnp survival tidyr truncnorm]; }; micEcon = derive2 { name="micEcon"; version="0.6-14"; sha256="1d3cdg36ighyhly5by9gl6lxkdvx2agb5cv2mf77pwwd7rpq35h3"; depends=[miscTools plm]; }; micEconAids = derive2 { name="micEconAids"; version="0.6-18"; sha256="0s2gkf6widdnxqqb1xjqdvji8vhdz5a4q05clbbbyq1h409q7qvl"; depends=[lmtest micEcon miscTools systemfit]; }; micEconCES = derive2 { name="micEconCES"; version="0.9-8"; sha256="06g6z8hf7y9d942w6gya0fd5aidzfjkx3280gjygdlwpv7nlpqzv"; depends=[car DEoptim micEcon minpack_lm miscTools systemfit]; }; micEconIndex = derive2 { name="micEconIndex"; version="0.1-6"; sha256="1ihly6qpyg1pms4nkvs6khxxqwr3fwg57i8pg0yhyy1apqxyj2xl"; depends=[miscTools]; }; micEconSNQP = derive2 { name="micEconSNQP"; version="0.6-6"; sha256="1n3pxapc90iz1w3plaqflayd0b1jqd65yw5nbbm9xz0ih132dby9"; depends=[MASS miscTools systemfit]; }; micar = derive2 { name="micar"; version="1.1.1"; sha256="09vpijva39fwpvdpfglwr3xmz469pnmz371ms7z5av6w2193ls5n"; depends=[httr jsonlite]; }; - mice = derive2 { name="mice"; version="3.5.0"; sha256="0icydc312sbvzbp0r0mhs2r77a2ly2xvz5w5amirz3wdkvgyrk2g"; depends=[broom dplyr lattice MASS mitml nnet Rcpp rlang rpart survival]; }; + mice = derive2 { name="mice"; version="3.6.0"; sha256="0pgcxdmp77604h6f4x8hhs6j4xdjgf5b9zvnixyzdj8vcgdjpivv"; depends=[broom dplyr lattice MASS mitml nnet Rcpp rlang rpart survival]; }; miceFast = derive2 { name="miceFast"; version="0.2.3"; sha256="0ngb2qs71x0i8ffyb1qlbz2wk6c87m1r74l547c5pc9agnc227m0"; depends=[Rcpp RcppArmadillo]; }; miceMNAR = derive2 { name="miceMNAR"; version="1.0.2"; sha256="1s607icaf3c25mn8xdi3zkzmm8m7qd9a6vjdlz5j7ig2gc9f2y2d"; depends=[GJRM mice mvtnorm pbivnorm sampleSelection]; }; miceadds = derive2 { name="miceadds"; version="3.4-17"; sha256="1yf6shdgz9hbz37y9hz5zbg17m5cd79ik49nwr6sb6ml8lxxi0s9"; depends=[mice mitools Rcpp RcppArmadillo]; }; - micemd = derive2 { name="micemd"; version="1.5.0"; sha256="1bzy9lxgdvfrq3mhhx734aykpcr3klnwns70whz54y6afmcz7ghp"; depends=[abind digest jomo lme4 MASS Matrix mice mvmeta mvtnorm nlme]; }; + micemd = derive2 { name="micemd"; version="1.6.0"; sha256="1n8kzdf2713dw9mbzvbwl0gknzi9amdqnabfw2wmb70gsvma3f48"; depends=[abind digest jomo lme4 MASS Matrix mice mvmeta mvtnorm nlme]; }; michelRodange = derive2 { name="michelRodange"; version="1.0.0"; sha256="1pykqb9hmpvn77k0vhfh36iyhamz9h5kpswq3ql31h9nknfy3ixi"; depends=[magrittr]; }; micompr = derive2 { name="micompr"; version="1.1.0"; sha256="0qsxs35mmqx8hpszcb1z87xczh0vh0m0plqrj22af5mjjvif76n9"; depends=[]; }; microPop = derive2 { name="microPop"; version="1.4.1"; sha256="1xm1yfdbv0kp0dvk4dhjrr2rjydpnh13vm5kfzyj39rwpmrrim3f"; depends=[deSolve]; }; @@ -9640,7 +9786,7 @@ in with self; { micropan = derive2 { name="micropan"; version="1.2"; sha256="1b3hd5c6l9njns372zhqfryibrpqmrjxmc1p5gzdwm7450cs7qky"; depends=[BH igraph microseq Rcpp]; }; microplot = derive2 { name="microplot"; version="1.0-42"; sha256="062dd4k6ryyl44lwbc2qgdsfcs1fiv9j2n6lx9driw6vng533b6q"; depends=[cowplot flextable ggplot2 HH Hmisc htmltools lattice officer]; }; microsamplingDesign = derive2 { name="microsamplingDesign"; version="1.0.6"; sha256="093rldfx3b45j4qn0r42d7fmqzx4h43s6vq4zlysdimq4ncxdm3v"; depends=[abind deSolve devtools ggplot2 gridExtra gtools knitr MASS matrixcalc matrixStats plyr Rcpp RcppArmadillo readr reshape2 shiny stringr]; }; - microseq = derive2 { name="microseq"; version="1.2.2"; sha256="1h828iviraqrm43lhd0s3r7rdlakc6yfc6ngrcrkacpflfcmx3c7"; depends=[Rcpp]; }; + microseq = derive2 { name="microseq"; version="1.2.3"; sha256="1cpgnl3y1v5pwh333lkg7igh3qgga0mhmhc8vdb7gw0k5gzh7gzp"; depends=[Rcpp]; }; microsynth = derive2 { name="microsynth"; version="2.0.13"; sha256="1ijv7kbxl087m0wzdbzl9p74116dfwid03dlamy4b1l308azc4ag"; depends=[boot kernlab LowRankQP MASS nleqslv pracma survey]; }; midas = derive2 { name="midas"; version="1.0.1"; sha256="1alqxk23651jnkg0xn4rpvk71z5rhvx3y0wjrgkw2qw95s7jjn72"; depends=[shiny xml2]; }; midasr = derive2 { name="midasr"; version="0.7"; sha256="02kjyzbznmy0362ambnnh8vc7ywbgikk3n7705sww9p0k0pywrrx"; depends=[forecast Formula MASS Matrix numDeriv optimx quantreg sandwich texreg zoo]; }; @@ -9656,9 +9802,9 @@ in with self; { mimsy = derive2 { name="mimsy"; version="0.4.2"; sha256="0f2yy5s9dxl8k12lrnc0w5d8vl0c9by0zc7gv05a2sq5jl7zrr8j"; depends=[dplyr lubridate magrittr openxlsx]; }; mindr = derive2 { name="mindr"; version="1.2.2"; sha256="1ggpdjyjaprw03gjqk34h7k4h3cdxrwmwvjg5sdqdp0pya6ik03y"; depends=[data_tree htmlwidgets jsonlite knitr]; }; mineCitrus = derive2 { name="mineCitrus"; version="1.0.0"; sha256="031nfhrsc5rlqls3vyrk18lx0pd4ssdk96cmfr4ifaciz0rgv8h2"; depends=[ggplot2]; }; - mined = derive2 { name="mined"; version="1.0-1"; sha256="09jcyzirc4f69g4n5490pwrjqbdd40fwn8liy0xarlf7cnqqnzzk"; depends=[Rcpp RcppEigen]; }; + mined = derive2 { name="mined"; version="1.0-2"; sha256="1py6gylya8dhmxcyfrcwbwc5q226m041rs3cmj4q0dhqy8iy2zsw"; depends=[Rcpp RcppEigen]; }; minerva = derive2 { name="minerva"; version="1.5.8"; sha256="0k4ww3qfqrsnkccxk9dyq39xrc42g8gvj5g8drglg4fyci7jfs9h"; depends=[Rcpp RcppArmadillo]; }; - miniCRAN = derive2 { name="miniCRAN"; version="0.2.11"; sha256="1ffc367ipcxyk2a8f2y46xa01rbr5254cryf1qzzfflb3xj8n6pa"; depends=[httr igraph XML]; }; + miniCRAN = derive2 { name="miniCRAN"; version="0.2.12"; sha256="1jyrx86y8qdb3xdfpj812k0v492z3i6dnwy761qslwmn15xx8845"; depends=[assertthat httr igraph XML]; }; miniGUI = derive2 { name="miniGUI"; version="0.8-1"; sha256="0qb2fbkjwzn909yrk89d4951bwf8n05i0s265l8v2d4lpns9hc2i"; depends=[]; }; miniUI = derive2 { name="miniUI"; version="0.1.1.1"; sha256="1h5h2sc57h95d6bsgs95l26911g38hvjc1v50bc31xl9689l2as5"; depends=[htmltools shiny]; }; minimalRSD = derive2 { name="minimalRSD"; version="1.0.0"; sha256="1p1jpi8lnv952k4c1wjgbgpb0hv4zg0f9qrd43cx0caibkqvhzf7"; depends=[]; }; @@ -9672,6 +9818,7 @@ in with self; { minval = derive2 { name="minval"; version="0.8-1"; sha256="11sr69hmqnh5g2zbfajy3wqc57759basky1w72dnrd38rq50llxs"; depends=[]; }; minxent = derive2 { name="minxent"; version="0.01"; sha256="1a0kak4ff1mnpvc9arr3sihp4adialnxxyaacdgmwpw61wgcir7h"; depends=[]; }; mipfp = derive2 { name="mipfp"; version="3.2.1"; sha256="1gxazpg81vj5dywpb6jb29188jw28qil6pfygawa7znnjn3k5ca6"; depends=[cmm numDeriv Rsolnp]; }; + mipred = derive2 { name="mipred"; version="0.0.1"; sha256="0kijn2xj0dh28rm2sjgd8j1a3c5avc3fjfvvcmzfasvxqdjflv6j"; depends=[mice]; }; mirt = derive2 { name="mirt"; version="1.30"; sha256="1j4l7hnx2rj6nixs7ylcvc7d24wbj1mfs9fccsyhzrrwadn6drvq"; depends=[dcurver Deriv GPArotation lattice mgcv Rcpp RcppArmadillo vegan]; }; mirtCAT = derive2 { name="mirtCAT"; version="1.9.3"; sha256="1yd03rkviqxl9rsqnny3fgn2rj0hss49nav11b9w4np8lv9zkwgh"; depends=[lattice lpSolve markdown mirt pbapply Rcpp RcppArmadillo shiny]; }; mirtjml = derive2 { name="mirtjml"; version="1.2"; sha256="0vjcbgl1s8haqc0xi4k8dsqvhr2qyz4ikhjwmqrxyl5xssjy330r"; depends=[GPArotation Rcpp RcppArmadillo]; }; @@ -9694,7 +9841,7 @@ in with self; { missSBM = derive2 { name="missSBM"; version="0.2.0"; sha256="0lszypzz0qdp1jw7l9i3gajzmk54acai32w4xbxqcc6pi4q057r6"; depends=[ape corrplot igraph magrittr nloptr R6 Rcpp RcppArmadillo]; }; missingHE = derive2 { name="missingHE"; version="1.1.1"; sha256="02k2n5kap5n1zhzjv7y2dd5hrxh979ha5w66hixlhylhc1ar0w20"; depends=[BCEA coda ggmcmc ggplot2 ggthemes gridExtra loo mcmcplots mcmcr R2jags]; }; mistat = derive2 { name="mistat"; version="1.0-5"; sha256="1vyx918b7iv1wcnk23bnlxljwy0hglpdx5drhrs5qcd45f6jrghc"; depends=[]; }; - mistr = derive2 { name="mistr"; version="0.0.1"; sha256="06y01kd11gyysyh57gi6gxamacwxwjpdj83xn63wa9az8ncl3y8s"; depends=[bbmle]; }; + mistr = derive2 { name="mistr"; version="0.0.2"; sha256="12zh6ys3lfc5ylidjhbmbxvbhjd3rg9vd89pv94547z9y1yf6sx5"; depends=[bbmle]; }; mistral = derive2 { name="mistral"; version="2.1.0"; sha256="1cr79p8q82lpj9d0y6q24xmfkxmnlqv8ivkd0baj7fxfb1nb8sak"; depends=[DiceKriging doParallel e1071 emoa foreach ggplot2 iterators Matrix mvtnorm quadprog]; }; mitml = derive2 { name="mitml"; version="0.3-7"; sha256="0yqyxkyi1kmv5k63wxj5kkg5g8igk1axk2csb4xhj6wz0p89dxy6"; depends=[haven jomo pan]; }; mitools = derive2 { name="mitools"; version="2.4"; sha256="0c2x2n1p53lcw0vx4vmy5j7m2f95i7g2iwbryl89imr99rvz617j"; depends=[DBI]; }; @@ -9716,6 +9863,7 @@ in with self; { mixggm = derive2 { name="mixggm"; version="1.0"; sha256="1wiiayld7rwp3mwz93zizrv0dzw02mqrzprc4z6c4jj25c8pypw5"; depends=[foreach GA mclust memoise network Rcpp RcppArmadillo]; }; mixlink = derive2 { name="mixlink"; version="0.1.5"; sha256="0ywgrcplhspc0x5fniw52xqz20y7j9mwgy4ky8lv3vii659mr52m"; depends=[mvtnorm numDeriv Rcpp RcppGSL]; }; mixlm = derive2 { name="mixlm"; version="1.2.3"; sha256="0i7nrn31yaicdpwfssnid1x8w51iv17lcl96zfr1pgrf97d7gkqd"; depends=[car leaps multcomp pls pracma]; }; + mixmeta = derive2 { name="mixmeta"; version="0.2.2"; sha256="1h52pmybammhhr15sl0jkm5n83rsyy1km4g4rpwry1mxrxc4ql1v"; depends=[]; }; mixor = derive2 { name="mixor"; version="1.0.4"; sha256="1l296z0a3kamb1m94pfx3vczp36pa0np101fy5c23kh45s59pbs7"; depends=[survival]; }; mixreg = derive2 { name="mixreg"; version="0.0-6"; sha256="04g863yxrlj0wqsmzzxph5110g3gjk094r59zzk0b9r89m8vhpsl"; depends=[]; }; mixsep = derive2 { name="mixsep"; version="0.2.1-2"; sha256="1ywwag02wbx3pkd7h0j9aab44bdmwsaaz0p2pcqn1fs3cpw35wa2"; depends=[MASS RODBC tcltk2]; }; @@ -9725,10 +9873,10 @@ in with self; { mixtools = derive2 { name="mixtools"; version="1.1.0"; sha256="13wdm0xs5bakhpa8ypg6lvhjaqkxyabwz4glxdwn0jwdvkcdhgsl"; depends=[MASS segmented survival]; }; mixtox = derive2 { name="mixtox"; version="1.3.2"; sha256="0mdnp1yrcxvan5l7jj91s41vq5y1kdnkhhinqrklmg4ph5f29dmq"; depends=[minpack_lm]; }; mixture = derive2 { name="mixture"; version="1.5"; sha256="1ahr8jw93xnd5hmy3h4sr209ql7gmkwbvnnfmiplbpc17czqgcn4"; depends=[]; }; - mize = derive2 { name="mize"; version="0.2.1"; sha256="13w5wpszbmzv7ah3rays4j9qj36v5f5mnss1g3g9cqyz7phgsrv8"; depends=[]; }; + mize = derive2 { name="mize"; version="0.2.2"; sha256="1p728svnj5ckixry6xw70nywqabmgdcygdsa6dvpicr2s4sffn86"; depends=[]; }; mizer = derive2 { name="mizer"; version="1.0.1"; sha256="1vn03f3j9vd8hwz18i67blif33y3cd7hc8m1h4aw7wkgdpqsyb4b"; depends=[deSolve ggplot2 plyr progress Rcpp reshape2]; }; mkde = derive2 { name="mkde"; version="0.1"; sha256="04v84arpnmjrkk88ffphnhkz32x7y0dypk75jfmbbgcgv59xlglv"; depends=[raster Rcpp sp]; }; - mkin = derive2 { name="mkin"; version="0.9.48.1"; sha256="1ic4irspvga4vpqrvsjr6rlkl2rqqlp8w404zaa5ad19va9040vd"; depends=[deSolve FME inline minpack_lm plyr R6 rootSolve]; }; + mkin = derive2 { name="mkin"; version="0.9.49.5"; sha256="1q4j9krbrvr74pla33vn7piqcpz4bx53hqc6jk26qv9d5q4yh5xw"; depends=[deSolve inline numDeriv plyr R6]; }; mknapsack = derive2 { name="mknapsack"; version="0.1.0"; sha256="1kzmx7d512681a4hjirfgcd7a8rvndb4da66p16gms5nnxzsby9c"; depends=[assertthat data_table lpSolve]; }; mkssd = derive2 { name="mkssd"; version="1.1"; sha256="1qqzy6fn6sc3lxahc19hzzf1hzxsyvxqi7npynw0vkknlrvh2ijp"; depends=[]; }; mlDNA = derive2 { name="mlDNA"; version="1.1"; sha256="0d9lydiwar98hin26slnym4svn0g1xmyn212vvzsx9lzlvs5a9k4"; depends=[e1071 igraph pROC randomForest ROCR rsgcc snowfall]; }; @@ -9747,18 +9895,22 @@ in with self; { mlergm = derive2 { name="mlergm"; version="0.2"; sha256="1naapdm8lbqsjgdr2whs36w8jk432mhnki3cvi55abj3v16y94sl"; depends=[cowplot ergm GGally ggplot2 Matrix network plyr reshape2 sna stringr]; }; mleur = derive2 { name="mleur"; version="1.0-6"; sha256="0mddphq3b6y2jaafaa9y41842kcaqdl3dh7j4pva55q2vcjcclj7"; depends=[fGarch lattice stabledist urca]; }; mlf = derive2 { name="mlf"; version="1.2.1"; sha256="09ihnibpknpp26hdlbxyr99yz7z0n8qpsjs5aq3zngng0yh3wdn9"; depends=[]; }; - mlflow = derive2 { name="mlflow"; version="1.0.0"; sha256="1lk549hxywfk6mnp0qcnhyy3kh7q022hydhi648xag11dh04qh4c"; depends=[base64enc forge fs git2r glue httpuv httr ini jsonlite openssl processx purrr reticulate rlang swagger tibble withr xml2 yaml zeallot]; }; + mlflow = derive2 { name="mlflow"; version="1.1.0"; sha256="04vr3viipyh6fdv9rg8hzwmynzjc75gyzz81fvkqqgkmlfnc9yrv"; depends=[base64enc forge fs git2r glue httpuv httr ini jsonlite openssl processx purrr reticulate rlang swagger tibble withr xml2 yaml zeallot]; }; mlgt = derive2 { name="mlgt"; version="0.16"; sha256="1nvdq6mvgr39ikkf73aggsb6pmbw132injj8fdkr8hgcmwm6lgd9"; depends=[seqinr]; }; mlica2 = derive2 { name="mlica2"; version="2.1"; sha256="0c3m1zd9x99n6lw12hfzmd59355z51xa8rhg1h7qwfn9p86r826f"; depends=[]; }; mljar = derive2 { name="mljar"; version="0.1.1"; sha256="1mw45aqjwklsnrfwf8656jf30miyrlxpz87z97nkv9i135yhwfx3"; depends=[httr jsonlite readr]; }; mlmRev = derive2 { name="mlmRev"; version="1.0-7"; sha256="0gj7yk2gll6y99q4h6ggds37fcww8d326h44rygcl155y0482rky"; depends=[lme4]; }; mlma = derive2 { name="mlma"; version="4.0-1"; sha256="0pk2h4m74r95dfkqzliixi6z1rwdfc6gbz8c3162y22m919f00vc"; depends=[car gplots lme4]; }; mlmc = derive2 { name="mlmc"; version="1.0.0"; sha256="01h7w0ajyg3bccynlpbi3yjpy089wczbfbajpg6yw5v4dppw7k7a"; depends=[ggplot2 Rcpp]; }; + mlmi = derive2 { name="mlmi"; version="1.0.0"; sha256="08sm836y40af3jd5gcl5pnyv1gqpx4ngkkw4xfp82h1j4yk47sy5"; depends=[cat gsl MASS Matrix mix norm]; }; mlmm_gwas = derive2 { name="mlmm.gwas"; version="1.0.5"; sha256="0px6pc7mkfzbbymv5qj9m6nnppbpgpanpy7y6jf7xl8gv3hwip32"; depends=[coxme Matrix multcomp multcompView sommer]; }; mlmmm = derive2 { name="mlmmm"; version="0.3-1.2"; sha256="1m5ziiqs3ll1xjm1yf7x4sdc910jypn3kjnbadf95xxkvqmfrsqq"; depends=[]; }; - mlogit = derive2 { name="mlogit"; version="0.4-2"; sha256="1ihamg9fm58nxmvhkhwi5v9ll9jspj5w5ahdsdh5pbdrk1hlzbqf"; depends=[Formula lmtest MASS Rdpack statmod zoo]; }; + mlogit = derive2 { name="mlogit"; version="1.0-1"; sha256="1cjh0dl0yvzyz5wsplygm4al2zfvs7cgdg5fhbcjnv159qfvflml"; depends=[Formula lmtest MASS Rdpack statmod zoo]; }; mlogitBMA = derive2 { name="mlogitBMA"; version="0.1-6"; sha256="1wl8ljh6rr1wx7dxmd1rq5wjbpz3426z8dpg7pkf1x9wr94a2q25"; depends=[abind BMA maxLik]; }; mlr = derive2 { name="mlr"; version="2.14.0"; sha256="0jlldr44x3a3l1dxy077ila512s45b4w95s2qk3qd0v70121hwhz"; depends=[backports BBmisc checkmate data_table ggplot2 parallelMap ParamHelpers stringi survival XML]; }; + mlr3 = derive2 { name="mlr3"; version="0.1.1"; sha256="18yqjdg4a3lknic0pzg5xqa5h5nvaz4zh2g27k4fvg2d3v9b90jm"; depends=[backports checkmate data_table digest lgr Metrics mlbench mlr3misc paradox R6]; }; + mlr3db = derive2 { name="mlr3db"; version="0.1.1"; sha256="0453q5a4a2nzpglim5lmbk2c2a6i95ww5hp2z28iv12xrli5sw72"; depends=[checkmate data_table digest dplyr mlr3 R6]; }; + mlr3misc = derive2 { name="mlr3misc"; version="0.1.1"; sha256="0q4vr1gh0na02n22n4zijyf6zhg70nck1ly2k6i51hk9dncy815m"; depends=[backports checkmate data_table R6]; }; mlrCPO = derive2 { name="mlrCPO"; version="0.3.4-3"; sha256="1446xv4qawyhxi76wp6dfq3xjrmh6gzky4nbcs36zr18zis3ipyz"; depends=[backports BBmisc checkmate mlr ParamHelpers stringi]; }; mlrMBO = derive2 { name="mlrMBO"; version="1.1.2"; sha256="1ziyiycgwr4vgilji8dkf1c0kyqjnbmqi3qj35q3si2xbnmcm14f"; depends=[backports BBmisc checkmate data_table lhs mlr parallelMap ParamHelpers smoof]; }; mlsjunkgen = derive2 { name="mlsjunkgen"; version="0.1.1"; sha256="109ag52x4y3rzx8yccilrnl24mz4ximzx6v4lrbak7dpiclqrw7a"; depends=[]; }; @@ -9778,7 +9930,7 @@ in with self; { mme = derive2 { name="mme"; version="0.1-6"; sha256="1k60y1yrf7fv939v32kf3il7r3cws0kih4bpm0ap28fvbx3vr3yb"; depends=[MASS Matrix]; }; mmeln = derive2 { name="mmeln"; version="1.3"; sha256="0hx59pizd6sgryca7g26n2wa5rdi3zd059w7yz66981p6mi4a5dk"; depends=[]; }; mmeta = derive2 { name="mmeta"; version="2.3"; sha256="0hyxpph2hfjwiy95r0n3h64aab5ziqp2a8gmmpp6nyc77h638czb"; depends=[aod]; }; - mmetrics = derive2 { name="mmetrics"; version="0.2.0"; sha256="02pnnmymgaaqh07ya6js50lnfcgags6kz3cdqlqlqqjnk1q6v8qi"; depends=[dplyr magrittr purrr rlang stringr]; }; + mmetrics = derive2 { name="mmetrics"; version="0.3.0"; sha256="0g2bpsywcly2nz59vjxb3v5jdxq76wvv8iwyv5fqs8n78r208kxd"; depends=[dplyr ggplot2 magrittr purrr rlang stringr]; }; mmm = derive2 { name="mmm"; version="1.4"; sha256="1nydian004nldqhyw3x15w6qfml2gkjc0x8ii54faz563byjv3d8"; depends=[gee]; }; mmm2 = derive2 { name="mmm2"; version="1.2"; sha256="1h9pn5s3jjs4bydrr1qysjb4hv7vs4h3m7mvi22ggs2dzyz3b298"; depends=[gee]; }; mmmgee = derive2 { name="mmmgee"; version="1.20"; sha256="0y3pwnc9h7y2l9cvgfl62nl1vnnkla2y8082jhdvxsb3mk88rgad"; depends=[Matrix mvtnorm]; }; @@ -9794,8 +9946,8 @@ in with self; { mnlogit = derive2 { name="mnlogit"; version="1.2.6"; sha256="0dfwpkl8g7ap5xr48smiv8vdbamd2r1liy9nwpsn0kcsr9cj65n9"; depends=[Formula lmtest mlogit]; }; mnormpow = derive2 { name="mnormpow"; version="0.1.1"; sha256="0z53vwhkhkkr6zrjhd3yr14mb02vh7lr63frf0ivajndxiap0s9v"; depends=[]; }; mnormt = derive2 { name="mnormt"; version="1.5-5"; sha256="1b34xxrnf35khsx82mhvmk96sgfr2flyasaah7qkb2976pwxay7z"; depends=[]; }; - mnreadR = derive2 { name="mnreadR"; version="2.1.2"; sha256="1kc55rwq1lg6ngmia0hjim5ki7aif71754whvh4nz252qq0j8w3b"; depends=[dplyr ggplot2 nlme tibble tidyr]; }; - mobForest = derive2 { name="mobForest"; version="1.3.0"; sha256="0gzn3lyi9ph5dcrfbw4xs4rkf5ngf28abf1n8vap96fdhc6nmg88"; depends=[modeltools party sandwich strucchange zoo]; }; + mnreadR = derive2 { name="mnreadR"; version="2.1.3"; sha256="1vyri8kd5afr1hdy7lxh0bsb6zxkz4hcb0q6a8m4mmrizqav6v1q"; depends=[dplyr ggplot2 nlme tibble tidyr]; }; + mobForest = derive2 { name="mobForest"; version="1.3.1"; sha256="1g5yfs70abl7pacprijlwdq3l72aqkbqs09z1pmw64wv4wa1vm25"; depends=[modeltools party sandwich strucchange zoo]; }; mobsim = derive2 { name="mobsim"; version="0.1.0"; sha256="077hw1162giwc90y5dvj9052i5hxdf2ii29m9q8ky028375dsd0f"; depends=[Rcpp sads vegan]; }; moc = derive2 { name="moc"; version="2.0"; sha256="0fgp8dg9qf7aw1qawmszlxs4bcccqmd87y4kkzdqggm807c2k5gh"; depends=[]; }; moc_gapbk = derive2 { name="moc.gapbk"; version="0.1.0"; sha256="0gg64srdb17dx712hilnlrii9i5vi9vjrk17acaynaz307akdw08"; depends=[amap doMPI doParallel doSNOW fields foreach matrixStats mco miscTools nsga2R plyr reshape2 Rmisc]; }; @@ -9808,19 +9960,21 @@ in with self; { modTempEff = derive2 { name="modTempEff"; version="1.5.2"; sha256="00xdvc0i3p8wq913giy44w0xz07sa4bdgqpi7pmpbv2c5wj30pk1"; depends=[mgcv]; }; modTurPoint = derive2 { name="modTurPoint"; version="0.1.0"; sha256="1m24vsi80ln1r7sr40pipaaanyc60yfxmjzf8l7nfy3yvyr8zqpn"; depends=[]; }; modcmfitr = derive2 { name="modcmfitr"; version="0.1.0"; sha256="1d6fi7pc10w2a97h1prhkg5cvzmxjp11c5bwrz90zry0m8anwjyh"; depends=[gtools nloptr]; }; + modeLLtest = derive2 { name="modeLLtest"; version="1.0.0"; sha256="1f80bgw1l6zgwlhz1agdrl5d44jfrk50yi3jgwf14l4zjx8x8rp3"; depends=[coxrobust MASS quantreg Rcpp RcppArmadillo survival]; }; modeest = derive2 { name="modeest"; version="2.3.3"; sha256="1y9kzi0hhpm97a38z8c6dkma1wyhx15sfmqmlxcbs8dmlyibbjin"; depends=[bazar fBasics genefilter stable stabledist statip]; }; modehunt = derive2 { name="modehunt"; version="1.0.7"; sha256="0qz9kmf1qfs2dr7kzm9l7ac0h5rvi3b9j9896p991sk4bcalsl0b"; depends=[]; }; model4you = derive2 { name="model4you"; version="0.9-3"; sha256="03s87dklil69znflny9vcl934yisfb13d0gdk94279cb4hb693c0"; depends=[Formula ggplot2 gridExtra partykit sandwich survival]; }; modelDown = derive2 { name="modelDown"; version="1.0.1"; sha256="0rdpma8g461a17n6qsdvjb9s5nnhap1n05mavjy8cpj7d8j7ikkv"; depends=[archivist auditor breakDown DALEX devtools drifter DT ggplot2 kableExtra psych svglite whisker]; }; modelObj = derive2 { name="modelObj"; version="4.0"; sha256="1py2y80x37mmnl2y0pxdbhqkjrln6x210hg0g224d34lxk71m172"; depends=[]; }; - modeldb = derive2 { name="modeldb"; version="0.1.2"; sha256="000dpxbsp5phncpcbrj6xg2kqa3s8frvbm1zrfn77j4mfrpjyybl"; depends=[dplyr ggplot2 progress purrr rlang tibble]; }; + modeldb = derive2 { name="modeldb"; version="0.2.0"; sha256="1qcgmv31gd1x0mzxq4lcarmswsr75qgq5zpfcwchxzrz97ncbwgd"; depends=[dplyr ggplot2 progress purrr rlang tibble tidypredict]; }; modelfree = derive2 { name="modelfree"; version="1.1-1"; sha256="0ammka2wxx90z31zfzypw9dk5n118l0vxhykxbx6srfig2vdyn82"; depends=[PolynomF SparseM]; }; modelgrid = derive2 { name="modelgrid"; version="1.1.1.0"; sha256="1z6g0akczry7vldkk6anfq572zbsfzbd6qnyllgjpbxhy3rrrq0r"; depends=[caret dplyr ggplot2 lattice magrittr purrr]; }; modelplotr = derive2 { name="modelplotr"; version="1.0.0"; sha256="1b1pcah28b2fsr5l7v3lwxgvl03jr2cyxk5x5plnc3vwy5g0bnpm"; depends=[dplyr ggfittext ggplot2 gridExtra magrittr RColorBrewer rlang scales]; }; modelr = derive2 { name="modelr"; version="0.1.4"; sha256="1ngxphbjkv7yl1rg30sj36mfwhc76g452drjrq9abgab4k0pgnml"; depends=[broom dplyr magrittr purrr rlang tibble tidyr]; }; + modelsummary = derive2 { name="modelsummary"; version="0.1.0"; sha256="1g6yc89q267zjplqpwiy6wwvdswyhr6lhg2sldm8zhmbm81jcvks"; depends=[broom checkmate dplyr generics magrittr purrr stringr tibble tidyr]; }; modeltools = derive2 { name="modeltools"; version="0.2-22"; sha256="1s9lmkac3rl0nknf4wizfhg7ryq7c8yvvyc4z619238br27hhsi5"; depends=[]; }; modelwordcloud = derive2 { name="modelwordcloud"; version="0.1"; sha256="0ardib0h923i7jk8bgcq6pn2zazx9acf9sdggifsk46hdz8hvqnm"; depends=[]; }; - moderndive = derive2 { name="moderndive"; version="0.2.0"; sha256="165dll1bkjmd949mwy165hrz22ajbkn3ap5l8f8pqwksw78rsgqb"; depends=[assertive broom dplyr formula_tools infer janitor knitr magrittr rlang stringr tibble]; }; + moderndive = derive2 { name="moderndive"; version="0.3.0"; sha256="0ww435flspm4yi25v9nh2cdn9bpnwjxdz4fg3cny1c4djs2bzgz2"; depends=[broom dplyr formula_tools ggplot2 glue infer janitor knitr magrittr rlang stringr tibble]; }; modes = derive2 { name="modes"; version="0.7.0"; sha256="185qjrmz2sj0l5931g4d3kx3jpgjn4rf4lln84h6g97prk1ykqmj"; depends=[]; }; modest = derive2 { name="modest"; version="0.3-1"; sha256="07rs014hdcabp2n0gg14pz2gmqgbw38vjv7a80vkzzh3601hxqws"; depends=[knitr rhandsontable shiny shinyBS]; }; modesto = derive2 { name="modesto"; version="0.1.2"; sha256="0vmdj8wcy0vv9jaihxrj0m5sr7favz18ngfqc8pd8rd4ipcnxkjf"; depends=[markovchain]; }; @@ -9858,7 +10012,8 @@ in with self; { morgenstemning = derive2 { name="morgenstemning"; version="1.0"; sha256="17y90cf8ajmkfwla0hm4jgkbkd1mxnym63ph2468sfxkhn0r3v88"; depends=[]; }; morpheus = derive2 { name="morpheus"; version="0.2-0"; sha256="07gk05qpabbg96svgnp2m9sw3fxsh2mgfwyda423c03yhxn1pnsm"; depends=[jointDiag MASS pracma]; }; morse = derive2 { name="morse"; version="3.2.4"; sha256="0iar2lj2czdgpvmrdx0y98frh452nr4v2m4zmmrs9jr6by46d6nj"; depends=[coda deSolve dplyr epitools ggplot2 gridExtra magrittr reshape2 rjags tibble tidyr zoo]; }; - mortAAR = derive2 { name="mortAAR"; version="1.0.1"; sha256="1dgxx5sh0nskzbigr8yq389lsnalp45d6m92q6g07jpqm7nzbazd"; depends=[magrittr Rdpack reshape2]; }; + mortAAR = derive2 { name="mortAAR"; version="1.0.2"; sha256="047xagjmqj6sla0zlz0ljdivggkv04i45yn7637a33ni1pmb83al"; depends=[magrittr Rdpack reshape2]; }; + mortyr = derive2 { name="mortyr"; version="0.0.1"; sha256="1mpgb9rcknghwm9xsn3d8s6fy4j319sinb6l76s8aq06n4f3hr7g"; depends=[httr jsonlite tibble]; }; mosaic = derive2 { name="mosaic"; version="1.5.0"; sha256="1j3dq8y2zpr3cad5pgbd3qm9ls17z0s6f9qqp5ddh110wf5kz0h4"; depends=[broom dplyr ggdendro ggformula ggplot2 ggrepel glue gridExtra lattice latticeExtra lazyeval leaflet MASS Matrix mosaicCore mosaicData readr tidyr]; }; mosaicCalc = derive2 { name="mosaicCalc"; version="0.5.0"; sha256="05s14rmgi15xcz50hcz7l26l95yx9g4i3kihzh0laz8bpi443i39"; depends=[MASS mosaic mosaicCore]; }; mosaicCore = derive2 { name="mosaicCore"; version="0.6.0"; sha256="1klw97h6lchw1cpcl8s637ikcl428cckmjq0czi7mibh9q9mw72z"; depends=[dplyr lazyeval MASS rlang tidyr]; }; @@ -9880,7 +10035,7 @@ in with self; { mozzie = derive2 { name="mozzie"; version="0.1.0"; sha256="09dwrv4r0hi19gzi1vpif3q4wlbny9h22430g1hhv0wkqs86mhmw"; depends=[]; }; mp = derive2 { name="mp"; version="0.4.1"; sha256="0awvwqwb25q47j14b450k1k5mh2yzwhn7gizjv5j7lyiamk30iwq"; depends=[Rcpp RcppArmadillo]; }; mpa = derive2 { name="mpa"; version="0.7.3"; sha256="0mhnsbgr77fkn957zfiw8skyvgd084rja1y4wk5zf08q5xjs2zvn"; depends=[network]; }; - mpath = derive2 { name="mpath"; version="0.3-15"; sha256="1m7yqnjhvf3ia7z5j9mv2zr4xx99rv6yzjpj90ar57m0fwjw6wh1"; depends=[bst doParallel foreach glmnet MASS numDeriv pscl]; }; + mpath = derive2 { name="mpath"; version="0.3-17"; sha256="1pk8bkp8y8gyydil33p5fwx440zgrmz3svf4zjbxhdqng9gl10xj"; depends=[bst doParallel foreach glmnet MASS numDeriv pscl]; }; mpbart = derive2 { name="mpbart"; version="0.2"; sha256="1145n0lxmm0kjm2lc358d79hqws48crj17pjvmchl1pbfd7zi4r8"; depends=[bayesm cvTools mlbench mlogit]; }; mpcmp = derive2 { name="mpcmp"; version="0.1.3"; sha256="11j12ns04g2xdw5r34x86bacwacf3618rzpqz8wvfs1l192l001c"; depends=[]; }; mpcv = derive2 { name="mpcv"; version="1.1"; sha256="0vwycspiw9saj811f6alkbijivy7szpahf35bxn2rpn2bdhbn21i"; depends=[lpSolve]; }; @@ -9905,7 +10060,7 @@ in with self; { mreg = derive2 { name="mreg"; version="1.1"; sha256="06la0yy2yys161jhlzlcm5lcv0664wm6sa8gjdnpd1s1nx52jkqf"; depends=[]; }; mregions = derive2 { name="mregions"; version="0.1.6"; sha256="0ix77hqcllhcpldchlnvciiflm6ysylynnnqvczpf8vx7gwa3lrk"; depends=[data_table httr jsonlite rappdirs sp tibble wellknown xml2]; }; mrfDepth = derive2 { name="mrfDepth"; version="1.0.11"; sha256="0x4z4agwbzlyzbkf6aj7y9061cm05dvhzpg05wc7k59xbq1ns1sv"; depends=[abind geometry ggplot2 matrixStats Rcpp RcppArmadillo RcppEigen reshape2]; }; - mrgsolve = derive2 { name="mrgsolve"; version="0.9.1"; sha256="1rpl974q4xswf0mmsm6lpyqmkq70m8b33z1az8qxma8jfdcwvai9"; depends=[BH dplyr magrittr Rcpp RcppArmadillo rlang tibble tidyselect]; }; + mrgsolve = derive2 { name="mrgsolve"; version="0.9.2"; sha256="1y3dh5myswghals4nz2m4jb8qk3q6dzgnqm0bf4dilzgpbj3gdx6"; depends=[BH dplyr magrittr Rcpp RcppArmadillo rlang tibble tidyselect]; }; mri = derive2 { name="mri"; version="1.0.1"; sha256="1dssq556kid6c3djp0s6v853cranv2wjs2c9521l5ykg5g33hfmv"; depends=[]; }; mritc = derive2 { name="mritc"; version="0.5-1"; sha256="12sfyw5b1lryczl92xvyvhl37qfx3ybg4y9awsl0b7f51zi0lzy3"; depends=[lattice misc3d oro_nifti]; }; mro = derive2 { name="mro"; version="0.1.1"; sha256="00gc2hd8q5hb2xrswclcqqw1gxl83zmpma6bhsggg3kppsw1dpjv"; depends=[MASS matrixcalc]; }; @@ -9934,7 +10089,6 @@ in with self; { msme = derive2 { name="msme"; version="0.5.3"; sha256="0mq57zdas1s87nblnvbif9lisgahfhvmabglvp9imr1mvpwybpbh"; depends=[lattice MASS]; }; msmtools = derive2 { name="msmtools"; version="1.3"; sha256="0p7xpj78cjc1s015ma7vc38kqiy6wvpyixrdinx4ngig1pqfrq4p"; depends=[data_table msm survival]; }; msos = derive2 { name="msos"; version="1.1.0"; sha256="1dlqmjz5f8h71334kzdjbzvkn0dhysp7fb18g45qqs79cqpf1vzf"; depends=[mclust tree]; }; - mssm = derive2 { name="mssm"; version="0.1.1"; sha256="1svfw3h22v97kb7yp81qlzys40b4i4mlmkdjma8xx1pz8w78ka86"; depends=[nloptr Rcpp RcppArmadillo testthat]; }; mssqlR = derive2 { name="mssqlR"; version="1.0.0"; sha256="0qdnm7cx9cg14vfcnkmcjqr1jpxsw8xlrbnxldvzz44mzv2n878l"; depends=[magrittr RODBC]; }; mstR = derive2 { name="mstR"; version="1.2"; sha256="0v8cv9pswkvw0lva6jx5vavsb20dawgq83gn4rgydyhvigcl5szd"; depends=[]; }; mstate = derive2 { name="mstate"; version="0.2.11"; sha256="13kw1n1p2f1f0k5hkcc4732wlhiy3csx8nx2ajrgw06svzksgh3y"; depends=[RColorBrewer survival]; }; @@ -9967,6 +10121,7 @@ in with self; { multiApply = derive2 { name="multiApply"; version="2.0.1"; sha256="0kdbv76kp03cwh1fhgf2llkql8z0zlqqzwb6khywclm6y9dwd7n6"; depends=[doParallel foreach plyr]; }; multiAssetOptions = derive2 { name="multiAssetOptions"; version="0.1-1"; sha256="1kb4qxyl9shvrpqfxq26lhh3sssmyjcnhhcl6gcbb0s86snh9ms9"; depends=[Matrix]; }; multiCA = derive2 { name="multiCA"; version="1.1"; sha256="1vgb13cfq10g8hxykgi3is3mrlbm76vh40cznapl7xxmw226ccrl"; depends=[bitops multcomp]; }; + multiColl = derive2 { name="multiColl"; version="1.0"; sha256="01csf5gjk2wrv6d0m1j23gk6dcixck318ywfq1a1a0j1dl9wmvx4"; depends=[]; }; multiDimBio = derive2 { name="multiDimBio"; version="1.1.1"; sha256="0b0lymnli7w91bfd67dsvzbj3flxsrsmbg4a18mzch0j9y6a40x0"; depends=[ggplot2 gridGraphics lme4 MASS misc3d pcaMethods RColorBrewer]; }; multiPIM = derive2 { name="multiPIM"; version="1.4-3"; sha256="0j7d0cgs8zcyiyibzmfhcandad76sf4gm57wkcv98bf96wkls58l"; depends=[lars penalized polspline rpart]; }; multiRDPG = derive2 { name="multiRDPG"; version="1.0.1"; sha256="0r6n148pakixw4caj0zwib8zirgl98lm0mxqmhvmqjh389icskxc"; depends=[]; }; @@ -9991,7 +10146,7 @@ in with self; { multimark = derive2 { name="multimark"; version="2.1.0"; sha256="1c33m33hi7s3ap310hm9y6b0ji020paislsiixa4qp4608r3cg0j"; depends=[Brobdingnag coda doParallel doRNG foreach Matrix mvtnorm prodlim raster RMark sp statmod]; }; multimode = derive2 { name="multimode"; version="1.4"; sha256="142k2jbi6y9aaqz9cwl4wk2m1y1n1fgvk873nk3psdv2h6r77slx"; depends=[diptest ks rootSolve]; }; multinbmod = derive2 { name="multinbmod"; version="1.0"; sha256="1c4jyzlcjkqdafj9b6hrqp6zs33q6qnp3wb3d7ldlij7ns9fhg71"; depends=[]; }; - multinet = derive2 { name="multinet"; version="3.0.2"; sha256="03pnwmhjkhk6hcmfxkv2g587d1clqi43hbl09sfwg7gspm704br4"; depends=[igraph RColorBrewer Rcpp]; }; + multinet = derive2 { name="multinet"; version="3.0.3"; sha256="1dazqilfn5ws0v55h5v75n27jhgv964gdv1n5rkfjzgzrcp1djxj"; depends=[igraph RColorBrewer Rcpp]; }; multinets = derive2 { name="multinets"; version="0.2.1"; sha256="00h1nqi49mix5rxp39i46pimmr3rl0c2869g7ss8cy0kl8hl41hz"; depends=[igraph igraphdata Rcpp]; }; multinomRob = derive2 { name="multinomRob"; version="1.8-6.1"; sha256="1fdjfk77a79fy7jczhpd2jlbyj6dyscl1w95g64jwxiq4hsix9s6"; depends=[MASS mvtnorm rgenoud]; }; multinomineq = derive2 { name="multinomineq"; version="0.2.1"; sha256="09h5nccfcrnl78rdxwsw5cqirfq40a6x4dmpkibc475z3xndk2rm"; depends=[coda quadprog Rcpp RcppArmadillo RcppProgress RcppXPtrUtils Rglpk]; }; @@ -10018,7 +10173,7 @@ in with self; { mumm = derive2 { name="mumm"; version="0.2.1"; sha256="1wjg2pqn2wb9hk9mqgpi3k26qwjnkmp4apx09lxcwrz35bbwhfzv"; depends=[lme4 Matrix Rcpp RcppEigen stringr TMB]; }; munfold = derive2 { name="munfold"; version="0.3.5"; sha256="17zizx9r0f8dxb7dkgn1nn0fp7ydy6r155p1zfz0v93jc26lc1hb"; depends=[MASS memisc]; }; munsell = derive2 { name="munsell"; version="0.5.0"; sha256="16g1fzisbpqb15yh3pqf3iia4csppva5dnv1z88x9dg263xskwyh"; depends=[colorspace]; }; - munsellinterpol = derive2 { name="munsellinterpol"; version="2.4-1"; sha256="068732g828wc9sbazhadam5jdl7dfm2nhry581pvg4p41n31aynf"; depends=[rootSolve spacesRGB spacesXYZ]; }; + munsellinterpol = derive2 { name="munsellinterpol"; version="2.5-1"; sha256="1x5nh4h35mkajsdgi4vrvs1cd4iagdrp9al2a6lll96jw0y1c65y"; depends=[rootSolve spacesRGB spacesXYZ]; }; murphydiagram = derive2 { name="murphydiagram"; version="0.11"; sha256="0wax9gjhzz8nphzwijqzllz4y25jksf1vqfcbnfb7zafsfv40rib"; depends=[]; }; music = derive2 { name="music"; version="0.1.1"; sha256="04ygmlga7i8bpxcrlmj8wc956asf73krghga6fnh2flm675dp42f"; depends=[audio crayon]; }; musicNMR = derive2 { name="musicNMR"; version="0.0.2"; sha256="09xxc78ajk428yc3617jfxqp5fy89nfc24f1rig6cw28fflwqj0k"; depends=[seewave]; }; @@ -10034,7 +10189,7 @@ in with self; { mvPot = derive2 { name="mvPot"; version="0.1.4"; sha256="04l9dn8amwp366b6lic5fkl4kck0x2m3xcsqz6as4c3h772nhq1w"; depends=[evd gmp MASS numbers]; }; mvProbit = derive2 { name="mvProbit"; version="0.1-8"; sha256="07dizclqjlwj29yb3xwjihjh8kmn6jiq5cpf8rcirylzykfdv3wk"; depends=[abind bayesm maxLik miscTools mvtnorm]; }; mvQuad = derive2 { name="mvQuad"; version="1.0-6"; sha256="016477dhjdkqiadc631vzpbp967mn4yli6by3s1k348mlfirwsi3"; depends=[data_table statmod]; }; - mvSLOUCH = derive2 { name="mvSLOUCH"; version="2.0.6"; sha256="0vd891qb7qln9vlavc5vm9fa3c371chb1xmkzw7pns8bjw1jmx2r"; depends=[abind ape Matrix matrixcalc mvtnorm ouch PCMBase]; }; + mvSLOUCH = derive2 { name="mvSLOUCH"; version="2.0.7"; sha256="0kcqjzsdpdclfifgbcnqg76kv4dpqsd2zajgrsgfzlhc6vvrqk42"; depends=[abind ape Matrix matrixcalc mvtnorm ouch PCMBase]; }; mvShapiroTest = derive2 { name="mvShapiroTest"; version="1.0"; sha256="0zcv5l28gwipkmymk12l4wcj9v047pr8k8q5avljdrs2a37f74v1"; depends=[]; }; mvabund = derive2 { name="mvabund"; version="4.0.1"; sha256="0la935gsiryfc0zixxr1dqj0av271x96pqxbi3bp6dksbw5gm68k"; depends=[MASS Rcpp RcppGSL statmod tweedie]; }; mvbutils = derive2 { name="mvbutils"; version="2.8.232"; sha256="0awd0jy492ha321c20kmmgl20kqphdmrmswakc0rq6h8z9d55kdg"; depends=[]; }; @@ -10068,7 +10223,7 @@ in with self; { 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.6"; sha256="12anv9f1mgb4p6f497zax3hzdc2wfjmi2sjha27qsfp7bfglikjn"; depends=[Rcpp shiny]; }; - mwshiny = derive2 { name="mwshiny"; version="1.0.0"; sha256="11wpmn7rb2241add5s6g6ia557dzcbvpkdjx4vlglrq1rxnrjm91"; depends=[htmltools shiny]; }; + mwshiny = derive2 { name="mwshiny"; version="2.0.0"; sha256="07x36dymd79aziz8k3sfx7l82xzmv43pkwndsfv9ii58q7nli1hz"; depends=[shiny]; }; mxkssd = derive2 { name="mxkssd"; version="1.1"; sha256="0m9763dqrk8qkrvp18bsv96jv0xhc2m8sbxdk6x3w6kdjcl663p2"; depends=[]; }; myTAI = derive2 { name="myTAI"; version="0.9.1"; sha256="0pbyxbrbbaadi5k2yp79lr6r56gjq65hmin3ssr032xipgw0d97l"; depends=[doParallel dplyr edgeR fitdistrplus foreach ggplot2 gridExtra nortest RColorBrewer Rcpp RcppArmadillo readr reshape2 scales taxize tibble]; }; mycobacrvR = derive2 { name="mycobacrvR"; version="1.0"; sha256="1xd9ackzdd8db6bayza0bg4n256mi9rdqih0cdc0nl212c3iz75g"; depends=[]; }; @@ -10088,10 +10243,10 @@ in with self; { nadiv = derive2 { name="nadiv"; version="2.16.0.0"; sha256="0pfg9hbhcjgbfmakl1jqqaf9i07i5z5jk7sh2x7x7p4354z30z9y"; depends=[Matrix]; }; naivebayes = derive2 { name="naivebayes"; version="0.9.6"; sha256="1rmpc7ynnl909m20njdy5nc7siqqlj5xra3ry41b0pgb966ijcdz"; depends=[]; }; naivereg = derive2 { name="naivereg"; version="1.0.1"; sha256="0wvyv54q3r4jz03jdbsmnxsinzpqcac6xjvzcrjjdzbkqfxicxal"; depends=[gmm grpreg]; }; - namedCapture = derive2 { name="namedCapture"; version="2019.02.25"; sha256="0frlrbbpg2kvrggjv9z1qkizaw3vih3jwlngvaqaqrm7rwi04sc3"; depends=[]; }; + namedCapture = derive2 { name="namedCapture"; version="2019.7.30"; sha256="12cnd16015ig0qx41gfkf7915iyzlaa7ixdv72x9vx3rylw86y4q"; depends=[]; }; namer = derive2 { name="namer"; version="0.1.4"; sha256="0ika1imdrslfycbsg6zrssgghsc729ah4yvgjpv9kykppw098qwd"; depends=[dplyr fs glue magrittr purrr rstudioapi tibble]; }; namespace = derive2 { name="namespace"; version="0.9.1"; sha256="1bsx5q19l7m3q2qys87izvq06zgb22b7hqblx0spkvzgiiwlq236"; depends=[]; }; - nandb = derive2 { name="nandb"; version="2.0.3"; sha256="1hv28m4miq3r1dck01b1zvxyz8z0c5clp4jhrqms0pgr9ipqhh1p"; depends=[assertthat autothresholdr BBmisc checkmate detrendr dplyr filesstrings ggplot2 glue ijtiff magrittr purrr Rcpp reshape2 rlang stringr viridis withr]; }; + nandb = derive2 { name="nandb"; version="2.0.4"; sha256="194lkrigcaa6vamd0060l9cf4ll7g57q2ljk4h4vddkqg31x91cj"; depends=[assertthat autothresholdr BBmisc checkmate detrendr dplyr filesstrings ggplot2 glue ijtiff magrittr purrr Rcpp reshape2 rlang stringr viridis withr]; }; naniar = derive2 { name="naniar"; version="0.4.2"; sha256="0qy3wgb4wixn01yyhbjf0dmx5xq42m4c3d46y2ysfj59181p39lm"; depends=[dplyr forcats ggplot2 glue magrittr purrr rlang tibble tidyr UpSetR viridis visdat]; }; nanop = derive2 { name="nanop"; version="2.0-6"; sha256="007gdc93pk0vpfmsw7zgfma2k1045n2cxwwsyy276smy0ys9fdhp"; depends=[distrEx rgl]; }; nanostringr = derive2 { name="nanostringr"; version="0.1.4"; sha256="1g1hm5kz2bl3qqs2cz4nhvmak7mbh5pry34lp6lwnbxrgi97i1iz"; depends=[assertthat ccaPP dplyr epiR magrittr purrr rlang]; }; @@ -10141,7 +10296,7 @@ in with self; { neighbr = derive2 { name="neighbr"; version="1.0.2"; sha256="1l85x3p4h2z2npj1xqggviyd3kvkgni5cnx5p3g52s9jwqrj43kb"; depends=[]; }; neldermead = derive2 { name="neldermead"; version="1.0-11"; sha256="0gf9rfwz48sadl6960mpfb6a3l9n5p28yq3n0a9vz8mr57vh1dzg"; depends=[optimbase optimsimplex]; }; neo4r = derive2 { name="neo4r"; version="0.1.1"; sha256="0s4rjhn2mc8ca4p8p474a83dc277vrf7l968xwxkiac0d4fgbra7"; depends=[attempt data_table glue httr igraph jsonlite magrittr purrr R6 rlang rstudioapi shiny tibble tidyr tidyselect]; }; - neonUtilities = derive2 { name="neonUtilities"; version="1.2.2"; sha256="0biik91csn35hpci4jgsgfighqnyyhd1kvr40l6wbw3kgmqwxgw2"; depends=[data_table downloader dplyr gdata httr jsonlite lubridate readr tidyr]; }; + neonUtilities = derive2 { name="neonUtilities"; version="1.3.1"; sha256="1cqa9ziy1jifsxnbdfd9d5dz5j4w87vzlpngf1aw4h5g1z11sq9l"; depends=[data_table downloader dplyr gdata httr jsonlite lubridate readr tidyr]; }; neotoma = derive2 { name="neotoma"; version="1.7.4"; sha256="1fknzp7qg5l5lkfvqfld0x67zj3xmi8vivsg70m47mbpcs92hmcf"; depends=[analogue dplyr httr jsonlite leaflet plyr reshape2 xml2]; }; nephro = derive2 { name="nephro"; version="1.2"; sha256="1izmzx8lah322xzb42asfnrvr2c9yqd0zf7fmrhwd3p4rr1rqa7d"; depends=[]; }; nesRdata = derive2 { name="nesRdata"; version="0.2.0"; sha256="1cr5d600bnslxbm2kknzwivvb4zyfsrf8rbrk3kk0j6dpclx5x6s"; depends=[dataone dplyr purrr rappdirs readr]; }; @@ -10157,7 +10312,7 @@ in with self; { netgen = derive2 { name="netgen"; version="1.3"; sha256="1iywpl9n1yplnd38dff8m9mz1vlfbvplw393grhpav5czcknj160"; depends=[BBmisc checkmate ggplot2 igraph lhs lpSolve mvtnorm stringr]; }; netgsa = derive2 { name="netgsa"; version="3.1.0"; sha256="0mn4dnvckdskigdfbszjnfmb3m6yfbz4qc26qwh1wznwx5wmcbf0"; depends=[corpcor dplyr glassoFast glmnet graph graphite igraph magrittr Matrix msigdbr quadprog rlang]; }; netgwas = derive2 { name="netgwas"; version="1.10"; sha256="19gqsilw9i4hinz6qsms7cnlrrrnpriq2ws8l1naivfz94bdi7dx"; depends=[glasso huge igraph MASS Matrix qtl RBGL tmvtnorm]; }; - netjack = derive2 { name="netjack"; version="1.1.1"; sha256="0pb9phfdjfp8yxlv5p0qb6vxhh8vb9iviffzrbj8x8dy3y3c9vp5"; depends=[brainGraph ggplot2 igraph Rdpack]; }; + netjack = derive2 { name="netjack"; version="1.2.0"; sha256="060ygb0kxi0gx1ya38cmf5hhyy6jkwq5519azdqhq5i324cwzzm7"; depends=[brainGraph ggplot2 igraph Rdpack]; }; netmeta = derive2 { name="netmeta"; version="1.0-1"; sha256="1fsm41xz1dv6gwc354nxx4bj0xfmvamqhnhlbp5pn2g4y66wqm7s"; depends=[magic MASS meta]; }; netrankr = derive2 { name="netrankr"; version="0.2.1"; sha256="0csgi09ijp7ygwk7x057l9xjrzyhr7sav8hamh0p6i72l6719ssl"; depends=[igraph Rcpp RcppArmadillo]; }; netregR = derive2 { name="netregR"; version="1.0.1"; sha256="0n5absjra0imddz1spy1piij5rdz76wi4g568yby3rbhkm1896rs"; depends=[Matrix]; }; @@ -10186,7 +10341,7 @@ in with self; { neverhpfilter = derive2 { name="neverhpfilter"; version="0.2-0"; sha256="0m4gbqnjw2nmhf25svznlf6pd0b0mslk52lpirmlj1iv04w1aq1i"; depends=[xts zoo]; }; newTestSurvRec = derive2 { name="newTestSurvRec"; version="1.0.2"; sha256="06p782md33wqh5wa1735yg5i01d42p74kl7h5qhqs9cd732ls6pz"; depends=[]; }; newsanchor = derive2 { name="newsanchor"; version="0.1.1"; sha256="1s8qhq9jk5gnsimnvy7kdayya0ks0ly309l7zxm5rafj5x7k5vwn"; depends=[askpass devtools httr jsonlite lubridate tidyr xml2]; }; - newsmap = derive2 { name="newsmap"; version="0.6.7"; sha256="0wy9nqr3iljs5pxb3qnqjvk2123d311xv22mrmx2ls28znk6433b"; depends=[Matrix quanteda stringi]; }; + newsmap = derive2 { name="newsmap"; version="0.6.9"; sha256="1s7ldabclmv2qfkczj17vbj3630ab6xfc1x020szdy9fa08380wp"; depends=[Matrix quanteda stringi]; }; ngram = derive2 { name="ngram"; version="3.0.4"; sha256="1q4y64dy7vcjikbfx20fpdiy1kwvxay4y90xr5j8d8zkqnva0way"; depends=[]; }; ngramrr = derive2 { name="ngramrr"; version="0.2.0"; sha256="1p8s4p3h27g647rxx9qjfad5dzbngjbmvhw4gz0jbsmfqrsf72by"; depends=[tau tm]; }; ngspatial = derive2 { name="ngspatial"; version="1.2-1"; sha256="1c65ws9b9s2grr44lqg8026c4p2875d0426dfmrakpb44mw2zppp"; depends=[batchmeans Rcpp RcppArmadillo]; }; @@ -10210,13 +10365,13 @@ in with self; { nleqslv = derive2 { name="nleqslv"; version="3.3.2"; sha256="1v9znvncyigw9r25wx2ma0b7ib179b488dl0qsrhp5zrcz7mcjgm"; depends=[]; }; nlgeocoder = derive2 { name="nlgeocoder"; version="0.1.3"; sha256="13d30kfgfsny5gnn3yjfnclky6yixaa8sg0m689rszqxrvbrj79x"; depends=[jsonlite]; }; nlirms = derive2 { name="nlirms"; version="3.4.4"; sha256="1njyfip377a0f6hf9y32s077b4jv4h8ydbjgnl68yfypxbfn2xyx"; depends=[gridExtra gtable]; }; - nlme = derive2 { name="nlme"; version="3.1-140"; sha256="0k9x5j34fx093a023da9ny3b3101lbwpmfm27mkvfj950l22z88x"; depends=[lattice]; }; + nlme = derive2 { name="nlme"; version="3.1-141"; sha256="0ml00g79bimjcl0sgn6h55l5b4gfmnsnc1vvmivggn0318k4c04i"; 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]; }; - nlmixr = derive2 { name="nlmixr"; version="1.0.0-7"; sha256="1ibj2cxf09jnsf08idrd9q0fxg34i2wp56i4f6q4rq21aswh92qd"; depends=[BH brew cli crayon dparser fastGHQuad ggplot2 lattice lbfgs magrittr Matrix memoise minqa n1qn1 nlme numDeriv PreciseSums R_utils Rcpp RcppArmadillo RcppEigen rex RxODE StanHeaders tidyr vpc]; }; nlmrt = derive2 { name="nlmrt"; version="2016.3.2"; sha256="1g0qq0a933ay65gkp04qgn2wqk6vw79pj2a228c2ski4rcmkjxyn"; depends=[]; }; nlnet = derive2 { name="nlnet"; version="1.2"; sha256="00lcyz5csjj9qbhh7yw0qlbnyv32k0c2dpm23v04n9wkdgs67jy0"; depends=[coin e1071 earth fdrtool igraph randomForest ROCR TSP]; }; nloptr = derive2 { name="nloptr"; version="1.2.1"; sha256="15yz60kljxwnhm2m3gryjzxl3ynhkhd5jiwc179b1hz6rlzf71hz"; depends=[]; }; + nlr = derive2 { name="nlr"; version="0.1-3"; sha256="19zcnigijr3jfy4da945z4fdnrirvlmpqminaf5wwk0bz71f3b61"; depends=[GA MASS nlme quantreg robcor TSA tseries]; }; nlreg = derive2 { name="nlreg"; version="1.2-2.2"; sha256="0gkcxg5m287axhvkl00xy26vidawhhb1ii1s13rh49v0yccwvvqh"; depends=[statmod survival]; }; nlrr = derive2 { name="nlrr"; version="0.1"; sha256="09wm8s5sadkhkq9pb3fjk66cb2xn8py46w1d7yp7fjhczh31bjsq"; depends=[Hmisc rms]; }; nlrx = derive2 { name="nlrx"; version="0.2.0"; sha256="0ahgw0lmfpfb03fzhvp8a4rhvn0r84s90aiada4slss47g63iclq"; depends=[dplyr furrr genalg GenSA igraph lhs magrittr purrr raster readr rstudioapi sensitivity sf stringr tibble tidyr XML]; }; @@ -10232,6 +10387,7 @@ in with self; { nlstimedist = derive2 { name="nlstimedist"; version="1.1.4"; sha256="1c9yxpaxdx03yav4x0vk67f1j6w70jv212sfxrfxkz61ivyqcmlb"; depends=[broom dplyr ggplot2 lazyeval minpack_lm nlstools]; }; nlstools = derive2 { name="nlstools"; version="1.0-2"; sha256="0mjn1j9fqqgr3qgdr0ki4lfbd0yrkanvya4y2483q3wklqa6qvjc"; depends=[]; }; nlt = derive2 { name="nlt"; version="2.2-1"; sha256="10wf00qzf28dxjfvv12wsqxlfn6xz15wk8njrzgsgm9px1g6s21f"; depends=[adlift EbayesThresh]; }; + nltm = derive2 { name="nltm"; version="1.4.2"; sha256="02f3rn5l1hfvjpymy7vljmh6iq9w1w96016kx75qw563zwhmp5kx"; depends=[survival]; }; nlts = derive2 { name="nlts"; version="1.0-2"; sha256="0s49qjwavl9ns2746nn4zy4h4dh0njfcvznm3qd61qhs7np9w1db"; depends=[acepack locfit]; }; nmaINLA = derive2 { name="nmaINLA"; version="0.1.2"; sha256="0layk1pqry2g3xiwmasrnsvmw91sgg7iz15d6iz6hbq4za61hr0k"; depends=[]; }; nmadb = derive2 { name="nmadb"; version="1.0.0"; sha256="051kzr6hva57bsla8qbnkkkw7a3hnr4415gd6qzk9bq79q2bg53p"; depends=[devtools jsonlite RCurl readxl]; }; @@ -10241,7 +10397,7 @@ in with self; { nmixgof = derive2 { name="nmixgof"; version="0.1.0"; sha256="0cbwrsxrcf8pn4ycn6r0z8jdidw5l6kdvwyrks69fq4pjzx988d6"; depends=[Rcpp unmarked]; }; nmslibR = derive2 { name="nmslibR"; version="1.0.3"; sha256="1m3bq0vg774kqragdx1ydm4q2if3yn9llbd6ybv3c8bmbdb9h405"; depends=[KernelKnn Matrix R6 Rcpp RcppArmadillo reticulate]; }; nmw = derive2 { name="nmw"; version="0.1.4"; sha256="1vj7b2p40x0h3xp45qzar86i9439mj8y3r5hnlbwa025jqdf2g0q"; depends=[numDeriv]; }; - nnTensor = derive2 { name="nnTensor"; version="0.99.4"; sha256="1z5dafcnj9cnslxljij5ycmzagvvp27z8b7p6i3hz134z4vbx5jb"; depends=[fields plot3D rTensor tagcloud]; }; + nnTensor = derive2 { name="nnTensor"; version="1.0.0"; sha256="07cdc8givv0mzszq418hgl5ic77mg7dh40q03gnv9iki6k5lc31a"; depends=[fields plot3D rTensor tagcloud]; }; nna = derive2 { name="nna"; version="0.0.2.1"; sha256="17cz1jf7iv61wspqldfdwbdjhlr0wq09idkzlivfb8aik5w9f0z5"; depends=[]; }; nnet = derive2 { name="nnet"; version="7.3-12"; sha256="17amqnw9dpap2w8ivx53hxha2xrm0drwfnj32li0xk41hlz548r7"; depends=[]; }; nnetpredint = derive2 { name="nnetpredint"; version="1.2"; sha256="1c6s9wm6vhylwv4xhp2hkllw18zj8hdr17ls9vlxm9qs3wx1v48w"; depends=[RSNNS]; }; @@ -10275,7 +10431,7 @@ in with self; { nonparaeff = derive2 { name="nonparaeff"; version="0.5-8"; sha256="1kkn68m7cqlzx3v539cjxw3x5a2y86lvmyv2k98s87m3yvqg0gdk"; depends=[gdata geometry Hmisc lpSolve psych pwt rms]; }; nontarget = derive2 { name="nontarget"; version="1.9"; sha256="0ndqcr73sja5ks5kdahhakpz9lw3rp26imklagdv4f5agqnb608s"; depends=[enviPat mgcv nontargetData]; }; nontargetData = derive2 { name="nontargetData"; version="1.1"; sha256="07cdbpmn64sg4jfhljdcx503d55azyz58x7nkji044z3jmdryzqw"; depends=[]; }; - nopaco = derive2 { name="nopaco"; version="1.0.4"; sha256="0c5nd5mnabki5jxq00a5dp3x7qvkw5kniym370avl3qfcnsswmg5"; depends=[Matrix]; }; + nopaco = derive2 { name="nopaco"; version="1.0.6"; sha256="0q705b7bjzq0b6vfp6yargybc8h07adx8al1ip7pxkmfcpilj66v"; depends=[Matrix]; }; nopp = derive2 { name="nopp"; version="1.1.0"; sha256="1zn3ss89i7fwqps6b8syd9jzm68k95p3fdlf285q819dzlk61ypk"; depends=[MASS mlogit]; }; nor1mix = derive2 { name="nor1mix"; version="1.3-0"; sha256="1817wcvlmxs70vs4db0jkxd7i037744zz8ay3c2a9949z29fxr4w"; depends=[]; }; nord = derive2 { name="nord"; version="0.0.1"; sha256="0ajymjn2xw7zik62nhjp11g8bkvsqhhsrzi3bl2k70y544wbl3kn"; depends=[ggplot2]; }; @@ -10291,11 +10447,11 @@ in with self; { nortestARMA = derive2 { name="nortestARMA"; version="1.0.2"; sha256="11ala9z0snsbn1xmj9yzs4kyh9js1w19x0dnnmh5cbr9bi7aag50"; depends=[astsa]; }; nos = derive2 { name="nos"; version="1.1.0"; sha256="0hbncama8cx8q0rc56bil38fbj33z49v4d6zdkvxs6wgmmglnrfs"; depends=[dplyr gmp]; }; nose = derive2 { name="nose"; version="1.0"; sha256="17l78vmfqc22inq6zaqpnk2m91wp0nfjbbwfcpfqykf8lk9ipqna"; depends=[]; }; - not = derive2 { name="not"; version="1.0"; sha256="1hwrka8a5jygm3zjh5jhzjx2bvdqip7pb5009vkk7k0sp8m760kq"; depends=[]; }; + not = derive2 { name="not"; version="1.2"; sha256="1671j3yirzdyhb02khx1yddslyig5jlnb0bdbgdlkb21n4zwaqa4"; depends=[]; }; noteMD = derive2 { name="noteMD"; version="0.1.0"; sha256="1365jp54srjsb3rxvr3bi50jpbp9ap311ah1jspcihdg07zqn4n9"; depends=[]; }; notifyR = derive2 { name="notifyR"; version="1.02"; sha256="0jx76ic5r1crcgg0n0yqnka0gwniflfxakh838a98j9wb11wi6h5"; depends=[RCurl rjson]; }; notifyme = derive2 { name="notifyme"; version="0.3.0"; sha256="0b6xrv6c4id7rs0dafg96pl4brn4yma5xh9wjz78ql44bg3w5s91"; depends=[dplyr httr magrittr]; }; - nowcasting = derive2 { name="nowcasting"; version="1.1.3"; sha256="1gp1ai6k5fn5gv78ffs8mzhwd1qhig8rcc52az2f2vxcvaa1bchg"; depends=[corpcor DBI httr lubridate magic matlab Matrix RCurl RMySQL vars xts zoo]; }; + nowcasting = derive2 { name="nowcasting"; version="1.1.4"; sha256="1nj34cbkv1xlhmcfhxs32shv00mz02rp95xj59qkq5by53sx8qwq"; depends=[corpcor DBI httr lubridate magic matlab Matrix RCurl RMySQL vars xts zoo]; }; noweb = derive2 { name="noweb"; version="1.0-4"; sha256="17s65m1m8bj286l9m2h54a8j799xaqadwfrml11732f8vyrzb191"; depends=[]; }; np = derive2 { name="np"; version="0.60-9"; sha256="1z4jcpx8bbgwslv42wrphfd1qfq965qjn0kmfxm5f6hbbycahcgy"; depends=[boot cubature quadprog quantreg]; }; npExact = derive2 { name="npExact"; version="0.2"; sha256="055wm5lcj98wb71lqp2zdyl8kkwvi6lwmnaylynvr907xqabaqvd"; depends=[]; }; @@ -10325,7 +10481,7 @@ in with self; { nprotreg = derive2 { name="nprotreg"; version="1.0.0"; sha256="06n82i5m7sgfj759zdwwh8fqybkbchvnaaqcds64m6hbms592bh3"; depends=[expm]; }; npsf = derive2 { name="npsf"; version="0.5.1"; sha256="0xpzfskwsc7g7flvfxnzcfjsfdlqdgy4ypxp84xcpaqampgfgd13"; depends=[Formula randtoolbox Rcpp sfsmisc]; }; npsm = derive2 { name="npsm"; version="0.5.1"; sha256="00xh3x731lqb5vbzmfmlldrvc8s4s88dc394iifsn2g7r5naxks0"; depends=[plyr Rfit]; }; - npsp = derive2 { name="npsp"; version="0.5-3"; sha256="0ck6iymfc73bzrifdc2sagcliz1yakqk1yv67a3ykha996jsrx99"; depends=[quadprog]; }; + npsp = derive2 { name="npsp"; version="0.7-5"; sha256="0ci3am6lbmb1raxdqj4ckcm7y1889j0zsk52awl15sjhkx8l2saa"; depends=[quadprog sp spam]; }; npsr = derive2 { name="npsr"; version="0.1.1"; sha256="1fzvilzjg9z05991sr1s1bdp17kfl6d1580qdllk8is9ac06np0v"; depends=[gmp infotheo MASS]; }; npst = derive2 { name="npst"; version="2.0"; sha256="1y5ij3nmh9pj6p97jpx75g26sk508mznr0l67cwj381zfb77hj1n"; depends=[]; }; npsurv = derive2 { name="npsurv"; version="0.4-0"; sha256="1wq4c9yfha5azjhrn40iiqkshmvh611sa90jp3lh82n4bl9zfk20"; depends=[lsei]; }; @@ -10373,6 +10529,7 @@ in with self; { oasis = derive2 { name="oasis"; version="3.0.4"; sha256="1h1w46rbkbsjvh3fjniy3v7y30r2vf1kiqs807kavf0bpb6a1202"; depends=[fslr mmand neurobase oro_nifti]; }; oaxaca = derive2 { name="oaxaca"; version="0.1.4"; sha256="12w5l2a8i2964rxy9km2srlycx35y7ia8p07ra7gsxr4h8156z3c"; depends=[Formula ggplot2 reshape2]; }; obAnalytics = derive2 { name="obAnalytics"; version="0.1.1"; sha256="1l4ld120qk0adycmvqrkzada10kb7z03lj2njzqagmacl1z8598f"; depends=[ggplot2 reshape2 zoo]; }; + obfuscatoR = derive2 { name="obfuscatoR"; version="0.2.0"; sha256="01j3bvmnqlajkwqz01f5zfmwgfbnmhcxa41gqnzq7k41xzm7q8vk"; depends=[crayon matrixStats readr Rfast stringr tibble]; }; objectProperties = derive2 { name="objectProperties"; version="0.6.5"; sha256="0wn19byb1ia5gsfmdi6cj05pnlxbr3zcrjabjg3g1d7b58nz7wlh"; depends=[objectSignals]; }; objectSignals = derive2 { name="objectSignals"; version="0.10.2"; sha256="1rcgfq1i3nz2q93vv4l069f3mli1c6fd5dhhhw1p7cc4sy81008w"; depends=[]; }; objectremover = derive2 { name="objectremover"; version="0.7.0"; sha256="0mspnnks04s8w6q2g0nffd0675g07hkaql44kz6zrc5329qx7jpi"; depends=[miniUI shiny shinyalert]; }; @@ -10385,7 +10542,7 @@ in with self; { oc = derive2 { name="oc"; version="1.01"; sha256="12idrh4jxxq28lgqzr6jzgrvmmwysh5amzhmmaqn3yz49i17gcaf"; depends=[pscl]; }; occ = derive2 { name="occ"; version="1.1"; sha256="1aka29qqwbd494kvi15yyyqkb9hks4ky2gcvykxhx2drm2fnsn4g"; depends=[]; }; oce = derive2 { name="oce"; version="1.1-1"; sha256="0hwfnpb6q6pmckzgh67ryvqd1jkrzzhn187x1655rnmkmp9zis1c"; depends=[gsw Rcpp testthat]; }; - oceanis = derive2 { name="oceanis"; version="0.8.5"; sha256="18vilyj06dxl910i4czh9f90550vj54pdyzyqn2j5nwac68ym4qz"; depends=[classInt dplyr DT foreign ggplot2 leaflet leaflet_extras lwgeom mapview munsell readODS sf sfc shiny shinyBS shinyjs shinythemes stringr tidyr units xlsx]; }; + oceanis = derive2 { name="oceanis"; version="0.8.6"; sha256="1snlad2fdhjvyp2px55qa0rf057fsfidn4sg4hd19jny0jkrsi4s"; depends=[classInt dplyr DT foreign ggplot2 leaflet leaflet_extras lwgeom mapview munsell readODS sf sfc shiny shinyBS shinyjs shinythemes stringr tidyr units xlsx]; }; oceanmap = derive2 { name="oceanmap"; version="0.1.0"; sha256="1kkjc213nn2ks7cqzchbmjvyp9hci8qndv8migpmyf5vjbm7d297"; depends=[abind extrafont fields lubridate mapdata maps maptools ncdf4 plotrix raster sp]; }; ocedata = derive2 { name="ocedata"; version="0.1.5"; sha256="0rs3nzacvg5mbbmbhcj8g9ikjlw26x2mka7lp644l17kgmzzynh6"; depends=[testthat]; }; ockc = derive2 { name="ockc"; version="1.0"; sha256="0chzrs3ipa2518r4d35z4fxffgq12p1mwj0hzkxw19gdgq6aa8s7"; depends=[flexclust modeltools]; }; @@ -10393,15 +10550,17 @@ in with self; { ocp = derive2 { name="ocp"; version="0.1.1"; sha256="0q52s8j3z3xwnma3sxx6019qxid66bf0a43w4g8xjagplwps57dx"; depends=[]; }; odbc = derive2 { name="odbc"; version="1.1.6"; sha256="146phrsks0hfd1bfxx452kkq7ximk3fwjz9lqg9fdykar5sr6vjj"; depends=[BH bit64 blob DBI hms Rcpp]; }; odds_converter = derive2 { name="odds.converter"; version="1.4.8"; sha256="09s8pg55gpsxmrbimzg5rsr1n07la93781sar6vab5p9zn9zxgx4"; depends=[]; }; - odds_n_ends = derive2 { name="odds.n.ends"; version="0.1.0"; sha256="1xq0wfj6plg4aircb2qsxsy3wbwvc7zkkwgywr5n9n5r1r2csyps"; depends=[MASS]; }; + odds_n_ends = derive2 { name="odds.n.ends"; version="0.1.1"; sha256="0kgdv4m14h4a16b0k2s2qjyjn0kxk5sf4qkbi6ikm6kqdh5ashp4"; depends=[MASS]; }; oddsratio = derive2 { name="oddsratio"; version="2.0.0"; sha256="0lr56djlw52j3azvifcdbyn01b85jv18gm789s7skmnylrl3rgw9"; depends=[ggplot2 mgcv stringr tibble]; }; odeintr = derive2 { name="odeintr"; version="1.7.1"; sha256="0wfb5lgv10p0qyfbn9hdg14bda37v43lpgbwv6nbw63zzbsbazqi"; depends=[BH Rcpp]; }; + odin = derive2 { name="odin"; version="1.0.1"; sha256="1m1rqlh9z6hpna6qhyxhavqph3j66hbd2b5md5ha2hrbjq93yynm"; depends=[cinterpolate crayon deSolve digest jsonlite R6 ring]; }; odk = derive2 { name="odk"; version="1.5"; sha256="0fcnr4c1clwx1sk6fgg4cx506gdi90n2h05g0i47p4s5bra0qwwl"; depends=[gsheet openxlsx]; }; odpc = derive2 { name="odpc"; version="2.0.1"; sha256="06d574sj7p5qlf7s3lbrwd56mcs4lq3pn9bkzwxhpybibgrfzn5q"; depends=[doParallel foreach forecast Rcpp RcppArmadillo]; }; odr = derive2 { name="odr"; version="1.0.0"; sha256="0niadinljx5pph329dgixivdc9s1l27ik9755fbfhmplhj92ihi2"; depends=[]; }; oem = derive2 { name="oem"; version="2.0.9"; sha256="1ffv71cwf58wrba3zhyp443kfl0j3z451mgxsxl8ig5fn9y9i9ca"; depends=[BH bigmemory foreach Matrix Rcpp RcppArmadillo RcppEigen]; }; ofGEM = derive2 { name="ofGEM"; version="1.0"; sha256="0xdkl8k12an9pdy6i5nay4m2iakrwsp0lr3zl8gphii75j0ywz7k"; depends=[CompQuadForm forestplot MASS]; }; officer = derive2 { name="officer"; version="0.3.5"; sha256="005kaxjhr40shpav2pg7s7gj8f49579r7rbgwlncbwv16nn0rbbg"; depends=[base64enc digest htmltools magrittr R6 Rcpp rlang uuid xml2 zip]; }; + offlineChange = derive2 { name="offlineChange"; version="0.0.2"; sha256="1d8jm8mm8g1fcbffk697qap58dcw3yyvrm9daviy42jsz59nbsxs"; depends=[Rcpp]; }; oglmx = derive2 { name="oglmx"; version="3.0.0.0"; sha256="13axmhbqhv4kkcdsdmp9r7p0d0kyqlsaqgyyllbkxlxb4hfz79b6"; depends=[maxLik]; }; ohtadstats = derive2 { name="ohtadstats"; version="2.1.0"; sha256="17fpfqpvmyh2ykyb56g2zc72f8d8x7d85wmdm63n7b9kr53lscj3"; depends=[lattice]; }; oii = derive2 { name="oii"; version="1.0.2.1"; sha256="1n41hikn53ikyynsravg127cw5csa8s0s1l63w5hym7c6j625ya5"; depends=[Deducer gmodels rapportools]; }; @@ -10417,6 +10576,7 @@ in with self; { oncomodel = derive2 { name="oncomodel"; version="1.0"; sha256="1jyyq9znffiv7rg26mjldbwc5yi2f4f8npsd2ykhxyacb3g96fp1"; depends=[ade4]; }; oncrawlR = derive2 { name="oncrawlR"; version="0.1.5"; sha256="07zhc76dz0ngvwmj1nq80hqp105wwsx85wcqxcma2vlh5k19j6hf"; depends=[caret DALEX dplyr ggplot2 jsonlite pROC RCurl readr rlang rlist xgboost]; }; onehot = derive2 { name="onehot"; version="0.1.1"; sha256="1cdsz007wr054k5phvihhg4qx0fc039k2s6484m92kws8mb2ziix"; depends=[]; }; + onelogin = derive2 { name="onelogin"; version="0.1.0"; sha256="1fdh3hn8paasf7zq29k4h4ng26bl63sps0lbv84g60pxhsay2bma"; depends=[glue R6 safer]; }; onemap = derive2 { name="onemap"; version="2.1.1"; sha256="0j9c0ynwpzyr548n72wzmmk8gi52qvxlxgzqzn8g6n4v5zmzlkhy"; depends=[fields ggplot2 maps Rcpp reshape2 tkrplot]; }; onewaytests = derive2 { name="onewaytests"; version="2.3"; sha256="0wi623f7jh8msnsfbsc5va4c2qy3h6l68g5rx7wrjz6nxwlqzi8y"; depends=[car ggplot2 moments nortest]; }; onion = derive2 { name="onion"; version="1.2-7"; sha256="17jx7saxcsahyyivln4v9fzzcmidy6ygjd9n81skv5jpr491zkgk"; depends=[]; }; @@ -10443,7 +10603,7 @@ in with self; { opencv = derive2 { name="opencv"; version="0.1"; sha256="0m649g6k6cgxnljjx8czypjawbyzx7xjcg32wddxkrgi2b236lwh"; depends=[magrittr Rcpp]; }; opendotaR = derive2 { name="opendotaR"; version="0.1.4"; sha256="17cygsw3nkg6zincfrcdh1509rlz3n5zrv9wvv7mjngm61sn79nf"; depends=[dplyr jsonlite lubridate]; }; openintro = derive2 { name="openintro"; version="1.7.1"; sha256="059azlasdkmp8f54qpjf3mq5dyqakw0dgx0kx85wfdmhq38zal5n"; depends=[]; }; - openssl = derive2 { name="openssl"; version="1.4"; sha256="0mh4xwb9wnn5j2n1zzmjldqjqv2nn4wdidiixxciaqrqsi0l9834"; depends=[askpass]; }; + openssl = derive2 { name="openssl"; version="1.4.1"; sha256="1ihz2qi33lhngl19xdanq0pbmfaacy63794mg8ll7z2lab3yryzp"; depends=[askpass]; }; opentraj = derive2 { name="opentraj"; version="1.0"; sha256="13nqal96199l8vkgmkvl542ksnappkscb6rbdmdapxyi977qrgxk"; depends=[doParallel foreach maptools openair plyr raster reshape rgdal sp]; }; openxlsx = derive2 { name="openxlsx"; version="4.1.0.1"; sha256="1lflygpi1z4rlb1c6g6wsmi334maiiy7jhpg6ph4sw8lpvg12w4b"; depends=[Rcpp zip]; }; opera = derive2 { name="opera"; version="1.0"; sha256="0p2wg3srg088l420ykrq0wqvzh1mp6l753rdw35f7kdmaj08mqfq"; depends=[quadprog quantreg RColorBrewer]; }; @@ -10462,6 +10622,7 @@ in with self; { optiRum = derive2 { name="optiRum"; version="0.40.1"; sha256="1kl9mzh53pwhrxbn89dsjjpfji7k8vmysscd1qd9sw7vqdan8g6x"; depends=[AUC data_table ggplot2 knitr plyr scales stringr XML]; }; optiSel = derive2 { name="optiSel"; version="2.0.2"; sha256="0k3651h7ih59w13jzkbh8m5pddi1g1zci5rn9dm3b873yjr2nalx"; depends=[data_table doParallel ECOSolveR foreach kinship2 magic MASS Matrix nadiv optiSolve pedigree plyr pspline purrr quadprog Rcpp RcppArmadillo reshape2 stringr]; }; optiSolve = derive2 { name="optiSolve"; version="0.1"; sha256="1wnpj7z0vqf91gzgz6r2ympnljq4mczxnnyk3sq7gvf6df4ic2m1"; depends=[alabama cccp MASS Matrix nloptr plyr Rcpp Rcsdp shapes stringr]; }; + opticskxi = derive2 { name="opticskxi"; version="0.1"; sha256="1vdz5sgjgyh2nj034w87d2yxcbbg97f1b0vijlwzwjkrfz5knfhl"; depends=[ggplot2 magrittr]; }; opticut = derive2 { name="opticut"; version="0.1-2"; sha256="1j479wa7mlp62c2y7shha1w7ybhfy8wvjfaz27kmwd1f61ma1g0l"; depends=[betareg MASS mefa4 pbapply pscl ResourceSelection]; }; optifunset = derive2 { name="optifunset"; version="1.0"; sha256="18pvdl04ln1i0w30ljdb3k86j27zg2nvrn3ws54c1g6zg9haqhbg"; depends=[]; }; optigrab = derive2 { name="optigrab"; version="0.9.2.1"; sha256="1c3q4kx8rkgpjsy0hy2w2dd9kv51avnw1ab82hzmjgngfnvaig0n"; depends=[magrittr stringi]; }; @@ -10479,7 +10640,7 @@ in with self; { optionstrat = derive2 { name="optionstrat"; version="1.3.0"; sha256="0aapgga8a4rnffns0jq1l3gv319i3cq1h49wgprh6cafvb5nm61l"; depends=[]; }; optiscale = derive2 { name="optiscale"; version="1.1"; sha256="1c263w9df66m7lgvzpdfm2zwx9nj8wcdpgh5gijachr2dzffmrp2"; depends=[lattice]; }; optismixture = derive2 { name="optismixture"; version="0.1"; sha256="0nacfbqlnzajp1hfhf0yzm2d86fxpp4kw2zy33q8k2d4sr56bird"; depends=[Matrix mvtnorm]; }; - optmatch = derive2 { name="optmatch"; version="0.9-10"; sha256="1jnvk9r7jc8w5rg8xvhbhj0wmy0l1hhjm8iwyf703939p4xc5z71"; depends=[digest Rcpp RItools survival]; }; + optmatch = derive2 { name="optmatch"; version="0.9-11"; sha256="0lvba8gca1bvf7b46kmjqpkb3ykip07niw1w2qghgqrfxkq0s6yi"; depends=[digest Rcpp RItools survival]; }; optparse = derive2 { name="optparse"; version="1.6.2"; sha256="0zrp6jakjhawrwfri270ym83vj5a7nvjk0w6b41z41ahw2da99dm"; depends=[getopt]; }; optpart = derive2 { name="optpart"; version="2.3-0"; sha256="125b9sfdk4bdcj1vq5rxlrskv1zra31x8d96pdxnqvcnkmwxm4zh"; depends=[cluster labdsv MASS plotrix]; }; optrcdmaeAT = derive2 { name="optrcdmaeAT"; version="1.0.0"; sha256="16g4612mwyfsckn6l71fbrjnnjv4yvnac1cccbrn3k8jh07qgb1h"; depends=[igraph MASS Matrix]; }; @@ -10503,7 +10664,7 @@ in with self; { orderstats = derive2 { name="orderstats"; version="0.1.0"; sha256="0a3ga0cjryvbininspsx5wzc96s3fza06s3d5fhbllbixz0rap4a"; depends=[]; }; ordiBreadth = derive2 { name="ordiBreadth"; version="1.0"; sha256="04faqhas1p9lxhghd4xq07yq1nxv7ns18avhvkql7sy5a9g7bfs1"; depends=[vegan]; }; ordinal = derive2 { name="ordinal"; version="2019.4-25"; sha256="1pvrkly4x12w32n7w1qljdwzqnlkv7rfa7rx0nz5vbiw29xas4i8"; depends=[MASS Matrix numDeriv ucminf]; }; - ordinalClust = derive2 { name="ordinalClust"; version="1.3.3"; sha256="1yyn0y873hbdwfq1nxx8lz99bzc7cdc36zlnsqnd5y1g6a1q3l2g"; depends=[BH Rcpp RcppArmadillo RcppProgress]; }; + ordinalClust = derive2 { name="ordinalClust"; version="1.3.4"; sha256="0r1g23ddhsszl7a52pdw3wnwipk4pikkg7p256jxls777wcyla3f"; depends=[BH Rcpp RcppArmadillo RcppProgress]; }; ordinalCont = derive2 { name="ordinalCont"; version="2.0.1"; sha256="18li100drg54sfsp1qzxpfk7dqkdslrg6q4v7lqpysw9p7q0wpfp"; depends=[boot Deriv]; }; ordinalForest = derive2 { name="ordinalForest"; version="2.3-1"; sha256="1yhaq6bg9npxsc9v6v9viqlwyrpdag1hy0z25h10cfygg8h1ranl"; depends=[combinat ggplot2 nnet Rcpp]; }; ordinalLBM = derive2 { name="ordinalLBM"; version="1.0"; sha256="1sfzkm3f9s5nbalakgk5v919wr7hdlr5p280rw2p8dy4wxr3xk3s"; depends=[RColorBrewer reshape2]; }; @@ -10538,7 +10699,7 @@ in with self; { osmose = derive2 { name="osmose"; version="0.1.1"; sha256="0fiijnrvvydhj6j9yb02rn5sg8arcpj3jz977m2zwjgqy878cffg"; depends=[rlist stringr]; }; osmplotr = derive2 { name="osmplotr"; version="0.3.2"; sha256="0k5rjxsi1sfcxcl6lf8zcncqnshz2jaz7hcwn2ifg4yhvxvkfma8"; depends=[curl e1071 ggm ggplot2 httr mapproj osmdata rgeos sp spatstat]; }; osqp = derive2 { name="osqp"; version="0.5.0"; sha256="12gm5mhmnzvfmziiln0lnqs173gan10ihwkcj07dcjii4nvkg4p9"; depends=[Matrix R6 Rcpp]; }; - osrm = derive2 { name="osrm"; version="3.3.0"; sha256="0gk65pimqifninqzb1q0hc04x24pkbfh49hv3zq2vziy5csc2mib"; depends=[gepaf isoband jsonlite lwgeom RCurl sf sp]; }; + osrm = derive2 { name="osrm"; version="3.3.1"; sha256="0l672jkw3hr8dncq2al8345bd5v2vgvyqhb4cv753b6fdljxmrhk"; depends=[gepaf isoband jsonlite lwgeom RCurl sf sp]; }; osrmr = derive2 { name="osrmr"; version="0.1.35"; sha256="1pmsybyqkgpqz0yhfmwrsa2smgmclxzk9mlzcqmm8ph6dcd1x0s8"; depends=[assertthat bitops R_utils rjson stringr]; }; otinference = derive2 { name="otinference"; version="0.1.0"; sha256="1l75jjnkyk8yzaw9zyk45jq9ys304i6pzm2xd5apxrb1jk75a3li"; depends=[MASS Rglpk sm transport]; }; otpr = derive2 { name="otpr"; version="0.1.0"; sha256="1g2wy64fad67yqvq6mj1hy05vp6kjdm9b6nj0ba395c7hfxvkc7f"; depends=[checkmate curl httr jsonlite]; }; @@ -10552,6 +10713,7 @@ in with self; { outbreaks = derive2 { name="outbreaks"; version="1.5.0"; sha256="00369lnh65nfkcbjd5i39irdv2hcwy5cinb2dvv2x4c2q2ax9f0d"; depends=[]; }; outcomerate = derive2 { name="outcomerate"; version="1.0.1"; sha256="07mwml7r98qjgvrp938sqf7klyspz110583j0zwb72j69n4whmrj"; depends=[Rdpack]; }; outliers = derive2 { name="outliers"; version="0.14"; sha256="0vcqfqmmv4yblyp3s6bd25r49pxb7hjzipiic5a82924nqfqzkmn"; depends=[]; }; + outliertree = derive2 { name="outliertree"; version="1.0"; sha256="02niplg9110f6m0g030a35y9jjizrfhi4q9g20phlllw74q2dnap"; depends=[Rcereal Rcpp]; }; outreg = derive2 { name="outreg"; version="0.2.2"; sha256="04f1x7mxq4swbd7bfwjjgx4838jm6qj4piaighmhcscwrdkxa1cp"; depends=[magrittr reshape2 sandwich stringr tidyr]; }; overlap = derive2 { name="overlap"; version="0.3.2"; sha256="1j3m6ir1chdz0si2fhcw6gs7c9h09bv0chz18rpzxsywww6d4rzy"; depends=[]; }; overlapping = derive2 { name="overlapping"; version="1.5.3"; sha256="1hikhgs0s9zwqn29yqmgr29k4a95x0s2sxz1lhvv0xpfjd8fnrmz"; depends=[ggplot2 testthat]; }; @@ -10566,6 +10728,7 @@ in with self; { p3state_msm = derive2 { name="p3state.msm"; version="1.3"; sha256="0gbrka62ylxx64r3abpk60y92k2lk5smlf8na68qazph8llsl2rv"; depends=[survival]; }; pAnalysis = derive2 { name="pAnalysis"; version="2.0"; sha256="0pykdlbynzgcbnjs8xs8frgncf53l8qgf6na34adq7da76n570hi"; depends=[coin ggplot2]; }; pBrackets = derive2 { name="pBrackets"; version="1.0"; sha256="0cwv609hzp8anfv3cgfbspz8w0g1ljfz05wm4xfhwy15v32fckrj"; depends=[]; }; + pCODE = derive2 { name="pCODE"; version="0.9.2"; sha256="02p2kygyqd6c55wdzzhava9qkzck01mnfa5wccbj6plrxvrpfrz1"; depends=[deSolve fda MASS pracma]; }; pCalibrate = derive2 { name="pCalibrate"; version="0.1-1"; sha256="04a7dmf9sjw44y53i469f8fjm8as2vwr0pgk4s91l63pxdqnjvfl"; depends=[epitools exact2x2 MCMCpack]; }; pGLS = derive2 { name="pGLS"; version="0.0-1"; sha256="1rlk8q09sikf4vpzsx0c7s6qqh2hxf8dy2bgcm4nnkbv2nfjz438"; depends=[MASS]; }; pGMGM = derive2 { name="pGMGM"; version="1.0"; sha256="1hkczz38g8a8253jm8vhm8948fs91g6b2rfzkz47srkkby9ksa4x"; depends=[JGL MASS mvtnorm]; }; @@ -10573,7 +10736,7 @@ in with self; { pKSEA = derive2 { name="pKSEA"; version="0.0.1"; sha256="1k9javxbhx28hf5k3i66ggqwlws2w9qwp01g8f7jmyp92pxr3qqd"; depends=[]; }; pMineR = derive2 { name="pMineR"; version="0.31"; sha256="1j71dcldzmk4kzspx4v5s3vqqkllgwkckfm1g145qgg26c1gyc6l"; depends=[cluster DiagrammeR stringr XML]; }; pRF = derive2 { name="pRF"; version="1.2"; sha256="17srabk7mam16rdzc5g9ggdrhjjk8wibny40gxvgzkv7qgq7m80x"; depends=[dplyr ggplot2 multtest permute randomForest reshape2]; }; - pROC = derive2 { name="pROC"; version="1.15.0"; sha256="1dxxkwdhxfnj2znq4c5ggrr9m5klh5pmfxg17rz59vr2hfb73m24"; depends=[plyr Rcpp]; }; + pROC = derive2 { name="pROC"; version="1.15.3"; sha256="1jx8af9p6sxbypqvj1cci7q9sbyaw310inbjxibjcr3acj59h45h"; depends=[plyr Rcpp]; }; pRSR = derive2 { name="pRSR"; version="3.1.1"; sha256="1irx95b7cwvx3gpn9brjjn4k947m8frz542r18nilc9f1159mb3s"; depends=[]; }; pSI = derive2 { name="pSI"; version="1.1"; sha256="0cvw38dqqlyx7cpl27hq33f5xns2d0019lyr98pwndcnbp09mx0b"; depends=[gdata]; }; pa = derive2 { name="pa"; version="1.2-1"; sha256="1pfgzxirkb0p8f6smjlrbp1qpsh0vsvqf306cvldaj9zx8cw0q9f"; depends=[ggplot2]; }; @@ -10583,7 +10746,7 @@ in with self; { packHV = derive2 { name="packHV"; version="2.2"; sha256="0bj7zhlz2283y1hfdqdn7xil4wscwri1f5hszarwjwczx4n5sv81"; depends=[survival WriteXLS]; }; packMBPLSDA = derive2 { name="packMBPLSDA"; version="0.6"; sha256="0dnj99f8gl5qwn7xjg5jm7hj2ywdmmixbl2ak429ygilf8hlxzwd"; depends=[ade4 DiscriMiner doParallel FactoMineR foreach MASS pROC]; }; packS4 = derive2 { name="packS4"; version="0.9.3"; sha256="0kkh4lfdbr2ydyfpymwrdkms1d4mj8430p6vxvj5wrgl4vh85gwd"; depends=[codetools]; }; - packageRank = derive2 { name="packageRank"; version="0.1.0"; sha256="03jcj76236bzigl9n4hdyqkihvl6kyq611fvx2f5dhhnzaxg28br"; depends=[cranlogs data_table ggplot2 memoise RCurl]; }; + packageRank = derive2 { name="packageRank"; version="0.2.0"; sha256="13gi0n1bzpy1q1ccxsi82bpx8p25wwna3wmgm3nyi8hfwc8bbnks"; depends=[cranlogs data_table ggplot2 memoise RCurl]; }; packagedocs = derive2 { name="packagedocs"; version="0.4.0"; sha256="0zw9ana7s42ardphhdaklba02yjj1v8gliq4l98397mjmzc6f4xd"; depends=[crayon devtools digest evaluate highlight htmltools lazyrmd magrittr rmarkdown stringr whisker yaml]; }; packagefinder = derive2 { name="packagefinder"; version="0.1.4"; sha256="17awdf97fjlncqbglgb2cic4xxa8vpsfpsm6f2wxv7zpg4cdlg2p"; depends=[crayon formattable httr jsonlite lubridate pander stringr tidyr]; }; packagetrackr = derive2 { name="packagetrackr"; version="0.1.1"; sha256="0xjq27j7bd7lps0vp9gdinxn19wl10k2cp9wb2xjih7p6l0wd57g"; depends=[dplyr httr magrittr rappdirs]; }; @@ -10596,7 +10759,7 @@ in with self; { padr = derive2 { name="padr"; version="0.5.0"; sha256="1lckaizlffgdzs7rhlkafam2clqkn3130r4fdnanm2bvd6b0z220"; depends=[dplyr lubridate Rcpp rlang]; }; paf = derive2 { name="paf"; version="1.0"; sha256="0wrqn67jfrjjxwcrkka6dljgi3mdk00vfjkzzcv2v7c97gx1zvwn"; depends=[survival]; }; pafdR = derive2 { name="pafdR"; version="1.0"; sha256="1yimsd4h23hcf752p5flda3dqk8hgn6qm9k0pmbapxj4jbsw14w5"; depends=[curl exams stringr]; }; - pagedown = derive2 { name="pagedown"; version="0.2"; sha256="0hh1vvdnnj6m0s7va96rdb3qa94zxwwhmsm2vsjhid2ijsjmyrzm"; depends=[bookdown htmltools httpuv jsonlite later processx rmarkdown servr xfun]; }; + pagedown = derive2 { name="pagedown"; version="0.3"; sha256="0r4vybm7in39fbw36jlj27sv0g5rw6wm4gwjnz8nfixxh6cbbpb0"; depends=[bookdown htmltools httpuv jsonlite later processx rmarkdown servr websocket xfun]; }; pagenum = derive2 { name="pagenum"; version="1.1"; sha256="0908rlr9sd1a2qwz0idw8ccxhji73sk24gyrdl071lpnd1rs2wl7"; depends=[]; }; pageviews = derive2 { name="pageviews"; version="0.3.0"; sha256="031y67nqqvf3fa2273m7z2cldda0ijh63qwkh4gis3hz9hfril0v"; depends=[curl httr jsonlite]; }; painter = derive2 { name="painter"; version="0.1.0"; sha256="0qr6p13h50rlavcsamxmijfr4dfrbv1k088m28qf8a4gam3ap85b"; depends=[]; }; @@ -10634,13 +10797,15 @@ in with self; { panelAR = derive2 { name="panelAR"; version="0.1"; sha256="1ka2rbl9gs65xh2y2m4aqwh5qj4szibjy101hqfmza9wmdh25gpq"; depends=[car]; }; panelView = derive2 { name="panelView"; version="1.1.2"; sha256="0kbh2g8yynv2mvvndy89lkm5yhy2hr04z52i2ccv9yfrkyignlfp"; depends=[ggplot2 gridExtra]; }; panelaggregation = derive2 { name="panelaggregation"; version="0.1.1"; sha256="0x8ldqb9216pclfvs4ymdpian43v2ydkyflpf0k6lcn35r04xfr6"; depends=[data_table]; }; - panelr = derive2 { name="panelr"; version="0.7.0"; sha256="0cbcp41admy072hqvcym384kg9l5vr67mi2w566bwq5a7ihad090"; depends=[crayon dplyr Formula ggplot2 jtools lme4 lmerTest magrittr purrr rlang stringr tibble]; }; + panelr = derive2 { name="panelr"; version="0.7.1"; sha256="0xd3f3acfjvnryhwdf3aqa3vgpagl87sgd7annn29rk3lznv8rv2"; depends=[crayon dplyr Formula ggplot2 jtools lme4 lmerTest magrittr purrr rlang stringr tibble]; }; panelvar = derive2 { name="panelvar"; version="0.5.2"; sha256="1rr7d0cyz6afxhwqslvcnbfb03cizpfldzwsfnkzxqmxpqasbw80"; depends=[ggplot2 knitr MASS Matrix matrixcalc progress reshape2 texreg]; }; pangaear = derive2 { name="pangaear"; version="0.6.0"; sha256="0dykacf5ckhck08rbk6l5kyw51i2p1ncy44agcxj79cr290cd5ck"; depends=[crul jsonlite oai png rappdirs tibble xml2]; }; papayar = derive2 { name="papayar"; version="1.0"; sha256="11vkjhazfwfixsr6dba5jrcsr3r3mqgvj5s070b4gp70d6k1z8s5"; depends=[htmltools neurobase oro_nifti servr]; }; papeR = derive2 { name="papeR"; version="1.0-4"; sha256="1sc336haqsx6825g7m0z3a4pjklrmnzkq4995dpqwhvdvcikk9jd"; depends=[car gmodels xtable]; }; paperplanes = derive2 { name="paperplanes"; version="0.0.1.9"; sha256="1d9grc95xqxn91lvk8v7w3z90bhl8savkhihwshyjp8ij2xpzfkl"; depends=[]; }; parSim = derive2 { name="parSim"; version="0.1.1"; sha256="1iqxv1qspx6b32qdczdzhc4sdjy5a2pb8mvg8jnc18jydi7ljs64"; depends=[dplyr pbapply]; }; + parade = derive2 { name="parade"; version="0.1"; sha256="07x02j9jlldz4p0cyhw292041l3pziv56bhbzp4f0qpxhcbn5zn4"; depends=[]; }; + paradox = derive2 { name="paradox"; version="0.1.0"; sha256="00rhn8vwlcl4gnvgkqbaqyx9j1ymmgmqjry3smhc5xqnclx2spzs"; depends=[backports checkmate data_table mlr3misc R6]; }; parallelDist = derive2 { name="parallelDist"; version="0.2.4"; sha256="0gqf9vi9hlbflxj941jv7hli8jiy2sqg8b312h401f8rkfqa9ckv"; depends=[Rcpp RcppArmadillo RcppParallel]; }; parallelMCMCcombine = derive2 { name="parallelMCMCcombine"; version="1.0"; sha256="05krkd643awqhfrylq9lxr2cmgvnm1msn2x8p1l1483n2gzyklz7"; depends=[mvtnorm]; }; parallelML = derive2 { name="parallelML"; version="1.2"; sha256="05j0rb81i8342m8drwgmgi1w30q96yf501d83cdq4zhjbchphbl1"; depends=[doParallel foreach]; }; @@ -10666,8 +10831,8 @@ in with self; { parsec = derive2 { name="parsec"; version="1.2.3"; sha256="142zxj34qsf0s537bcabf04yi2qfmy65bgczpkvbyv5vkajxl10v"; depends=[igraph netrankr]; }; parsedate = derive2 { name="parsedate"; version="1.2.0"; sha256="0gb3w6hmwxayhijpf36p5dk4h6bbdps57x3cgikwvvxkgi83rarr"; depends=[rematch2]; }; parsemsf = derive2 { name="parsemsf"; version="0.1.1"; sha256="0ks4503k06ib5lq4ar2rg0sdni99rjcqxj76b0mclasxbi07kjsa"; depends=[DBI dbplyr dplyr lazyeval RSQLite stringr tidyr]; }; - parsetools = derive2 { name="parsetools"; version="0.1.0"; sha256="19mf92qjhqcdhmf3affwm8zk965xnay848csm9glcb2a6lh0nhqq"; depends=[]; }; - parsnip = derive2 { name="parsnip"; version="0.0.2"; sha256="0q0ygm0j1wdjlgzzc4cvi43is7jxkzf7vcky3yf2cny923rgbj22"; depends=[dplyr generics globals glue magrittr purrr rlang tibble tidyr]; }; + parsetools = derive2 { name="parsetools"; version="0.1.1"; sha256="0fl06h4aph0rr55n3c4gw9wkblvjipgyl5drpycmpldj8kix1nz2"; depends=[]; }; + parsnip = derive2 { name="parsnip"; version="0.0.3"; sha256="1s9nm831q5kjmpym2lalcqx7jb1fh58v0vpljjqj5w1vxfbv83kg"; depends=[dplyr generics globals glue magrittr purrr rlang tibble tidyr vctrs]; }; partDSA = derive2 { name="partDSA"; version="0.9.14"; sha256="1kp0cdsdjiay349jz22iqfzvspny8s343cfan8xahgf931k9h8p6"; depends=[survival]; }; partialAR = derive2 { name="partialAR"; version="1.0.11"; sha256="1x7vsrjn91nr4bbkzz9mp8h93j9yhwwaqw1abh5n3bsrkq3xmgqj"; depends=[data_table ggplot2 KFAS MASS plot3D Rcpp tseries urca zoo]; }; partialCI = derive2 { name="partialCI"; version="1.2.0"; sha256="0hi936yg4g5bg61ix2i68f8q4c5nvvshl2728ynz1rl970qfcrp7"; depends=[data_table ggplot2 glmnet KFAS MASS partialAR Rcpp TTR zoo]; }; @@ -10681,7 +10846,7 @@ in with self; { partools = derive2 { name="partools"; version="1.1.6"; sha256="0w7p88y4ab4v14k16k95cyb5f3yl2g6ban11775rmi2h9xqkfxk8"; depends=[data_table pdist regtools]; }; partsm = derive2 { name="partsm"; version="1.1-2"; sha256="0cv3lgkdkn97bc85iwlv9w5pmqwwwsgb717zxnbgb5mzf4xn3f3g"; depends=[]; }; party = derive2 { name="party"; version="1.3-3"; sha256="1sbwpwxdz81ikp64kc0s06vdwy04bccff2kr0phwx9235nhfwwlz"; depends=[coin modeltools mvtnorm sandwich strucchange survival zoo]; }; - partykit = derive2 { name="partykit"; version="1.2-4"; sha256="1fkmgr0h8fhigz4fbzw9ggv66yagfx5p9xmdfpp12ysd2l8gibyn"; depends=[Formula inum libcoin mvtnorm rpart survival]; }; + partykit = derive2 { name="partykit"; version="1.2-5"; sha256="17324y5v65i0va2mvm26gl89s01xwcffg34fwq1mvylk1xwk13pl"; depends=[Formula inum libcoin mvtnorm rpart survival]; }; parviol = derive2 { name="parviol"; version="1.1"; sha256="1sfgic86ssd5wjf9ydss9kjd3m4jmm2d1v896sjsv8bydwymbpx3"; depends=[vioplot]; }; passport = derive2 { name="passport"; version="0.2.0"; sha256="1jiwivrz7781zmwxmw13rxl80cr9r5pinnk5bvqz8nhfmlx0zmgd"; depends=[]; }; password = derive2 { name="password"; version="1.0-0"; sha256="1ijzqdw54l8wvpy6ys28njvhplzjxzzi5i9y41vjnrr88n13977v"; depends=[]; }; @@ -10705,20 +10870,20 @@ in with self; { pavo = derive2 { name="pavo"; version="2.2.0"; sha256="0bbmgjc63i6vx0grs97y6jg9q44vnjhik93zzkagq532mnggjiqv"; depends=[cluster geometry magick pbmcapply plot3D rcdd sp viridisLite]; }; pawacc = derive2 { name="pawacc"; version="1.2.2"; sha256="0d5k0bq8zmb7sjvba3ljp97mba2iycnw44rnsnn2aajs02l1c2xg"; depends=[SparseM]; }; pawls = derive2 { name="pawls"; version="1.0.0"; sha256="01sf1cmd216ca5iwmw4hfnxi9lvh16r441cfcaa3n77zhq0i4w7n"; depends=[]; }; - paws = derive2 { name="paws"; version="0.1.1"; sha256="13n4nidjqrxbjxy3sljwnaxp6djc5p4xp9ga150cm1pq612gahcp"; depends=[paws_analytics paws_application_integration paws_compute paws_cost_management paws_customer_engagement paws_database paws_machine_learning paws_management paws_networking paws_security_identity paws_storage]; }; - paws_analytics = derive2 { name="paws.analytics"; version="0.1.0"; sha256="1saxh832i98hvhv9j1p21c4gdqvx4p3k43fk3372s58ydqw2gvff"; depends=[paws_common]; }; - paws_application_integration = derive2 { name="paws.application.integration"; version="0.1.0"; sha256="1z6brk6f6hjmyvjiy7znjm6w6p8aqmxkij3rg918b010zsbm5829"; depends=[paws_common]; }; + paws = derive2 { name="paws"; version="0.1.3"; sha256="0958g52pvs17kqxv849ycr3zw3vhk509yazqw03aahp0aqm64jhf"; depends=[paws_analytics paws_application_integration paws_compute paws_cost_management paws_customer_engagement paws_database paws_machine_learning paws_management paws_networking paws_security_identity paws_storage]; }; + paws_analytics = derive2 { name="paws.analytics"; version="0.1.3"; sha256="0bhmhlbads3ycsz018jv5xfznv71gg8whskf0qlfq7kdq61z05mh"; depends=[paws_common]; }; + paws_application_integration = derive2 { name="paws.application.integration"; version="0.1.3"; sha256="1vk4mif4mk5zjwmpfvh8sywp706ibwf3hv1bw0miih7rn8z44bl2"; depends=[paws_common]; }; paws_common = derive2 { name="paws.common"; version="0.1.1"; sha256="02cxcgpjla9cfnkfh1pllr9x58whsnnl81rwqq9xj7mficrbl2vj"; depends=[base64enc digest httr ini jsonlite xml2]; }; - paws_compute = derive2 { name="paws.compute"; version="0.1.0"; sha256="1bc84lks6dc1fqlhlbqwv9c4yrqbcsmbahzvqpy1zwxq4p768sma"; depends=[paws_common]; }; - paws_cost_management = derive2 { name="paws.cost.management"; version="0.1.0"; sha256="1bl1fw31bp5r1fkxk7sx2a4nn7ql2l73wjrv54akm79iq1ycifp9"; depends=[paws_common]; }; - paws_customer_engagement = derive2 { name="paws.customer.engagement"; version="0.1.0"; sha256="083ny77f3xbv6pgpaz83maddk81fpd94z4gh10wm151swc7mrj9j"; depends=[paws_common]; }; - paws_database = derive2 { name="paws.database"; version="0.1.0"; sha256="0zc9d15j5f758pbyqvfw0in9hgijbz0cm7nb22nkgl1kc6vnfq1w"; depends=[paws_common]; }; - paws_machine_learning = derive2 { name="paws.machine.learning"; version="0.1.0"; sha256="0p1lvkxpgr3qggrqg05bqv95xvsrq669x9bqc1wqa06xsbyr3j7i"; depends=[paws_common]; }; - paws_management = derive2 { name="paws.management"; version="0.1.0"; sha256="0903cx9c9xxcx2gb625zca8kajwyxv1h3yywdj2ybgabxvkhwcyn"; depends=[paws_common]; }; - paws_networking = derive2 { name="paws.networking"; version="0.1.0"; sha256="1r3npikm9xvl9v8x6xqmg6gv5c6zp12a98zyy4y68spiksmspza4"; depends=[paws_common]; }; - paws_security_identity = derive2 { name="paws.security.identity"; version="0.1.0"; sha256="0s4lgsjr8p4gi03dwnss4fiz6yrdgaqiz48d03960yqhflccshka"; depends=[paws_common]; }; - paws_storage = derive2 { name="paws.storage"; version="0.1.0"; sha256="18nk4vj79hp94wq2xlg8w8i0vl27gy915ik5rp8fdny7568rg79p"; depends=[paws_common]; }; - pbapply = derive2 { name="pbapply"; version="1.4-0"; sha256="0bn7a9ni36xy5acnrl9ky3gd1k8jr5kxgazzh3pzd1q6bri1nx7k"; depends=[]; }; + paws_compute = derive2 { name="paws.compute"; version="0.1.3"; sha256="0wf516y5xla3bgj1m84qx760xk4v10zpb9wkn4wyh94jx1pb9vl1"; depends=[paws_common]; }; + paws_cost_management = derive2 { name="paws.cost.management"; version="0.1.3"; sha256="0axk4lwhq56q6sg5lcycp5y5isd6gwymiim65swkb1n28qxdcymq"; depends=[paws_common]; }; + paws_customer_engagement = derive2 { name="paws.customer.engagement"; version="0.1.3"; sha256="1qchc8sn7prd9612fw7h63r1xl0hdrygwfs488kxbl5h3blikl58"; depends=[paws_common]; }; + paws_database = derive2 { name="paws.database"; version="0.1.3"; sha256="0p1ykkmk3j8szz76ga84rph7zm56c5h5bkwig3wbdaj8y5p5wdf1"; depends=[paws_common]; }; + paws_machine_learning = derive2 { name="paws.machine.learning"; version="0.1.3"; sha256="17b9nih71d5agcqg9g2w59qfqcggp3krw7l1wfga5vrgdq1zgbdq"; depends=[paws_common]; }; + paws_management = derive2 { name="paws.management"; version="0.1.3"; sha256="1qyi0zpqgjkh1sfqqxaj5yjk8sml2p27gvm5hpbam33crldcbf7h"; depends=[paws_common]; }; + paws_networking = derive2 { name="paws.networking"; version="0.1.3"; sha256="08whzrwgk1aj2g3j968v56y3bavxvgalm6wxw3ay5dbcwinj15nl"; depends=[paws_common]; }; + paws_security_identity = derive2 { name="paws.security.identity"; version="0.1.3"; sha256="0mq3p1j0fa8clmja4q1i4m8w5qc1icyq39zl0q003h46128biywm"; depends=[paws_common]; }; + paws_storage = derive2 { name="paws.storage"; version="0.1.3"; sha256="1c02nazvp4dcnpb4yf75lg7ppk885qv7r1v0yq86i17rb37rg60f"; depends=[paws_common]; }; + pbapply = derive2 { name="pbapply"; version="1.4-1"; sha256="1bbws9n90cqnnp5k58hp852jwmm6513jnhn4vzhl9f8x314k6qxk"; depends=[]; }; pbatR = derive2 { name="pbatR"; version="2.2-13"; sha256="01ra1ggdpxdl1xqjdh86qynr5gkgzw01ww6j9bwgx4mj20i6j1ha"; depends=[rootSolve survival]; }; pbdBASE = derive2 { name="pbdBASE"; version="0.5-0"; sha256="11jlfr0pswldd5h06swfrc8bm785dv09iqgg3kfnc53yvrs0d7qv"; depends=[pbdMPI pbdSLAP]; }; pbdDEMO = derive2 { name="pbdDEMO"; version="0.3-1"; sha256="0vr3dvvhr8j6xvdf308nn37y0lkl2ysm93yf0h7rclvqvsk1pf66"; depends=[pbdBASE pbdDMAT pbdMPI]; }; @@ -10732,12 +10897,12 @@ in with self; { pbivnorm = derive2 { name="pbivnorm"; version="0.6.0"; sha256="05jzrjqxzbcf6z245hlk7sjxiszv9paadaaimvcx5y5qgi87vhq7"; depends=[]; }; pbkrtest = derive2 { name="pbkrtest"; version="0.4-7"; sha256="1si3bhi59xc51a0pgjjglccq3h4aljyhw2k1b8574s145fnh7fsw"; depends=[lme4 MASS Matrix]; }; pbm = derive2 { name="pbm"; version="1.1.0"; sha256="054navz4fmn25nq3lsfnsnm35shj9wq4qz69d4ajw0q09gnb1cy8"; depends=[]; }; - pbmcapply = derive2 { name="pbmcapply"; version="1.4.1"; sha256="063kgrdj2lmcgfdhplk8b05lpqay2qfgfmw7r3flq87mb2sfw6da"; depends=[]; }; + pbmcapply = derive2 { name="pbmcapply"; version="1.5.0"; sha256="0i58gcqpnbyvc448qfgm45b7rpbmrnagsvk1h1hsqchbbicfslnz"; depends=[]; }; pbo = derive2 { name="pbo"; version="1.3.4"; sha256="0v522z36q48k4mx5gym564kgvhmf08fsadp8qs6amzbgkdx40yc4"; depends=[lattice]; }; pbs = derive2 { name="pbs"; version="1.1"; sha256="0cpgs6k5h8y2cia01zs1p4ri8r7ljg2z4x8xcbx73s680dvnxa2w"; depends=[]; }; pbv = derive2 { name="pbv"; version="0.2-16"; sha256="1jr0xvk56d7qqpj7azw64lidwc3604iw87k7cccswv4yvbihvzzk"; depends=[Rcpp RcppArmadillo]; }; - pcFactorStan = derive2 { name="pcFactorStan"; version="0.11"; sha256="0z49mxwhx2rblq21z5kylqwzw107abwqv5zni3a5vqs7f0nw9v5i"; depends=[BH igraph mvtnorm Rcpp RcppEigen reshape2 rstan StanHeaders]; }; - pcIRT = derive2 { name="pcIRT"; version="0.2.3"; sha256="1gr4rij7anvfzbs4pvzhvfl0msbm83qs5n588l4jbraxqynvmkaw"; depends=[combinat Rcpp]; }; + pcFactorStan = derive2 { name="pcFactorStan"; version="1.0.2"; sha256="190hvyl957hffy8s65iaxyirgja04b2l37hmd9sg1aldmixz0cym"; depends=[BH igraph loo mvtnorm Rcpp RcppEigen reshape2 rstan StanHeaders]; }; + pcIRT = derive2 { name="pcIRT"; version="0.2.4"; sha256="0crll51s14nisnaxjln7bc3b1a181v358nfkh1p5iiyn98clacl6"; depends=[combinat Rcpp]; }; pcLasso = derive2 { name="pcLasso"; version="1.1"; sha256="1wdwin6xszysydspxjb8b6r3y416ri3zndh0s142b2487lhmqkb6"; depends=[svd]; }; pca3d = derive2 { name="pca3d"; version="0.10"; sha256="1bpm4sbj7h2fd0h5ybjhq8g61l8v2fbc92yiiascdgfili85zsf3"; depends=[ellipse rgl]; }; pcaBootPlot = derive2 { name="pcaBootPlot"; version="0.2.0"; sha256="1320d969znk9xvm1ylhc3a31nynhzyjpbg1fsryq72nhf8jxijaa"; depends=[FactoMineR RColorBrewer]; }; @@ -10759,13 +10924,13 @@ in with self; { pcrcoal = derive2 { name="pcrcoal"; version="1.2.0"; sha256="0rd610ny8p7by3gi6kk130ii0qcswqsng5mzmxz8hrxqk0cs4c9x"; depends=[ape ggplot2 phylosim]; }; pcrsim = derive2 { name="pcrsim"; version="1.0.2"; sha256="04177xl513k01prmf93kha91dyxmb9v80d1y4lz73fxsifj6bhar"; depends=[data_table ggplot2 gWidgets mc2d plyr strvalidator]; }; pcse = derive2 { name="pcse"; version="1.9.1.1"; sha256="1rb9146vjkf36vc5v3frykmsff7kp6qp1hhmj8pak583in4rz8f8"; depends=[]; }; - pct = derive2 { name="pct"; version="0.2.2"; sha256="12rbyvmcqxd73mc6n1w40p7n3z7aj8l94kc66p6sqknmw9wd4426"; depends=[boot readr sf stplanr]; }; - pdR = derive2 { name="pdR"; version="1.6"; sha256="0rdsffbi9fnrrm0vf5mms19rsfxfv177mp1fql0nmmcqjpjn39z8"; depends=[boot car coefplot lmtest papeR plm sandwich]; }; + pct = derive2 { name="pct"; version="0.2.4"; sha256="02nskkrl6qasbzhvwijs9q7sk4j7ylkam9wfmhrqa6m8bkhxqg7s"; depends=[boot readr sf stplanr]; }; + pdR = derive2 { name="pdR"; version="1.7"; sha256="05rnyb9znb71ilr9kf62x30knby1rm0p4ain220wvb62vkz054d7"; depends=[boot car coefplot lmtest papeR plm sandwich]; }; pdSpecEst = derive2 { name="pdSpecEst"; version="1.2.3"; sha256="0kqph8134g1fyzc9b06nighkqsh6jjpckvwxhpslihj5sj3kapdd"; depends=[ddalpha multitaper Rcpp RcppArmadillo Rdpack]; }; pdc = derive2 { name="pdc"; version="1.0.3"; sha256="0503n7aiy0qrl790yfjvpm7bbyz1i4818rlg96q0fvzb58zqmyvc"; depends=[]; }; pder = derive2 { name="pder"; version="1.0-0"; sha256="097klk334bjhlss8x73f27l7jcp7d7vh10jr5sazm5kcvi95619i"; depends=[]; }; pdfCluster = derive2 { name="pdfCluster"; version="1.0-3"; sha256="13m7b2wivvf58vyqbysj4r04w0nj2b5x0xnaxip712a6c66x1h7l"; depends=[geometry]; }; - pdfetch = derive2 { name="pdfetch"; version="0.2.3"; sha256="1fcjhq79dcbnghmkfpy1h29gcywr1hq91xij5f21wgp4xx465sha"; depends=[curl httr jsonlite lubridate readr reshape2 XML xml2 xts zoo]; }; + pdfetch = derive2 { name="pdfetch"; version="0.2.4"; sha256="0qskxak1mb8h038ly4hlsjvkz8nyinaraqh5f91d8nyzjzhj7x3c"; depends=[curl httr jsonlite lubridate readr reshape2 XML xml2 xts zoo]; }; pdfsearch = derive2 { name="pdfsearch"; version="0.3.0"; sha256="0mk1s8b7cdz025xn9kg5xnw388sndhjm80ckf71daxviknrzcscf"; depends=[pdftools stringi tibble tokenizers]; }; pdftables = derive2 { name="pdftables"; version="0.1"; sha256="1gnwjijr89cczchc7yi4w5xiw0dalbymvj23rymm8cfra34iwn5p"; depends=[httr]; }; pdftools = derive2 { name="pdftools"; version="2.2"; sha256="1cvmr33jx09r7d76q0g8bd0ik4xa304n42b7psw1lj8a3a4wrk0l"; depends=[qpdf Rcpp]; }; @@ -10807,10 +10972,11 @@ in with self; { perARMA = derive2 { name="perARMA"; version="1.6"; sha256="0k70lcqhiiffrwzvh51asnhx68qxpnjnxadarvgpgbc7kfy7lv9x"; depends=[corpcor gnm matlab Matrix signal]; }; perccal = derive2 { name="perccal"; version="1.0"; sha256="1akak068d0g70amj5sbvnqbywzy21l4wz11mhp71b7cp4xmr9n12"; depends=[Rcpp RcppArmadillo RcppEigen]; }; perccalc = derive2 { name="perccalc"; version="1.0.3"; sha256="0x895b75fjipzv7ff9mz7qpcabm9zys3bjsalk6h2q2350lwjmq1"; depends=[broom dplyr magrittr multcomp purrr tibble tidyr]; }; + perfectphyloR = derive2 { name="perfectphyloR"; version="0.1.3"; sha256="05awwlsams9qc75hxl362scjsfz65kd250a5a545yniljr6wm6zl"; depends=[ape dendextend HHG phytools Rcpp RcppArmadillo]; }; performance = derive2 { name="performance"; version="0.2.0"; sha256="1pzd6z7i1jxr2xi1shg3d0bxlbpmjl7kpmwgjnfys6syv57znd1z"; depends=[bayestestR insight]; }; performanceEstimation = derive2 { name="performanceEstimation"; version="1.1.0"; sha256="08jx2zl6xh0rp54xa70gb717wbfdzfrx9b47i3b3ly41qaf85vrc"; depends=[dplyr ggplot2 parallelMap tidyr]; }; pergola = derive2 { name="pergola"; version="1.0"; sha256="1650ipp2b455xdkznwm7bnxvimad7nbyr9i1lg2vdh64j1qfh7gl"; depends=[seriation]; }; - periscope = derive2 { name="periscope"; version="0.4.2"; sha256="1i4i0gnsgcayvbrkxwglcvis4y0v41lmbb0axwdc60ylw31rv1q8"; depends=[DT ggplot2 logging lubridate openxlsx shiny shinyBS shinydashboard]; }; + periscope = derive2 { name="periscope"; version="0.4.3"; sha256="1mnqav4f5m2jj17853xwy0fmndm6ywk3q6qq4m5j60f2cb866mbl"; depends=[DT ggplot2 logging lubridate openxlsx shiny shinyBS shinydashboard]; }; perm = derive2 { name="perm"; version="1.0-0.0"; sha256="0075awl66ynv10vypg63fcxk33qzvxddrp8mi4w08ysvimcyxijk"; depends=[]; }; permDep = derive2 { name="permDep"; version="1.0.2"; sha256="0dv740vnjy99rc6px8w4ngis3w6zc4c67m0bx2lh327sqb7q3zsd"; depends=[BB survival]; }; permGPU = derive2 { name="permGPU"; version="0.14.9"; sha256="10r2qxbvzjxv3520lrn6cwi5akhhwgkhz7yaqxi5vh2f5l0s49wy"; depends=[Biobase foreach RUnit survival]; }; @@ -10820,7 +10986,7 @@ in with self; { permuco = derive2 { name="permuco"; version="1.0.2"; sha256="0mms11j2x3rw7c9pq2pb2wvcvx0a14p20clysa2b081xgmzx3971"; depends=[Matrix permute]; }; permutations = derive2 { name="permutations"; version="1.0-4"; sha256="1i40impzc6vd3zbrhw8jflsafp8brc60hl2vswn6a8qan4k8p2jn"; depends=[magic numbers partitions]; }; permute = derive2 { name="permute"; version="0.9-5"; sha256="0ra8p5mf2590azrkas8z2ry7mif77xqxd29n4zgyi5vll225726j"; depends=[]; }; - permutes = derive2 { name="permutes"; version="0.1.1"; sha256="1khkpalnx5rm5vz3nz3arwzryl2r5r8jfm7s0drl3sadym48cxfk"; depends=[ggplot2 lmPerm plyr viridis]; }; + permutes = derive2 { name="permutes"; version="1.0"; sha256="1lrhlqwv1y2vgklgwp16jw90vmgifnp4rlxw55hhj8gs97agv5y8"; depends=[ggplot2 lmPerm plyr viridis]; }; perry = derive2 { name="perry"; version="0.2.0"; sha256="1lfmcq2xsxmfs7cxvhgxcsggslgjicbaks4wcjw1yjh67n559j46"; depends=[ggplot2 robustbase]; }; persiandictionary = derive2 { name="persiandictionary"; version="1.0"; sha256="0rgi36ngpiax3p5zk4cdgf3463vgx7zg5wxscs2j7834yh37jwax"; depends=[]; }; personalized = derive2 { name="personalized"; version="0.2.4"; sha256="0yn07mxngyx0vnxn47h6pnfn1g9rp5kd30yd4hcsrw03hvbdsb35"; depends=[foreach gbm ggplot2 glmnet kernlab mgcv plotly survival]; }; @@ -10855,7 +11021,9 @@ in with self; { phase1RMD = derive2 { name="phase1RMD"; version="1.0.8"; sha256="1wvlajsqb8y8f30asq1lyk87kmakh2risnky98g5gday765y90qa"; depends=[arrayhelpers boot coda ggplot2 mvtnorm rjags]; }; phaseR = derive2 { name="phaseR"; version="2.0"; sha256="14shpsyrcz1j0bl60vh37cpcvmry48s76xlf4f9lmq4l5vynhrcn"; depends=[deSolve]; }; phateR = derive2 { name="phateR"; version="0.4.1"; sha256="13vqrxbshk62wk4myhwyp4a7k6i9synknvmfah3l1pg2b3b3dqmj"; depends=[ggplot2 Matrix reticulate]; }; + phd = derive2 { name="phd"; version="0.1"; sha256="1scwan3pkhdl0nyhpjrkcal1f58x0jkdkhixdcxppr1363r1v22a"; depends=[glmnet]; }; pheatmap = derive2 { name="pheatmap"; version="1.0.12"; sha256="1hdh74az3vyzz6dqa311rhxdm74n46lyr03p862kn80p0kp9d7ap"; depends=[gtable RColorBrewer scales]; }; + phenModel = derive2 { name="phenModel"; version="1.0"; sha256="07jsc8jiwgxvhv4m6nr7llm22zzh5hd3pakw5c93jzim2835zvkp"; depends=[dplyr ggplot2 reshape]; }; phenability = derive2 { name="phenability"; version="2.0"; sha256="0can8qgdpfr4h6jfg23cnwh7hhmwv6538wg2jla9w138la7rhpd1"; depends=[calibrate]; }; phenex = derive2 { name="phenex"; version="1.4-5"; sha256="00lsymflbmlxzxz8rxcpc94pc9zmhybial9f2xkz98h6h45zgrjl"; depends=[DEoptim foreach]; }; phenmod = derive2 { name="phenmod"; version="1.2-3"; sha256="0dxwx8c7zka29fq7svrvn8bghj8jh8grbrgsw4pvavx2439cldak"; depends=[gstat lattice pheno RColorBrewer]; }; @@ -10899,13 +11067,13 @@ in with self; { phylobase = derive2 { name="phylobase"; version="0.8.6"; sha256="1n9g69llrh8xfmrnxh78rr09cxy5qbc99dr3amg121pl1qhpn4g7"; depends=[ade4 ape Rcpp rncl RNeXML]; }; phylocanvas = derive2 { name="phylocanvas"; version="0.1.3"; sha256="1l5br500lwwf7vp8wph5ykpkpqd15lypvhzy0c1cc8g8c6f7pckn"; depends=[ape htmlwidgets phylobase]; }; phyloclim = derive2 { name="phyloclim"; version="0.9.5"; sha256="107kilh0gwr84ig54g92zyk7zv553pky2bzpjqgf9fjwbm6fvmrs"; depends=[ape raster sp]; }; - phylocomr = derive2 { name="phylocomr"; version="0.1.2"; sha256="1x5ygzd4rkgxk0pczpjp2g7n98jl48rx560jqyjv0bdvlafy3l83"; depends=[sys tibble]; }; + phylocomr = derive2 { name="phylocomr"; version="0.1.4"; sha256="1jaznba7mmizkx7xipxr9l89j6cmpq7rrsg9jjl4wi8sdv2s7fcc"; depends=[sys tibble]; }; phylocurve = derive2 { name="phylocurve"; version="2.0.9"; sha256="1d01nwfpyh61r00dq6cnhxdwzk81jr3l6aa51dl1wck4cy0frscp"; depends=[ape doParallel drc dtw foreach geiger geomorph GPfit Matrix mvnmle phylolm phytools Rcpp RcppArmadillo rgl]; }; phylogram = derive2 { name="phylogram"; version="2.1.0"; sha256="1p4h5pirc0m5pzc18q0jk3mcmb5n48gdf9abz03vml3a209xxl2v"; depends=[ape]; }; phyloland = derive2 { name="phyloland"; version="1.3"; sha256="10g40m6n2s4qvnzlqcwpy3k0j7bxdp79f586jj910b8p00ymrksp"; depends=[ape]; }; phylolm = derive2 { name="phylolm"; version="2.6"; sha256="0vah8ibicldi57wab4sk1kx7gdq6h34bm6swmxzhq7kikxfwmmyj"; depends=[ape future_apply]; }; phylometrics = derive2 { name="phylometrics"; version="0.0.1"; sha256="1pmr6l3wmaf91wdlsc5m63l07fibngnly2qzkma0rdi463ii03il"; depends=[mvtnorm]; }; - phylopath = derive2 { name="phylopath"; version="1.0.2"; sha256="0ngfqi3fx646r5szbzbsh5g7zkrs29swpx7csr3nwzj8n12bqbfp"; depends=[ape dplyr ggm ggplot2 ggraph igraph MuMIn pbapply phylolm purrr tibble tidyr]; }; + phylopath = derive2 { name="phylopath"; version="1.1.0"; sha256="14waw2kw624vlnk786hdyq06vmvrmnl24a05hwwycn7bbmhbr2cx"; depends=[ape ggm ggplot2 ggraph igraph MuMIn pbapply phylolm purrr tibble]; }; phyloseqGraphTest = derive2 { name="phyloseqGraphTest"; version="0.0.2"; sha256="1xgv2kf7j3ia5vk10r7w9588rfv7asdaf8f3yxwp5q7aqn3krm6q"; depends=[ggnetwork ggplot2 igraph intergraph phyloseq]; }; phylosignal = derive2 { name="phylosignal"; version="1.2.1"; sha256="10ds4vn5rw3nrgvsg2n0b53bivy54p5j7fmnqn81alzz9irgrkcs"; depends=[adephylo ape boot DBI igraph phylobase Rcpp RcppArmadillo]; }; phylosim = derive2 { name="phylosim"; version="3.0.4"; sha256="08ajpb3gjglgx2s4jqbpgpcm01hz4p9c3wacfmq0wl1l7sjgsnrs"; depends=[ape compoisson ggplot2 R_methodsS3 R_oo]; }; @@ -10987,11 +11155,11 @@ in with self; { pliable = derive2 { name="pliable"; version="1.1"; sha256="0z1hm4k0q3dgwgd1dy6wl0ydsqzygmn85m6yimffzqvnlmrq3vjg"; depends=[class glmnet]; }; plink = derive2 { name="plink"; version="1.5-1"; sha256="0rn2i9i8af9aq0xgxhpcdchs2952lq2d2sg8x3js0zi3vcml76k0"; depends=[lattice MASS statmod]; }; plinkQC = derive2 { name="plinkQC"; version="0.2.2"; sha256="16kjzfp1prqhai16kvh5sp7wqk54pidydkwn717q6dij1sh0jlaf"; depends=[cowplot data_table dplyr ggforce ggplot2 ggrepel optparse R_utils sys UpSetR]; }; - plm = derive2 { name="plm"; version="2.0-2"; sha256="0349cgyhgcphlzbgnp7avmd3x3wyprvq0kx340wcigay3r8nff92"; depends=[bdsmatrix Formula lattice lmtest MASS maxLik nlme Rdpack sandwich zoo]; }; + plm = derive2 { name="plm"; version="2.1-0"; sha256="0dw6nmjc8acmlbpwvsjdwbf3cxgrjf5sli92rbd3j6snxnsg4qps"; depends=[bdsmatrix Formula lattice lmtest MASS maxLik nlme Rdpack sandwich zoo]; }; 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=[]; }; plogr = derive2 { name="plogr"; version="0.2.0"; sha256="0a8dhzlna79ggyhfr0nncgh15a9n6r0dsz664pz0ah323wpblqqf"; depends=[]; }; - plot_matrix = derive2 { name="plot.matrix"; version="1.1"; sha256="14zi9b7f2hbxx1x6bakamnsx4jxsnkqmqvz481cn1h16h7n63f61"; depends=[]; }; + plot_matrix = derive2 { name="plot.matrix"; version="1.2"; sha256="1d2vhqqnkr113z3rw7vcr5m8izjzz0hn2rggbr5rf23kjdbyrzjj"; depends=[]; }; plot3D = derive2 { name="plot3D"; version="1.1.1"; sha256="0chn70fqwyca8lbnjnpbcj08ni0dfbax2gjmzhk2c4w72c04mzpn"; depends=[misc3d]; }; plot3Drgl = derive2 { name="plot3Drgl"; version="1.0.1"; sha256="12p4qc9vmhr86ssx6xnz3cmx84q5jgd28bw9dp4wjrn04n6l4va6"; depends=[plot3D rgl]; }; plot3logit = derive2 { name="plot3logit"; version="1.0.1"; sha256="14abmxx2fgngximvgrrj8pjy4nyvliydhkp1h7p9xicdfj74pwl5"; depends=[ggplot2 ggtern magrittr reshape2 Ternary]; }; @@ -11002,9 +11170,9 @@ in with self; { plotMElm = derive2 { name="plotMElm"; version="0.1.5"; sha256="0wwqzrpkmq9gzazdzlk62qig6vz43niada6fxh1wcsjqjwkcccgp"; depends=[ggplot2 interactionTest]; }; plotROC = derive2 { name="plotROC"; version="2.2.1"; sha256="0bk8j2lp80zcz4kkig1y5a1ig8vbjh7b4inzc46bn07ns1rdjgzg"; depends=[ggplot2 gridSVG plyr rlang shiny]; }; plotSEMM = derive2 { name="plotSEMM"; version="2.4"; sha256="0fircrayhz92zvkigkyb1zpn07bvssqs1ip15p926zj3rl77fqgy"; depends=[MplusAutomation plotrix plyr Rcpp shiny]; }; - plotdap = derive2 { name="plotdap"; version="0.0.2"; sha256="08h6vd9fcy0yp3c3ihpxp07nngkwfan54s97hp44lay5r3bh5apw"; depends=[dplyr gganimate ggplot2 lazyeval lubridate magrittr mapdata maps maptools plot3D raster rerddap rgdal rgeos scales sf tidyr]; }; + plotdap = derive2 { name="plotdap"; version="0.0.3"; sha256="0ymgbg24k1v853jfd621swhh4g8i77sywbxjzm7pjqcg7wrb1z44"; depends=[dplyr gganimate ggplot2 lazyeval lubridate magrittr maps maptools raster rerddap rgdal rgeos scales sf tidyr]; }; plotfunctions = derive2 { name="plotfunctions"; version="1.3"; sha256="0cnmwkfjg45187j490sf01gxijhajrpi6j13hfckli2ysn6xrgz3"; depends=[]; }; - plothelper = derive2 { name="plothelper"; version="0.1.3"; sha256="0n6pgnpmg9p2c1qczv95pqmh20dqisl27yakbdqkcqqg23252fsw"; depends=[ggfittext ggplot2 gridExtra magick plyr scales]; }; + plothelper = derive2 { name="plothelper"; version="0.1.4"; sha256="0qmzbks70rjhkih0g2xvwd4zsfykxh0i18l61phz77zz71w4nbr1"; depends=[ggfittext ggplot2 gridExtra magick plyr scales]; }; plotluck = derive2 { name="plotluck"; version="1.1.1"; sha256="16wqj4xfa8b7kal6v8mp2zlhwf9l3y6y5n44qbpvy652gzb2rw2z"; depends=[ggplot2 hexbin Hmisc plyr quantreg RColorBrewer scales]; }; plotly = derive2 { name="plotly"; version="4.9.0"; sha256="1kz2hm7vnkn4clxr6yyxxnmdmkz9zwjq6bzysw7j27r3721i8qgp"; depends=[base64enc crosstalk data_table digest dplyr ggplot2 hexbin htmltools htmlwidgets httr jsonlite lazyeval magrittr promises purrr RColorBrewer rlang scales tibble tidyr viridisLite]; }; plotlyGeoAssets = derive2 { name="plotlyGeoAssets"; version="0.0.2"; sha256="1c6i4dz5qmym1pcddgffcqgb76jz84252xldprg2caylrqvzv6b7"; depends=[]; }; @@ -11023,6 +11191,7 @@ in with self; { plsdepot = derive2 { name="plsdepot"; version="0.1.17"; sha256="1i00wxr451xpfy6dnvcm11aqf9106jsh5hj7gpds22ysgm4iq5w4"; depends=[]; }; plsdof = derive2 { name="plsdof"; version="0.2-9"; sha256="1g41nbycgzjwrackbdf08q1phqpyy6zihm5ak2728683vd88fxzv"; depends=[MASS]; }; plsgenomics = derive2 { name="plsgenomics"; version="1.5-2"; sha256="1pvb50nv6jc99bm2hsxpzazg26y49yi24wwwim5xcjj6j1szbip4"; depends=[boot fields MASS plyr reshape2 RhpcBLASctl]; }; + plsmselect = derive2 { name="plsmselect"; version="0.1.3"; sha256="0j5g0hlm2zk02ygp0692b3721xdhdy7lf8pmwbfq5dkrxq805jhj"; depends=[dplyr glmnet mgcv survival]; }; plspm = derive2 { name="plspm"; version="0.4.9"; sha256="03aj1ffq11hh931dbkxy9ba74xyvzmr1ylrj4fw1rbryrwqg89v6"; depends=[amap diagram shape tester turner]; }; plspm_formula = derive2 { name="plspm.formula"; version="1.0.1"; sha256="1i2d1q8pz21js1ci8afnqzcky430hh1iwf5f6jr3j9yr9gs365k5"; depends=[plspm]; }; plsr = derive2 { name="plsr"; version="0.0.1"; sha256="0l413m49zjpb35v0zw8dlxn53nh7fghinbmwfmldl3jgdvay2s7x"; depends=[boot ggplot2 reshape2 shiny]; }; @@ -11044,7 +11213,7 @@ in with self; { pmmlTransformations = derive2 { name="pmmlTransformations"; version="1.3.3"; sha256="0315kb5x04pidpzr04yaxyynp0mz4ilzp7vkspq4agjkds5hyc88"; depends=[]; }; pmpp = derive2 { name="pmpp"; version="0.1.0"; sha256="1vmv7aav0rvp7kd5f16ym422ygw1wpnwrhmmp2w1c2fl8i263zh9"; depends=[data_table dplyr ggplot2 magrittr MASS Matrix minqa moments plm pracma]; }; pmr = derive2 { name="pmr"; version="1.2.5"; sha256="0dq97dfjmgxlhr3a2n20vyyzfmamcicw878hdxpw31lw02xs6yls"; depends=[]; }; - pmsampsize = derive2 { name="pmsampsize"; version="1.0.0"; sha256="10qps352524k0xkmssv3qxf1jvkvm7zf4pshki7xywcgp1318n57"; depends=[]; }; + pmsampsize = derive2 { name="pmsampsize"; version="1.0.1"; sha256="1463pw28f09f9yvn4lhlsiz1cv017i693i73rvlq94qb3fzar5yw"; depends=[]; }; pmultinom = derive2 { name="pmultinom"; version="1.0.0"; sha256="0p2amb3y4jl24r21fii1qpmdbn5pfgywrx8k7x1jxpg49rk7k0rp"; depends=[fftw]; }; pmxTools = derive2 { name="pmxTools"; version="0.1.1"; sha256="0ryvbrk0f5x6b8rx479ifhk651wzg32zb4kn75dbjgh9q2qnsqhl"; depends=[GGally ggplot2 magrittr MASS PKNCA plyr stringr XML]; }; png = derive2 { name="png"; version="0.1-7"; sha256="0g2mcp55lvvpx4kd3mn225mpbxqcq73wy5qx8b4lyf04iybgysg2"; depends=[]; }; @@ -11063,6 +11232,7 @@ in with self; { poisDoubleSamp = derive2 { name="poisDoubleSamp"; version="1.1"; sha256="13wyj9jf161218y4zjv2haavlmanihp9l59cvh7x8pfr9dh2dwr8"; depends=[Rcpp]; }; poisFErobust = derive2 { name="poisFErobust"; version="1.0.1"; sha256="0qgwl5gb2rw043zb0h1rrv038ymsd72r8h9gqdr2xkfbi3mnr24r"; depends=[data_table glmmML]; }; poisbinom = derive2 { name="poisbinom"; version="1.0.1"; sha256="0mjxg0s3nck7qrmq4bbrhwxfwr6fqml54s9k8q1mkfzlifa7qyf7"; depends=[Rcpp]; }; + poismf = derive2 { name="poismf"; version="0.1.1"; sha256="0pwf8wazqmg7lw36ypzzx4ygv4by1kbl0614i5g180qpzmw2jg1j"; depends=[Matrix nonneg_cg Rcpp SparseM]; }; poisson = derive2 { name="poisson"; version="1.0"; sha256="1diyf1b84sr6iai3ghd3kcp6fc6w7fan49wzs1lzvxxsmp15ag2d"; depends=[]; }; poisson_glm_mix = derive2 { name="poisson.glm.mix"; version="1.2"; sha256="0328m279jfa1fasi9ha304k4wcybzr7hldww7wn0cl7anfxykbv8"; depends=[]; }; poissonMT = derive2 { name="poissonMT"; version="0.3-5"; sha256="14qkc8qz3423b13gp6gsp8cbb1nv9wwjjfa4i9zc15qy5i99ha26"; depends=[checkmate MASS robcbi robustbase]; }; @@ -11070,7 +11240,7 @@ in with self; { poker = derive2 { name="poker"; version="0.8.8"; sha256="14ik77440z22k4kwq0p1fn7adzi0p8mh8j8hd7ayinvrab4b5r85"; depends=[]; }; polidata = derive2 { name="polidata"; version="0.1.0.1"; sha256="0mfjcjhv2prc2xdg9672z1cjxd2wp541hb7lz497cqlig2p6qgb4"; depends=[jsonlite RCurl]; }; poliscidata = derive2 { name="poliscidata"; version="2.2.3"; sha256="18mmdzf9hrfz36rh1rg1j5q1m131xadppy272y4f4yay0ljafbm2"; depends=[abind car descr ENmisc gplots Hmisc plotrix plyr survey weights xtable]; }; - politeness = derive2 { name="politeness"; version="0.3.1"; sha256="1szxljbgavxsjpc1gr88x7gcxgxf9q8zq7fw7skwszz4hl5pqd2j"; depends=[data_table ggplot2 glmnet quanteda spacyr stringr textir tm]; }; + politeness = derive2 { name="politeness"; version="0.3.2"; sha256="0c0ag3g8kwiy835mfc0nacxybk1lc210k26ngc546qzi9kpljx34"; depends=[data_table ggplot2 glmnet quanteda spacyr stringr textir tm]; }; politicaldata = derive2 { name="politicaldata"; version="0.1.3"; sha256="1n25k53mmlmmg9p9a36jh4z6xhl1yyv9v1c56mav873105h359wi"; depends=[]; }; pollen = derive2 { name="pollen"; version="0.71.0"; sha256="0g0g6n8y87jyk7l4s6xpdk60dz4lkg2xp5c5agakkrah8a233920"; depends=[dplyr lubridate purrr]; }; pollimetry = derive2 { name="pollimetry"; version="1.0.1"; sha256="09zmcwlgzl4fnkdg2m424ibv3izzrm595c7pi4mc3bd1g8sa2ypn"; depends=[brms repmis]; }; @@ -11120,11 +11290,11 @@ in with self; { poptrend = derive2 { name="poptrend"; version="0.1.0"; sha256="0hypxpb18azg6q1mqrphbx3x262h9ybwhlkb8fyd6vr7jjb5wn3h"; depends=[mgcv]; }; population = derive2 { name="population"; version="0.2"; sha256="1k0hwh17dyfbbyw8gprsz1klx6l2ncq5mxkmnjmknlnrkpah0bbl"; depends=[abind]; }; populationPDXdesign = derive2 { name="populationPDXdesign"; version="1.0.3"; sha256="0p73ddv3j1s1vs4j3axnsf39n626qjv0w1qlq9p7km4s6729bhgv"; depends=[devtools ggplot2 plyr roxygen2 shiny shinycssloaders]; }; - portalr = derive2 { name="portalr"; version="0.2.5"; sha256="0vyrxc39j4fhz1yvi0a8hgz386k1lsnck70cizbdny6iik7jm2x6"; depends=[clisymbols crayon dplyr forecast httr jsonlite lubridate lunar magrittr rlang tibble tidyr usethis]; }; + portalr = derive2 { name="portalr"; version="0.2.6"; sha256="08d29xg377vrrxzdzbsivm2zvh795fwhhz8aw53gbg4xxz23ydkj"; depends=[clisymbols crayon dplyr forecast httr jsonlite lubridate lunar magrittr rlang tibble tidyr usethis]; }; portes = derive2 { name="portes"; version="3.0"; sha256="144fipskh6yb6xcz3m5bgh2kwjwa58zaw24y88hzzrdvh9glvyrc"; depends=[forecast]; }; portfolio = derive2 { name="portfolio"; version="0.4-7"; sha256="0gs1a4qh68xsvl7yi6mz67lamwlqyqjbljpyax795piv46kkm06p"; depends=[lattice nlme]; }; portfolio_optimization = derive2 { name="portfolio.optimization"; version="1.0-0"; sha256="1rdhwffsjc1pa1qq7rqy6dwk8yrcblkmijz94p2w7sf2v4jmwxxr"; depends=[magrittr MASS modopt_matlab xts]; }; - portfolioBacktest = derive2 { name="portfolioBacktest"; version="0.1.0"; sha256="1hbdx31fdb86zv0zhnshsfz0a2d5qkkr49prj4hiqvhggingblfv"; depends=[doSNOW evaluate foreach PerformanceAnalytics quantmod R_utils snow xts zoo]; }; + portfolioBacktest = derive2 { name="portfolioBacktest"; version="0.1.1"; sha256="1g1iwla5ldan94vs4dhpggfj9q9hgs9nxjimrcnjg2i3x7cj1kmg"; depends=[doSNOW evaluate foreach PerformanceAnalytics quantmod R_utils snow xts zoo]; }; portfolioSim = derive2 { name="portfolioSim"; version="0.2-7"; sha256="1vf46882ys06ia6gfiibxx1b1g81xrg0zzman9hvsj4iky3pwbar"; depends=[lattice portfolio]; }; portsort = derive2 { name="portsort"; version="0.1.0"; sha256="0swl39dn7lzwvps18bva4l64a441gkf6lbwcwrhlf93f1ardvxji"; depends=[xts zoo]; }; postGIStools = derive2 { name="postGIStools"; version="0.2.3"; sha256="1ig404p1ym4v1cw0a7jk2zjy9vdpg1y39mckkn8mpic29w9ra4b1"; depends=[DBI jsonlite rgdal rgeos RPostgreSQL sp stringr]; }; @@ -11147,9 +11317,9 @@ in with self; { powerplus = derive2 { name="powerplus"; version="3.1"; sha256="0ayp6x34hkzgris4j3zbbs0r23n81bhww3wgfyy630ri4sk6brrn"; depends=[complexplus expm MASS Matrix phonTools]; }; ppcSpatial = derive2 { name="ppcSpatial"; version="0.2.0"; sha256="1gi57zngc42wcrihg29nn7qa3gaq105ckp76qmczkldshlpd7x4r"; depends=[dplyr ggplot2 htmltools htmlwidgets leaflet magrittr PakPC2017 rgdal scales shiny tidyr tmap]; }; ppcc = derive2 { name="ppcc"; version="1.1"; sha256="0c22nkp6c6rl2d6c868pnrda1l6h9bxssmdbca3pdc5s8wjxi0nd"; depends=[]; }; - ppclust = derive2 { name="ppclust"; version="0.1.2"; sha256="0q21vsvsdr09dggsb15syw39414bjp5lf4d7hnz0p2sc2v317lh0"; depends=[inaparc MASS]; }; + ppclust = derive2 { name="ppclust"; version="0.1.3"; sha256="1480fcjzz1vfmz3sgcdrpfilqklmb1f0h4vna6xkfib5xh624lxb"; depends=[inaparc MASS]; }; ppcor = derive2 { name="ppcor"; version="1.1"; sha256="1x9b2kb8s0bp92b17gby0jwzzr3i4cf3ap9c4nq7m8fav72g0y3a"; depends=[MASS]; }; - ppgmmga = derive2 { name="ppgmmga"; version="1.1"; sha256="0w2phsc6mzz4d8hzb07hhcqnvk1kqcsns1hk6bv6dr33q6xp1qnv"; depends=[cli crayon GA ggplot2 ggthemes mclust Rcpp RcppArmadillo]; }; + ppgmmga = derive2 { name="ppgmmga"; version="1.2"; sha256="1dq0p3xna5r1kiyhiziz3wc78dfqh362qhna5hmkjzhljawr9jg0"; depends=[cli crayon GA ggplot2 ggthemes mclust Rcpp RcppArmadillo]; }; ppitables = derive2 { name="ppitables"; version="0.5.0"; sha256="0k4ql8za6kdplz7fq4cas2rz8vad5ssbiyv95iaqwzgslwnr7m3m"; depends=[tibble tidyr]; }; ppls = derive2 { name="ppls"; version="1.6-1.1"; sha256="1zyrisy3c4cz896j1bjh61sf57wdl9p8ywdq268cl819szfq78mx"; depends=[MASS]; }; ppmlasso = derive2 { name="ppmlasso"; version="1.1"; sha256="1w13p1wjl1csds1xfc79m44rlym9id9gwnp3q0bzw05f35zbfryg"; depends=[spatstat]; }; @@ -11197,15 +11367,17 @@ in with self; { prettyGraphs = derive2 { name="prettyGraphs"; version="2.1.6"; sha256="0yjpwxdy9mkj2k33zvd5klyv4ava46i19yls87n0bvf79y90ikpy"; depends=[]; }; prettyR = derive2 { name="prettyR"; version="2.2-3"; sha256="1rs90cmr5dyry724php90mp41qwzzk1z3gxfwcj1k157qawacyhr"; depends=[]; }; prettycode = derive2 { name="prettycode"; version="1.0.2"; sha256="0yz75qqpvrk4p9mypjnmrg1xwlrhh2iax2897f11cfk8rjj784jg"; depends=[crayon withr]; }; - prettydoc = derive2 { name="prettydoc"; version="0.2.1"; sha256="00amqn0izg2jrn96pmm5papqmp0chn25msjk94nim3avqg9x4x92"; depends=[rmarkdown]; }; + prettydoc = derive2 { name="prettydoc"; version="0.3.0"; sha256="1bjgcr9kxyzm8q5hilc6kfjy32rwy10cdfajb90w8drc91g0g9n9"; depends=[rmarkdown]; }; prettymapr = derive2 { name="prettymapr"; version="0.2.2"; sha256="151jp0l728krmxcyzwjh01mvd1zhqijq0nsgjaqsh0q8n3jmndi0"; depends=[digest httr plyr rjson]; }; prettyunits = derive2 { name="prettyunits"; version="1.0.2"; sha256="0p3z42hnk53x7ky4d1dr2brf7p8gv3agxr71i99m01n2hq2ri91m"; depends=[assertthat magrittr]; }; prevR = derive2 { name="prevR"; version="3.4.0"; sha256="1y61ggqjf3b2a5f9zprbp9ylfkcfk0jiqfymkyqci9figsnahdy1"; depends=[directlabels fields foreign GenKern ggplot2 gstat maptools rgdal sp]; }; prevalence = derive2 { name="prevalence"; version="0.4.0"; sha256="0vnmglxj1p66sgkw4ffc4wgn0w4s281fk2yifx5cn4svwijv30q0"; depends=[coda rjags]; }; + prevederer = derive2 { name="prevederer"; version="0.0.1"; sha256="0vkx9nrlgp36xbl95lrb5sb5yivxlcw4yvbs8hgbm31kh0vbz32f"; depends=[httr]; }; prevtoinc = derive2 { name="prevtoinc"; version="0.12.0"; sha256="0ypdxcx9gh87a7ih3cw3yai47rzv41qwh4kpk6007ai8jkjv4n9w"; depends=[dplyr purrr rlang tibble]; }; priceR = derive2 { name="priceR"; version="0.1.0"; sha256="09jlf8c1lfiqmpm2vdgkacsracwcjgi6xgvlakny2c4iyir45sh5"; depends=[dplyr gsubfn stringr]; }; pricesensitivitymeter = derive2 { name="pricesensitivitymeter"; version="1.0.1"; sha256="0sgpnfx4qs7xzcwnlwjkwrqj39w5b4h8133ma527z845nkfixncl"; depends=[survey]; }; prim = derive2 { name="prim"; version="1.0.16"; sha256="0i5jpk798qbvyv9adgjbzpg4dvf7x51bcgbdp38fzdnam6g88y5a"; depends=[misc3d rgl]; }; + primePCA = derive2 { name="primePCA"; version="1.0"; sha256="0kpyqv3l58xcyd98a7c7ggsna30j6k62aliidlyxgv2ya0g0dshv"; depends=[MASS Matrix softImpute]; }; primefactr = derive2 { name="primefactr"; version="0.1.1"; sha256="11hi75jwjxrl9p5m8yjwjb20pc9y9vkhi8sjrnisdq2hm53m483w"; depends=[]; }; primer = derive2 { name="primer"; version="1.0"; sha256="0vkq794a9qmz9klgzz7xz35msnmhdaq3f91lcix762wlchz6v7sg"; depends=[deSolve lattice]; }; primerTree = derive2 { name="primerTree"; version="1.0.4"; sha256="15am88swc9h8igjnjqr4jg105i91lsl28nncqly03cgy4vm814kk"; depends=[ape directlabels foreach ggplot2 gridExtra httr lubridate plyr reshape2 scales stringr XML]; }; @@ -11224,7 +11396,7 @@ in with self; { proPubBills = derive2 { name="proPubBills"; version="0.1"; sha256="1fpn9x31jjahdyk0f30mbb3ijj4dsghrq9q94r04pjsgr2jw23zx"; depends=[dplyr httr stringr]; }; prob = derive2 { name="prob"; version="1.0-1"; sha256="05qcrsl790hn7p3ap4zj5i1b1sf674wvvrh42lyb7a0nsc09iq9n"; depends=[combinat fAsianOptions]; }; probFDA = derive2 { name="probFDA"; version="1.0.1"; sha256="093k50kyady54rkrz0n9x9z98z5ws36phlj42j25yip7pzhfd6sv"; depends=[MASS]; }; - probably = derive2 { name="probably"; version="0.0.2"; sha256="1ix1ad4pghd67shrbhfqwycqmkiijzhqav1jd4g7251w5kqa2y2z"; depends=[dplyr generics rlang tidyselect vctrs yardstick]; }; + probably = derive2 { name="probably"; version="0.0.3"; sha256="0i6r7yc8s3rlkxaqc48arci4i2wyi4xygf93bisd8zfgrzcvmgw8"; depends=[dplyr generics rlang tidyselect vctrs yardstick]; }; probemod = derive2 { name="probemod"; version="0.2.1"; sha256="1cgjr03amssc9rng8ky4w3abhhijj0d2byzm118dfdjzrgmnrf9g"; depends=[]; }; probhat = derive2 { name="probhat"; version="0.1.1"; sha256="0jq5r16isys38yb0y7sfg877l46jl8x4x0l3yjlqyipik1lczhpg"; depends=[barsurf]; }; probout = derive2 { name="probout"; version="1.1.1"; sha256="1hasrvxdig8n3fhzsbmq27050dyanzp1j0qlybnrkb41k9gyljda"; depends=[FNN MASS mclust]; }; @@ -11236,9 +11408,9 @@ in with self; { processcontrol = derive2 { name="processcontrol"; version="0.1.0"; sha256="0c0bksgq24blfkdgp5bn49sjnaajrg5bag8qzb5zffxbhnm4s30x"; depends=[plyr]; }; processmapR = derive2 { name="processmapR"; version="0.3.3"; sha256="0skiavjays0qp9yvxfdzhp7iagz3zirq90m08lcl6sa83n5dj8rr"; depends=[bupaR data_table DiagrammeR dplyr edeaR forcats ggplot2 ggthemes glue hms miniUI plotly purrr RColorBrewer rlang scales shiny stringr tidyr]; }; processmonitR = derive2 { name="processmonitR"; version="0.1.0"; sha256="1ckr438yifpsh095j6bb65dq3rdm7cfm8k7qsjmcqwjkww4j74z8"; depends=[bupaR dplyr edeaR ggplot2 magrittr miniUI shiny]; }; - processx = derive2 { name="processx"; version="3.3.1"; sha256="1bhbfacx2z2d97pz5bch45nvbvywhx2zp049czlfbdivkzgxn8v1"; depends=[ps R6]; }; + processx = derive2 { name="processx"; version="3.4.1"; sha256="1g6ipcaxg9y94lyrnbp7kkbqfkcdh1fyrqjjclbjp3x7iysdvazi"; depends=[ps R6]; }; prodest = derive2 { name="prodest"; version="1.0.1"; sha256="16nqgd9wrjfxymwbxrnlak54cagbv3fxgbql0w5bxnmyrbbqy509"; depends=[AER DEoptim dplyr Matrix Rsolnp]; }; - prodigenr = derive2 { name="prodigenr"; version="0.4.0"; sha256="1rbfg3jzspw51lbhjbdy0wy5fgl3k3cnb324i73nbgjn7ycmpfqx"; depends=[clipr clisymbols crayon desc devtools fs git2r rmarkdown rprojroot usethis withr]; }; + prodigenr = derive2 { name="prodigenr"; version="0.5.0"; sha256="1h15fwd4rclja0q80y119sah1qbyjlbaqxg360ywq9ig151lxsjq"; depends=[fs git2r rmarkdown rprojroot usethis withr]; }; prodlim = derive2 { name="prodlim"; version="2018.04.18"; sha256="1aslq87sqwikh8chxc378r38146y7kv79zz0kcq3j93ivx7va8jb"; depends=[KernSmooth lava Rcpp survival]; }; productivity = derive2 { name="productivity"; version="1.1.0"; sha256="1g8b4vlyqq3xyzd4dki01glhc3g9j3ywgwpxylkmzp0ivqic53yc"; depends=[doParallel foreach iterators lpSolveAPI]; }; productplots = derive2 { name="productplots"; version="0.1.1"; sha256="1igs6d0qwgsfk0z3vxabgv5kva9w2kpzi535gjfdrbx34j4pf3gx"; depends=[ggplot2 plyr]; }; @@ -11269,7 +11441,7 @@ in with self; { properties = derive2 { name="properties"; version="0.0-9"; sha256="1zd66cg31yd53rqsc0cwxhlpfn7kvc67qdh3vyj9qib8kwxaw1zl"; depends=[]; }; prophet = derive2 { name="prophet"; version="0.5"; sha256="0jqzmzgx3z4rl5478mw620sg539b2fwijcrzhd7jikrsv2fy7jcn"; depends=[dplyr dygraphs extraDistr ggplot2 Rcpp rlang rstan scales tidyr xts]; }; proportion = derive2 { name="proportion"; version="2.0.0"; sha256="0a71f6hz6blb7550m9x0di84vp51yjhnn952301rwlrh3axf6dbr"; depends=[ggplot2 TeachingDemos]; }; - propr = derive2 { name="propr"; version="4.1.1"; sha256="06gydd4a6lra25lsvn3jljihjinsmqbyvin9yd9bm2j9vg863wdp"; depends=[fastcluster ggplot2 igraph Rcpp]; }; + propr = derive2 { name="propr"; version="4.1.6"; sha256="1zpqx0xcf0di3p8x48g8icjwisfans0b1x902mq9fcal0qyc5mi1"; depends=[fastcluster ggplot2 igraph Rcpp]; }; prospectr = derive2 { name="prospectr"; version="0.1.3"; sha256="18lh03xg6bgzsdsl56bjd63xdp16sqgr3s326sgifkkak8ffbv7q"; depends=[foreach iterators Rcpp RcppArmadillo]; }; protViz = derive2 { name="protViz"; version="0.4.0"; sha256="150i2q4nakz28f39kmhrchz4qsr8ax6y02512md94k8hq4hamxg1"; depends=[Rcpp]; }; proteomicdesign = derive2 { name="proteomicdesign"; version="2.0"; sha256="01s47pgwxy4xx10f3qmbfv59gbaj0qw017kpkpsn33s8w7ad63r0"; depends=[MASS]; }; @@ -11278,7 +11450,7 @@ in with self; { proto = derive2 { name="proto"; version="1.0.0"; sha256="1l843p8vckjckdhgv37ngv47fga5jzy0n00pmipvp05nnaixk54j"; depends=[]; }; protoclass = derive2 { name="protoclass"; version="1.0"; sha256="17d2m6r1shgb47v8mwdg1a7f5h29m5l7f5m0nsmv0xc90s9cpvk8"; depends=[class]; }; protoclust = derive2 { name="protoclust"; version="1.6.3"; sha256="1jwfzlxyi2mx3mry2xr2glc6fm6a9jc8fhsdzjbb4zgx7vx2vpqv"; depends=[]; }; - protolite = derive2 { name="protolite"; version="1.8"; sha256="05w5lgf255agj70qdyjm64ci9j0pncz0k0bxhq2cxjbkv09169lr"; depends=[jsonlite Rcpp]; }; + protolite = derive2 { name="protolite"; version="1.9"; sha256="18k2909af314k3av7vwnkcz0k7ykfwjk2891pyqnlkxmknmg69z6"; depends=[jsonlite Rcpp]; }; proton = derive2 { name="proton"; version="1.0"; sha256="1mgaw54is8l6ac1rf8s70rj7kv9xgsfdrlvjz01ggfwg7c6pyr3s"; depends=[digest]; }; prototest = derive2 { name="prototest"; version="1.2"; sha256="07g58hq2qdpczqhjsv6dq1bya9rs958r103n91icw5yc19bvyhi2"; depends=[glmnet intervals MASS Rcpp RcppArmadillo]; }; protr = derive2 { name="protr"; version="1.6-2"; sha256="13vgiqkqqq1w2yj5f6i6scag0mr189zmisyvi6fgaw8g9dgxpxan"; depends=[]; }; @@ -11288,7 +11460,7 @@ in with self; { provViz = derive2 { name="provViz"; version="1.0.5"; sha256="11gzc9wjich7hmb47aj1fxsz39hmfq1629wag0p7l7205p0vsadl"; depends=[]; }; provenance = derive2 { name="provenance"; version="2.3"; sha256="1nzgnjfy91r9995jhn7s96jqqlc35s4kxhqscpj9jv93ngddq3zd"; depends=[IsoplotR MASS]; }; proxy = derive2 { name="proxy"; version="0.4-23"; sha256="17b6qfllqrhzrxqgx7dccffgybnkcria5a68ap5ly3plg04ypm4x"; depends=[]; }; - proxyC = derive2 { name="proxyC"; version="0.1.4"; sha256="1490acnqd8sq3z37d42qhi9rlrgdp5p3m3xi8frq9pq7i0f159x6"; depends=[Matrix Rcpp RcppArmadillo RcppParallel]; }; + proxyC = derive2 { name="proxyC"; version="0.1.5"; sha256="159bc42x4shm6n3rh9fc8ziv3ivq0ipmpbasrh279hhn1prc8gg6"; depends=[Matrix Rcpp RcppArmadillo RcppParallel]; }; prozor = derive2 { name="prozor"; version="0.2.11"; sha256="1a2k69fvgi6vxgczk81kh8r2jxc6nirc51w6ac239rqjzb1zyhjm"; depends=[AhoCorasickTrie doParallel dplyr foreach Matrix plyr readr seqinr stringr]; }; prrd = derive2 { name="prrd"; version="0.0.2"; sha256="0ifs55yqvwbcs3xyc90yi763fgavdhajk1ba73g1kchn2ak39qhb"; depends=[config crayon data_table DBI liteq RSQLite]; }; pryr = derive2 { name="pryr"; version="0.1.4"; sha256="06vj5xl9x37kbd3l5bw7sbgfdnp37spvrjrn976rxi04clqk966k"; depends=[codetools Rcpp stringr]; }; @@ -11316,13 +11488,14 @@ in with self; { pssmooth = derive2 { name="pssmooth"; version="1.0.2"; sha256="09x5dhwx40j1fy7bzj0z0lj7sbjlwrqn2b8ph0387prbbp9q2lxs"; depends=[chngpt MASS np osDesign]; }; psy = derive2 { name="psy"; version="1.1"; sha256="027whr670w65pf8f7x0vfk9wmadl6nn2idyi6z971069lf01wdlk"; depends=[]; }; psych = derive2 { name="psych"; version="1.8.12"; sha256="0hvp0dkkkn0szaf5rkirr3kb8qmr4bxwl775m5wmpvn1kc25w5vf"; depends=[foreign lattice mnormt nlme]; }; + psychNET = derive2 { name="psychNET"; version="0.0.1"; sha256="0lrc6klf0q8h49f3yphzmd8b9zi1ljhj7bb6vzgd5m5n8q3jyr4b"; depends=[bigtime car crayon fastDummies glmnet graphicalVAR gtools Hmisc igraph imputeTS longitudinal MASS Matrix mgm mlVAR networktools ordinalNet qgraph SparseTSCGM sparsevar vars]; }; psychReport = derive2 { name="psychReport"; version="0.4"; sha256="0025m39gxjv63p230xg6vmyndni8bqx5nfs6dzz7xlc8qys56jqs"; depends=[cli crayon dplyr ez testthat xtable]; }; psychTools = derive2 { name="psychTools"; version="1.9.5.26"; sha256="1a6g78glnml22mvfkn4gjzbpmqkznsgv1pga6c0dkx4db94pcfn2"; depends=[foreign psych]; }; psychmeta = derive2 { name="psychmeta"; version="2.3.3"; sha256="1skvhbhkidfi9v8yk2r1qpvsmc6axvvjaiqr0rsa8wc2idavfjhd"; depends=[boot cli crayon data_table dplyr ggplot2 MASS metafor nor1mix progress purrr RCurl reshape2 rlang stringi stringr tibble tidyr tmvtnorm xml2]; }; psycho = derive2 { name="psycho"; version="0.4.91"; sha256="0yfjgsxkbp878phjvxyb2caiy5nkknkv66294arqvmadh4an7ip3"; depends=[BayesFactor blavaan broom DescTools dplyr emmeans ggcorrplot ggplot2 lavaan lme4 lmerTest loo MASS MuMIn nFactors ppcor psych purrr qgraph rstanarm rstantools scales stringr tibble tidyr]; }; psychometric = derive2 { name="psychometric"; version="2.2"; sha256="1b7cx6icixh8k3bv60fqxjjks23qn09vlcimqfv2x3m3nkf8p1s9"; depends=[multilevel nlme]; }; psychomix = derive2 { name="psychomix"; version="1.1-7"; sha256="16dh2y2z37h72ym1dv2xg0v20wjzlnp06h8f923cdy1zigk69d2r"; depends=[flexmix Formula lattice modeltools psychotools]; }; - psychonetrics = derive2 { name="psychonetrics"; version="0.3.2"; sha256="095jy43p513kdw3d0bmh1rl6rkp6ah0fkbaawzmjnq12a01ywrxk"; depends=[abind corpcor crayon dplyr glasso lavaan magrittr Matrix matrixcalc mgcv mvtnorm numDeriv optimx pbapply qgraph Rcpp RcppArmadillo ucminf VCA]; }; + psychonetrics = derive2 { name="psychonetrics"; version="0.3.3"; sha256="0m7jsyqfgx8k77j8qg7ysdf41nhc3xa9mm8yfs95y2yk4x2lmwzp"; depends=[abind corpcor crayon dplyr glasso lavaan magrittr Matrix matrixcalc mgcv mvtnorm numDeriv optimx pbapply qgraph Rcpp RcppArmadillo ucminf VCA]; }; psychotools = derive2 { name="psychotools"; version="0.5-0"; sha256="145x1zdjvasdyf72hp6wdsw0m1r5c97gzzlbnnmdbcrjqh5zyglb"; depends=[]; }; psychotree = derive2 { name="psychotree"; version="0.15-2"; sha256="0svb3i3d9r3hvqh17lfzyzj2rnf2wm1wy6sspx67ngdrfy6d1p91"; depends=[Formula partykit psychotools]; }; psymonitor = derive2 { name="psymonitor"; version="0.0.2"; sha256="09288w2bk5jhnbyj516jqn5qb33yqqg5kqbg6ylqk7anlq2yg2sl"; depends=[doParallel foreach magrittr]; }; @@ -11331,7 +11504,7 @@ in with self; { pterrace = derive2 { name="pterrace"; version="1.0"; sha256="15k5149jqjy20cck5121zsv2mk63amn5b8qgdlacivri9dpxjns1"; depends=[doParallel foreach plotly TDA viridis]; }; ptest = derive2 { name="ptest"; version="1.0-8"; sha256="1d30a23yknf7xgqj8adgr36pnh9dpffl1v5fq682f26fk3ss30qp"; depends=[quantreg]; }; ptinpoly = derive2 { name="ptinpoly"; version="2.4"; sha256="1jbj8z7lqg7w1mqdh230qjaydx2yb6ffgkc39k7dx8xl30g00i5b"; depends=[misc3d]; }; - ptmixed = derive2 { name="ptmixed"; version="0.1.2"; sha256="039grgwm0fj7q3lkjckklb2a0yazcliiv8j2cfrfrwgq74w56p2f"; depends=[GLMMadaptive lme4 matrixcalc moments mvtnorm numDeriv tweeDEseq]; }; + ptmixed = derive2 { name="ptmixed"; version="0.2.1"; sha256="03mr26xx4i93pa6hjkp5pfd9i4pialpcwxiw8pnk3zifqiq3168b"; depends=[GLMMadaptive lme4 matrixcalc moments mvtnorm numDeriv tweeDEseq]; }; pts2polys = derive2 { name="pts2polys"; version="0.1.1"; sha256="1pnh8ajh95c8xzfa4bvd2w41fi7h0jcg003rsji6xsasly3q34vr"; depends=[Rcpp]; }; ptstem = derive2 { name="ptstem"; version="0.0.4"; sha256="0dx677c7qh7rbalsys1n3xv4hjdhd6qypjd1mrggfwz1bd4vig4j"; depends=[dplyr hunspell magrittr rslp SnowballC stringr tidyr tokenizers]; }; ptsuite = derive2 { name="ptsuite"; version="1.0.0"; sha256="1df273p8v6zvhy2jj6imhjigwj77grx6sxqmg0sidxwqny5d1d9c"; depends=[Rcpp]; }; @@ -11340,7 +11513,7 @@ in with self; { ptycho = derive2 { name="ptycho"; version="1.1-4"; sha256="1llk3rpk0lf80vwvs23d6dqhgyic3a6sfjc393csj69hh01nrdvc"; depends=[coda plyr reshape2]; }; pubchunks = derive2 { name="pubchunks"; version="0.2.0"; sha256="119ihi6xi9k3p5lv2qkch2jc2fqmf8h0wi7mqh57asg7n6f0qb6r"; depends=[data_table rcrossref xml2]; }; pubh = derive2 { name="pubh"; version="0.4.3"; sha256="18n6jyidq01gxbqvfal7ipgpjvfkdy71niy7w24dvvxnvcy7hc4l"; depends=[bookdown car desctable effects Epi epiR epitools knitr latex2exp lattice latticeExtra lme4 lmtest MASS multcomp nlme nnet ordinal pander papeR sandwich survival tactile]; }; - pubmed_mineR = derive2 { name="pubmed.mineR"; version="1.0.15"; sha256="0cwvdjdk4pd00g9hdj7116jcrlqw243pv78ckrhmvhsdpj9diz5q"; depends=[boot R2HTML RCurl XML]; }; + pubmed_mineR = derive2 { name="pubmed.mineR"; version="1.0.16"; sha256="1dcviy347lypbzwwz506d37wy5swla2vjgyqijwc37daic71bnih"; depends=[boot R2HTML RCurl XML]; }; pubtatordb = derive2 { name="pubtatordb"; version="0.1.3"; sha256="0k16nq7fbsd07wkv6zys0jqdd35ikq3aiax3jdihk94gq46raqc1"; depends=[assertthat DBI dplyr R_utils readr RSQLite]; }; pullword = derive2 { name="pullword"; version="0.2"; sha256="14rln0nbd4k2cvf18iwvc56776b9g3m3cs67i7fgzabfrgj8y6db"; depends=[RCurl]; }; pulsar = derive2 { name="pulsar"; version="0.3.5"; sha256="0n16jcjxaz19gc12idj3vva9bb0ljxwimgcgil57pi9rmflv9jm1"; depends=[Matrix]; }; @@ -11351,10 +11524,10 @@ in with self; { purging = derive2 { name="purging"; version="1.0.0"; sha256="1b8f87jn6wyh4fp6b1660bd484wcf7xiajdg9dz2594aj1r94qsr"; depends=[MASS]; }; purrr = derive2 { name="purrr"; version="0.3.2"; sha256="0ccs78a2ylr60f3z0f7iywi8h1pwr8mz4ga78bs4pwgnwkclvir7"; depends=[magrittr rlang]; }; purrrlyr = derive2 { name="purrrlyr"; version="0.0.5"; sha256="0rcamyf7d01rpd9izh8xp66j130aqarfbc24p898dqhghb6q1ryq"; depends=[BH dplyr magrittr purrr Rcpp]; }; - purrrogress = derive2 { name="purrrogress"; version="0.1.0"; sha256="0kbwwa1mwpf8vfagblmcw2467v5z9mmgn41sabz79d3lg862i9a1"; depends=[assertthat glue hms pkgcond purrr R6 rlang testextra]; }; + purrrogress = derive2 { name="purrrogress"; version="0.1.1"; sha256="1l7wr7jjpang9gx61pfw9qiapsviwpp13kbylmxvw7lz7q0khzcz"; depends=[assertthat glue hms pkgcond purrr R6 rlang testextra]; }; pushbar = derive2 { name="pushbar"; version="0.1.0"; sha256="1gxarv6x32y6ssrhsq3pyihzcvpnnj7bg0jf2cpcr99da78n1d9b"; depends=[jsonlite shiny]; }; pushoverr = derive2 { name="pushoverr"; version="1.0.0"; sha256="1zazrx0szx21ymn7zlkfqkhid0ar8jblnpnf5nycj0p7dbh6d0bd"; depends=[assertthat httr]; }; - pvaluefunctions = derive2 { name="pvaluefunctions"; version="1.2.0"; sha256="05dmidh9s30brzkmi4yjkdv262saaycm80ss31vbq1000v00nf47"; depends=[ggplot2 scales zipfR]; }; + pvaluefunctions = derive2 { name="pvaluefunctions"; version="1.4.0"; sha256="1cvym37l3vyanfvbb845fcdcy8xsqinj8vnz64wiqyb83hnq3cq7"; depends=[ggplot2 scales zipfR]; }; pvar = derive2 { name="pvar"; version="2.2.5"; sha256="1a5dxhki5nd5s1d5wwnc1dkg7mdib2s8w1i0l8mdg3f1g3l00klz"; depends=[Rcpp]; }; pvclass = derive2 { name="pvclass"; version="1.4"; sha256="1g6x75qz3xybq1xnik0hzi7mcs0gzzqd3f0iwfkzi5d1zcddnw13"; depends=[Matrix]; }; pvclust = derive2 { name="pvclust"; version="2.0-0"; sha256="0hfpf257k5f1w59m0zq6sk0gaamflc3ldkw6qzbpyc4j94hiaihs"; depends=[]; }; @@ -11371,23 +11544,22 @@ in with self; { pxR = derive2 { name="pxR"; version="0.42.2"; sha256="1q1xwsrs1ch1a1d1clz6sl7vnsyz5wjqivczk5n5d772y4w60bz5"; depends=[plyr reshape2 RJSONIO stringr]; }; pxweb = derive2 { name="pxweb"; version="0.9.1"; sha256="00xp7idhsirmpl970yxnxp6xn128jm5kwsmdwhys32wlbd9kzspc"; depends=[checkmate httr jsonlite]; }; pycno = derive2 { name="pycno"; version="1.2"; sha256="0ha5css95xb98dq6qk98gnp1al32gy6w5fkz74255vs4hmkwfzw2"; depends=[maptools rgeos sp]; }; - pyinit = derive2 { name="pyinit"; version="1.0.2"; sha256="148b8l5a8c636rgm8dwd8v6ggw9qmkafc5a40bciqc4rk09lfhl3"; depends=[robustbase]; }; - pyramid = derive2 { name="pyramid"; version="1.4"; sha256="0hh0hmckicl0r2r9zlf693j65jr9jgmiz643j2asp57nbs99lgxz"; depends=[]; }; + pyinit = derive2 { name="pyinit"; version="1.0.3"; sha256="0sj7r52a53x57ff8b34s6p2y638b85fin0cxrndhpsk392sds0ki"; depends=[robustbase]; }; + pyramid = derive2 { name="pyramid"; version="1.5"; sha256="0lakn9knmhqvhrp98sc3hhwd4bilpplxbr5j9bv8w6li0qd3d04a"; depends=[]; }; pysd2r = derive2 { name="pysd2r"; version="0.1.0"; sha256="1dqvgdxj6m683wkjyjhv685xnhl9328bm921zphm1i9p70fahs0n"; depends=[knitr reticulate tibble]; }; pzfx = derive2 { name="pzfx"; version="0.2.0"; sha256="1h936iplhb3rnfvwvynsh1zfn3j3r0p1shr25wcn1z8axypdbsgi"; depends=[xml2]; }; qCBA = derive2 { name="qCBA"; version="0.3.1"; sha256="0lr97hig9c4l9k7vjalvgar4f1dic1lqf91li4q63j07lgdyvh4c"; depends=[arc arules rJava]; }; qGaussian = derive2 { name="qGaussian"; version="0.1.8"; sha256="02xy35xg4swr1ldnsbywnz2h0ga1pbsivnj0aqmpll7kvwl9qz4c"; depends=[Rcpp robustbase zipfR]; }; qLearn = derive2 { name="qLearn"; version="1.0"; sha256="1ilxmgazm8gjz8c1hhbp4fccibnvnalxrag8b0rn081zsqmhf094"; depends=[]; }; - qMRI = derive2 { name="qMRI"; version="1.0"; sha256="0rz4d5pf4xzzn6d8ab0ji1795qpmz70m958rvar4hbf97dcr8r7x"; depends=[adimpro aws awsMethods dti oro_nifti stringr]; }; + qMRI = derive2 { name="qMRI"; version="1.0.1"; sha256="1b6wa3s9km22ymwhd7a1hxnaish4zhdi23w96mydjb32bf28x0rp"; depends=[adimpro aws awsMethods dti oro_nifti stringr]; }; qVarSel = derive2 { name="qVarSel"; version="1.0"; sha256="13x2hnqjsm0ifzmqkkl9ilhykrh80q04lhlkkp06hkysmh5w9rkx"; depends=[lpSolveAPI Rcpp]; }; - qad = derive2 { name="qad"; version="0.1.0"; sha256="046zyzgmd4rygl871xri02ylkyzl6yszn7zjc47kq7bb8jj0c1ya"; depends=[copula data_table doParallel foreach ggplot2 plyr]; }; + qad = derive2 { name="qad"; version="0.1.1"; sha256="11v291swfl4llgzfffm786xqp9cn82vl8xlqjlma5wah7ig73rgh"; depends=[copula data_table doParallel foreach ggplot2 plyr viridis]; }; qap = derive2 { name="qap"; version="0.1-1"; sha256="0d2d1ni1camixyi45lfy00f4pn3p063k7bsi8gj5scp6n15mdgb0"; depends=[]; }; qat = derive2 { name="qat"; version="0.74"; sha256="04n1jnbkf9dzafjh1n5d4q9p7hvyhnr63nmgl51jqxcf3nan5rlx"; depends=[boot fields gdata gplots moments ncdf4 XML]; }; qboxplot = derive2 { name="qboxplot"; version="0.2"; sha256="07f05n7zxgwyxg2r5fz691ra64m218w9v874xfzjx6671c40y1q2"; depends=[]; }; qcQpcr = derive2 { name="qcQpcr"; version="1.5"; sha256="1298zla8z5w9z4idc07v3ca9rc1afx853y7iz3jmqnqnv8mr0s48"; depends=[ggplot2]; }; qcc = derive2 { name="qcc"; version="2.7"; sha256="0lc26w7p3d023lfr8v6v75m2vwqg9vi9pdipap19l4vbdq29l4zz"; depends=[MASS]; }; qccrs = derive2 { name="qccrs"; version="0.1.0"; sha256="0lwrmf2809zzdj5f25bb1psh57ibyw90ra41fy2i9vjmgph9wgiq"; depends=[dplyr magrittr purrr tibble]; }; - qclust = derive2 { name="qclust"; version="1.0"; sha256="0cxkk4lybpawyqmy5j6kkpgm0zy0gyn3brc1mf9jv8gmkl941cp3"; depends=[mclust mvtnorm]; }; qcr = derive2 { name="qcr"; version="1.0"; sha256="1251naica44kccmikyzdi3ncxfmvyqbc4qspfqnc0w54cqpsy5rw"; depends=[fda_usc MASS mvtnorm qcc qualityTools]; }; qcv = derive2 { name="qcv"; version="1.0"; sha256="0hf02l9c1cpzs02mfn9swfc8l635qsvh6xrhj21g19h5rxaf8jwg"; depends=[]; }; qdap = derive2 { name="qdap"; version="2.3.2"; sha256="0g072nwvqqdjcp62xl4hr94rf9xzfvs6400h4b20z44xfnnx8wb2"; depends=[chron dplyr gdata gender ggplot2 gridExtra igraph NLP openNLP plotrix qdapDictionaries qdapRegex qdapTools RColorBrewer RCurl reports reshape2 scales stringdist tidyr tm venneuler wordcloud xlsx XML]; }; @@ -11397,12 +11569,13 @@ in with self; { qdm = derive2 { name="qdm"; version="0.1-0"; sha256="0cfxyy8s5zfb7867f9xv9scq9blq2qnw68x66m7y7nqlrrff5xdr"; depends=[]; }; qfasar = derive2 { name="qfasar"; version="1.2.0"; sha256="067wnwwz8s0yxig13wrjq37w62kf8p5pa8my5lfpc1ik1b7iysby"; depends=[Rsolnp]; }; qgam = derive2 { name="qgam"; version="1.3.0"; sha256="0i0irz2jqi73d97zyy8xz2yi95y93kw3sr9xf4hmrjdd4k15l0wk"; depends=[doParallel mgcv plyr shiny]; }; - qgcomp = derive2 { name="qgcomp"; version="1.0.0"; sha256="1hidp0ai901ybrwmnhdyly74yy1jbhqlx0npxswig6a9sxgbmms4"; depends=[ggplot2 gridExtra]; }; + qgcomp = derive2 { name="qgcomp"; version="1.1.0"; sha256="1nh6z45rzfiv8zymxdigz6zd86x751ciwrmc85s1g3awn5bf6r1p"; depends=[ggplot2 gridExtra survival]; }; qgraph = derive2 { name="qgraph"; version="1.6.3"; sha256="0makwk8kygqfi4hqzhfzd2jbljlwvs24mv7psr5wyh76g8392drn"; depends=[abind BDgraph colorspace corpcor d3Network fdrtool ggm ggplot2 glasso gtools Hmisc huge igraph jpeg lavaan Matrix pbapply plyr png psych Rcpp reshape2]; }; qgtools = derive2 { name="qgtools"; version="1.0"; sha256="0irqfaj2qqx7n1jfc0kmfpgzqrhwwlj0qizsmya94zk9d27bcpn5"; depends=[MASS Matrix]; }; qha = derive2 { name="qha"; version="0.0.8"; sha256="0sdf6g6884wn73i237xkwszg2mq8xddhvyy225qzpplh5za4pnhl"; depends=[ade4 FactoClass FactoMineR]; }; qicharts = derive2 { name="qicharts"; version="0.5.5"; sha256="0bl1f64b5n8q9jhzh3rqfyh9613qiy9mhcy2xsn16jyrj4hmj0jd"; depends=[ggplot2 lattice latticeExtra scales]; }; qicharts2 = derive2 { name="qicharts2"; version="0.6.0"; sha256="0310xczb8zzl8xl0l2fn1mw58cbkgs0xpsp3q061psv1achapxbr"; depends=[dplyr ggplot2 scales]; }; + qif = derive2 { name="qif"; version="1.5"; sha256="12azs7c0anpd71d5663y1jrhirry6cr78wislp4fk64hmsbx7sx4"; depends=[MASS]; }; qiimer = derive2 { name="qiimer"; version="0.9.4"; sha256="0argspi9pin2gjsg0qkl28hj3bw8svfab1cy410zlq76qdnmg7df"; depends=[pheatmap]; }; qiitr = derive2 { name="qiitr"; version="0.1.0"; sha256="1p0mcwgzvbib20l05wrnshkqx99vwr69dgy15dfwp75skyy5l797"; depends=[httr jsonlite purrr rstudioapi]; }; qkerntool = derive2 { name="qkerntool"; version="1.19"; sha256="14inry2hqvkmy0y2y3cl75ri4vri0hirv98gw2rymny69lia5x0s"; depends=[class]; }; @@ -11434,7 +11607,7 @@ in with self; { qrng = derive2 { name="qrng"; version="0.0-5"; sha256="0ddwbbw5w7y8vns83z4dyh8inl976k2cg55rxbynaks8bdxr38mj"; depends=[]; }; qrnn = derive2 { name="qrnn"; version="2.0.4"; sha256="0i0hyb97xb3kwpvg6cqkwvl612cx11bszkm7pzhiy6ss598r6wwi"; depends=[]; }; qrsvm = derive2 { name="qrsvm"; version="0.2.1"; sha256="0qpj3c8qwrwr2asvp921av0mbdba1ayz0pdq4a52i1waqng4fgis"; depends=[doParallel foreach kernlab Matrix quadprog]; }; - qs = derive2 { name="qs"; version="0.17.1"; sha256="02bv3bmdz2klay8masb1zyx500rsbcfadkvby269ncd359i28l4f"; depends=[RApiSerialize Rcpp]; }; + qs = derive2 { name="qs"; version="0.17.3"; sha256="1z0q9kgyf1rkkbjl8b4rm444c3war4drqbi2lgbvzm6q8jy6pdh1"; depends=[RApiSerialize Rcpp]; }; qsort = derive2 { name="qsort"; version="0.2.3"; sha256="1xvp29dijfa2207wyw3z09rmffn61fngfy0f00qjk284n1jnnvrg"; depends=[cowplot ggplot2 gridExtra purrr]; }; qsub = derive2 { name="qsub"; version="1.1.0"; sha256="0i52bibc782k09f5hp3ic9ll14fsrwjnkdxlb0mhkjvsqm7m5hc5"; depends=[dplyr glue pbapply processx purrr random readr ssh stringr tidyr]; }; qtbase = derive2 { name="qtbase"; version="1.0.14"; sha256="1pcgjycq61x9h52sqr6fz83qjnlpbawvpavnn9hyw2b7jlv3nwfd"; depends=[]; }; @@ -11463,13 +11636,13 @@ in with self; { qualtRics = derive2 { name="qualtRics"; version="3.1.0"; sha256="06lbjck0a7rnh5j67y8x1r1ryzy1pjmhvzdzxj9r7sdqgw767p26"; depends=[assertthat dplyr httr jsonlite readr rlang sjlabelled stringr yaml]; }; qualvar = derive2 { name="qualvar"; version="0.2.0"; sha256="1c7b7lcyq2l46sslk185r6xfh5fb35z9qihrhnh294sw1k52bffa"; depends=[]; }; quantable = derive2 { name="quantable"; version="0.3.6"; sha256="15q4phc2j7aihl8f4qzpdwxcvshq2cfzkfcxc8k4qypsxk9a00sb"; depends=[caret dplyr e1071 ggplot2 ggrepel gplots Matrix plyr pROC RColorBrewer readr reshape2 rlang scales stringr tibble tidyr]; }; - quanteda = derive2 { name="quanteda"; version="1.4.3"; sha256="0lh32xsqrbai1jp6jgdypgz1imv4gf4x0dbwd5kss0y80sr80r3c"; depends=[data_table extrafont fastmatch ggplot2 ggrepel lubridate magrittr Matrix network Rcpp RcppArmadillo RcppParallel RSpectra sna SnowballC spacyr stopwords stringi xml2 yaml]; }; + quanteda = derive2 { name="quanteda"; version="1.5.1"; sha256="08hzgqza853jrk0r6cgn5398k0llfpm6jk4hs4rw8l2dn0520nq5"; depends=[data_table extrafont fastmatch ggplot2 ggrepel lubridate magrittr Matrix network proxyC Rcpp RcppArmadillo RcppParallel RSpectra sna SnowballC spacyr stopwords stringi xml2 yaml]; }; quantification = derive2 { name="quantification"; version="0.2.0"; sha256="116cp88q9cmizxc2a8lsysa1vwyp1y86457fx5qkq5dcm4g721g8"; depends=[car]; }; quantileDA = derive2 { name="quantileDA"; version="1.1"; sha256="0jbklxsy33j7clcw97qq4ijwkrb94v2m11gjcfa38vplfxm9913q"; depends=[]; }; quantities = derive2 { name="quantities"; version="0.1.2"; sha256="01h0d2cmqqyqch98d8pgv3n2rvp3vc3sby95srahgcrrlxmmrrvj"; depends=[errors Rcpp units]; }; quantmod = derive2 { name="quantmod"; version="0.4-15"; sha256="0lyzaf5ypk93v6zj9gdghy05cc7cxgn9yasv1apx5r6qsjcfgwky"; depends=[curl TTR xts zoo]; }; quantoptr = derive2 { name="quantoptr"; version="0.1.3"; sha256="0f9vy9yhya4wpya8n345s6n7a5sb29chdkl5fz6dwa31lp1mvvj3"; depends=[quantreg Rdpack rgenoud stringr]; }; - quantreg = derive2 { name="quantreg"; version="5.41"; sha256="110ax3ngn6i94h7iw7ha67kfsmj94hycp7lk62nmyvkp34vpfykh"; depends=[Matrix MatrixModels SparseM]; }; + quantreg = derive2 { name="quantreg"; version="5.42.1"; sha256="1aycnghci329yqw63kybv7sfjjx5whq3xs7xzic4wsaj7j4b1hjc"; depends=[Matrix MatrixModels SparseM]; }; quantreg_nonpar = derive2 { name="quantreg.nonpar"; version="1.0"; sha256="1f9120awnkwsgdiqg98lg7xs5l4y80930869x6k9q76595r5m92k"; depends=[fda mnormt quantreg Rearrangement]; }; quantregForest = derive2 { name="quantregForest"; version="1.3-7"; sha256="0lk7r02i6zpx9sdl2rp0r7fc3a84s8qhg49nh2x7k3vxwa095pjz"; depends=[randomForest RColorBrewer]; }; quantregGrowth = derive2 { name="quantregGrowth"; version="0.4-3"; sha256="0q2yk51hcn7jnvh14nxa7szfj4pr9grh5rdfwazaziilbwqdmw4f"; depends=[quantreg]; }; @@ -11489,7 +11662,7 @@ in with self; { quickregression = derive2 { name="quickregression"; version="0.2"; sha256="1z0sspi8q7dvgxqbj5na56v458pv6jhxrssnm6j23156dchgw39h"; depends=[car]; }; quiddich = derive2 { name="quiddich"; version="1.0.0"; sha256="10kiyn1all58klyygmz6zw0w9nfl9vq19qybmkqh410rd5ryjz3p"; depends=[ape]; }; quietR = derive2 { name="quietR"; version="0.1.0"; sha256="1f923dllhchgf49bp2d9186v3cxzdya6i56ww6cj0n0mh8gfi27z"; depends=[]; }; - quint = derive2 { name="quint"; version="2.0.0"; sha256="10jcpabsk7bdw7cvq21z0hsrp4gnlbf35iypc2gprrbkk8sw4i8i"; depends=[Formula partykit rpart]; }; + quint = derive2 { name="quint"; version="2.0.1"; sha256="0a6ibaz9x4nba3kn7gbnz0f53sv3489zpa2vvywq1g9dx8nm7r3v"; depends=[Formula partykit rpart]; }; quokar = derive2 { name="quokar"; version="0.1.0"; sha256="1qnl3x1aa665xpyb3ac07xrnnjdwbmj645p103144k5is5b8likc"; depends=[ald ALDqr bayesQR dplyr ggplot2 GIGrvg gridExtra knitr magrittr MCMCpack purrr quantreg robustbase tidyr]; }; quotedargs = derive2 { name="quotedargs"; version="0.1.3"; sha256="11cswg9bmddsl1axxcdz11flq46p1zkpv022526f2vgl4qsprwbm"; depends=[]; }; qut = derive2 { name="qut"; version="2.1"; sha256="1wkk4c4f10a1whrspr5yalp7flcxckzxlx187ymmpnz7qcncz619"; depends=[flare glmnet lars Matrix]; }; @@ -11501,6 +11674,7 @@ in with self; { r2d3 = derive2 { name="r2d3"; version="0.2.3"; sha256="0v612mbzdjr8cq1ffall9hagbwxfv7fh963x8f0w5r84v1m3y2bl"; depends=[htmltools htmlwidgets jsonlite rstudioapi]; }; r2dRue = derive2 { name="r2dRue"; version="1.0.4"; sha256="1apdq7zj5fhs349wm9g6y06nn33x24pg3gdp4z1frd18qlacf8z5"; depends=[matrixStats rgdal sp]; }; r2glmm = derive2 { name="r2glmm"; version="0.1.2"; sha256="0iim92blpa59vgz97c2pi05yhbjjmaffdbkbmk5kplfb2vmazgiy"; depends=[afex data_table dplyr ggplot2 gridExtra lmerTest MASS Matrix mgcv pbkrtest]; }; + r2pmml = derive2 { name="r2pmml"; version="0.23.0"; sha256="1md7fzx7yc6b3plflcq4c109v2plhvb1a6dg628bhyiicjs1s83c"; depends=[]; }; r2stl = derive2 { name="r2stl"; version="1.0.0"; sha256="18lvnxr40cm450s8qh09c3cnkl1hg83jhmv1gzsv6nkjrq4mj5wh"; depends=[]; }; r4lineups = derive2 { name="r4lineups"; version="0.1.1"; sha256="1p0dnrp21zx1l9lqx01jnq54d5ppb8siibv47i4gsp7c7db9ymxc"; depends=[boot dplyr ggplot2 ggrepel here magick magrittr pROC psych purrr]; }; r4ss = derive2 { name="r4ss"; version="1.24.0"; sha256="1kifzfg2zx6lq2c8qqbhb096z1wgdayhg5qzx5hnkwpn05w5cma3"; depends=[coda corpcor gplots gtools maps pso truncnorm]; }; @@ -11547,6 +11721,7 @@ in with self; { rLDCP = derive2 { name="rLDCP"; version="1.0.2"; sha256="0k7zc1xyqmcl7070hhpqw1d2k1ij6bd4wjym8cw263pds2n7nx21"; depends=[XML]; }; rLTP = derive2 { name="rLTP"; version="0.1.4"; sha256="04w432m03xwh0szshsrfw5h7wy43q4lj8z0y07k8w6gsf27cy5bx"; depends=[RCurl]; }; rLakeAnalyzer = derive2 { name="rLakeAnalyzer"; version="1.11.4.1"; sha256="1bwg8mzddsc39km85b41bxp2hwqmb4g5a3010f6yp1qlgcb9rmj1"; depends=[plyr]; }; + rLandsat = derive2 { name="rLandsat"; version="0.1.1"; sha256="0zbmd36fs2rwdw4x2aphp44q3abyh4zj3dvx9z6jbkgwlsxvck0v"; depends=[dplyr httr jsonlite RCurl readr stringr svMisc]; }; rLiDAR = derive2 { name="rLiDAR"; version="0.1.1"; sha256="1w0yi4ygw0l9ydbllqjylp30d401bsf7b6fng6qg3pssbi9v3kln"; depends=[bitops deldir geometry plyr raster rgl sp spatstat]; }; rLindo = derive2 { name="rLindo"; version="8.0.1"; sha256="05qyc4wvpjgw8jxmwn2nwybi695fjn0cdilkprwmjg07c82f0q5n"; depends=[]; }; rMEA = derive2 { name="rMEA"; version="1.1.0"; sha256="1aarnik0qjxg6h55xpskx1dwkp78nfdyrwpy9r6ffyxhz9jbplnj"; depends=[]; }; @@ -11561,20 +11736,23 @@ in with self; { rPraat = derive2 { name="rPraat"; version="1.2.0-2"; sha256="00qxccdbs42d9mi33af08i4la4fi500rqxvll39mffnrwlwa3bhw"; depends=[dplyr dygraphs readr stringr tuneR]; }; rPref = derive2 { name="rPref"; version="1.3"; sha256="0vlzhxhf2x6gw015sjfw2638wv6hckg068rpbzncp7wprn9msa6y"; depends=[dplyr igraph lazyeval Rcpp RcppParallel]; }; rPython = derive2 { name="rPython"; version="0.0-6"; sha256="1aw9jn45mw891cskr51yil60i55xv5x6akjvfdsbb9nwgdwwrqdp"; depends=[RJSONIO]; }; + rQCC = derive2 { name="rQCC"; version="0.19.8.2"; sha256="091c53jggq3k9sf48pnds8s4kkqia6x268lbkb2fx88b408i0iny"; depends=[]; }; rRAP = derive2 { name="rRAP"; version="1.1"; sha256="1nzvs8bjkbjraa33azxf9mrxsxh87qhh3qlldrcs5y4fq4ancyqb"; depends=[lars lassoshooting MASS]; }; rSCA = derive2 { name="rSCA"; version="3.0"; sha256="1ka8p1slqb3a9hfc8z4j7v90k0wn6y35vmwxqaf8jlgwfhhc1v9f"; depends=[]; }; rSEA = derive2 { name="rSEA"; version="1.0.1"; sha256="0a1lx1x2xd05a07qbqg5d1v21fqqknlmrl9gbjg3k6wmydxwcly8"; depends=[hommel]; }; rSFA = derive2 { name="rSFA"; version="1.04"; sha256="0gd6ji1ynbb04rfv8jfdmp7dqnyz8pxcl5636fypd9a81fggl0gs"; depends=[MASS]; }; + rSHAPE = derive2 { name="rSHAPE"; version="0.3.2"; sha256="0z6dizsxlkmaymbd24b1m1i8kmndcf21nxxnyfzq6gvdii7bal4h"; depends=[abind DBI doParallel evd foreach RSQLite sn VGAM]; }; rSPARCS = derive2 { name="rSPARCS"; version="0.0.4"; sha256="1w2w5gx82dd4s0zbqk376195svs0z9f9cgx8zcy7gig94ilbrv5l"; depends=[data_table foreign geosphere plyr raster sp spatialEco tigris]; }; rSQM = derive2 { name="rSQM"; version="1.3.14"; sha256="0m69n2pnfv2085dln6p149a5gw0gif9xk00xmad5s9j68hwjdmym"; depends=[dplyr EcoHydRology ggplot2 gsubfn mise ncdf4 qmap reshape2 stringr yaml zoo]; }; rSymPy = derive2 { name="rSymPy"; version="0.2-1.2"; sha256="0jdl8ss3dbgjqrmmppb0ix1gqk9g28pbh6w5sybil046ic83s13i"; depends=[rJython]; }; + rSymbiota = derive2 { name="rSymbiota"; version="1.0.0"; sha256="0dld8li5b8ylhdmll6iz5pk4pxh2dk37hbx0458jn0zhd4fl1cm7"; depends=[crayon dplyr ggplot2 Hmisc httr knitr magick maps mapview RCurl RSelenium rvest rworldmap sf sp stringr sys treemap XML xml2]; }; rTRNG = derive2 { name="rTRNG"; version="4.20-1"; sha256="0l0gs65rbl080f1l67xiygz551q5lj0q48nz8m6gsjfq5ias5gn6"; depends=[Rcpp RcppParallel]; }; rTableICC = derive2 { name="rTableICC"; version="1.0.7"; sha256="1z896675kmm9p5dnmcnsz2205ynf05laqcxvlc9y0g5i0x8rf8v6"; depends=[aster partitions]; }; rTensor = derive2 { name="rTensor"; version="1.4"; sha256="08i94vvk5i25j40dwn497svgrmz90iwzp6qgiir37wgvx355xwzr"; depends=[]; }; rTephra = derive2 { name="rTephra"; version="0.1"; sha256="045f2sp2j4hiwa9k1vs6cxr59x1yr34jq1z2crasxflsxbwa3xz8"; depends=[]; }; rUnemploymentData = derive2 { name="rUnemploymentData"; version="1.1.0"; sha256="0p5hba8iv060szp23s05hvpmwan518ykakm6vqzdcki0inxw0hyv"; depends=[choroplethr rvest stringr]; }; rWBclimate = derive2 { name="rWBclimate"; version="0.1.3"; sha256="0vs56hx7a85pw4jx8nb8bdlr9dbkl4zdhzhqsm0505xc3qz18vxh"; depends=[ggplot2 httr jsonlite plyr reshape2 rgdal sp]; }; - rWind = derive2 { name="rWind"; version="1.0.4"; sha256="13ci2xzkjal869zm7llvkm8zrya7vhqy3gizq9py87zsds3h0f4y"; depends=[gdistance lubridate Matrix raster]; }; + rWind = derive2 { name="rWind"; version="1.1.3"; sha256="1q9f7mrjks7nb9lgkmi6w774dz479d2hhzhns0v0mrllmv9nck1s"; depends=[gdistance lubridate Matrix raster]; }; rWishart = derive2 { name="rWishart"; version="0.1.1"; sha256="1zv35l2nvwwidx5zxfh7a4jgiaq2mqk69xf974994k1ksfvibkmi"; depends=[lazyeval MASS Matrix]; }; rYoutheria = derive2 { name="rYoutheria"; version="1.0.3"; sha256="1r63ggy4knwzxnpjkmsn7zwmwfaznm8mmxl7r9ph10wz4sblgygl"; depends=[plyr RCurl reshape2 RJSONIO]; }; rabhit = derive2 { name="rabhit"; version="0.1.1"; sha256="010ayd8hyk02gwpnpa06n2rymxl1hy3j4jm5cn4x2xl3mj2kzg8h"; depends=[alakazam cowplot data_table dendextend dplyr ggdendro ggplot2 gridExtra gtable gtools htmlwidgets plotly RColorBrewer reshape2 rlang stringi tidyr tigger]; }; @@ -11583,29 +11761,31 @@ in with self; { radarBoxplot = derive2 { name="radarBoxplot"; version="1.0.0"; sha256="16s38yy984mb1hmsdw17z4nk2z4xg03xi0yrp7445yqv3fs1fghl"; depends=[]; }; radarchart = derive2 { name="radarchart"; version="0.3.1"; sha256="0gcxnbgj8ja1m4wzhbjy67m6zphf0c5ni9yx7sr7f0abm03ry753"; depends=[htmltools htmlwidgets]; }; radiant = derive2 { name="radiant"; version="0.9.9.1"; sha256="18zj6lbs04vqslm4zgga6fvm868a0m55sk45kj5vl46jadb6a52f"; depends=[r_import radiant_basics radiant_data radiant_design radiant_model radiant_multivariate shiny]; }; - radiant_basics = derive2 { name="radiant.basics"; version="0.9.9"; sha256="132y74g3mr291jcyrbky3ky0bh4pqll0mafcxm4ykrcqr9his3rw"; depends=[dplyr ggplot2 gridExtra magrittr psych r_import radiant_data scales shiny tidyr]; }; - radiant_data = derive2 { name="radiant.data"; version="0.9.9"; sha256="17mgm0sggh4f7ihqmj9m3996p3pqc7h2cwx6ll1ha3kg5mx0znyn"; depends=[base64enc broom car curl dplyr DT ggplot2 glue gridExtra jsonlite knitr lubridate magrittr markdown plotly psych r_import readr readxl rlang rmarkdown rstudioapi scales shiny shinyAce shinyFiles stringi tibble tidyr writexl]; }; + radiant_basics = derive2 { name="radiant.basics"; version="1.0.0"; sha256="188dzsr8lwbam9hvvwqgcf08aj4ja04fvfcw315g4jy1nbhbvg33"; depends=[dplyr ggplot2 gridExtra magrittr psych r_import radiant_data scales shiny tidyr]; }; + radiant_data = derive2 { name="radiant.data"; version="1.0.0"; sha256="0b35jn4mcj10hqra18l8pi6s4pvj6fxipslbn6hkr4zza1z27gzw"; depends=[base64enc broom car curl dplyr DT ggplot2 glue gridExtra jsonlite knitr lubridate magrittr markdown plotly psych r_import readr readxl rlang rmarkdown rstudioapi scales shiny shinyAce shinyFiles stringi tibble tidyr writexl]; }; radiant_design = derive2 { name="radiant.design"; version="0.9.9"; sha256="1d5ds24b7mp8xad5pgzvjr17akr7p8m6w0ryd5fkwylnfgnhznrb"; depends=[AlgDesign dplyr mvtnorm polycor pwr r_import radiant_data shiny]; }; - radiant_model = derive2 { name="radiant.model"; version="0.9.9"; sha256="0mcds65pfz4d5h93imsvw74r0lp1vldlhy7q3h0xivrhkjri1g8v"; depends=[car data_tree DiagrammeR dplyr e1071 ggplot2 gridExtra lubridate magrittr NeuralNetTools nnet psych r_import radiant_basics radiant_data rlang rpart sandwich shiny stringr tidyr yaml]; }; + radiant_model = derive2 { name="radiant.model"; version="1.0.0"; sha256="14zk2yl40694kyri5wr7czc2ymwqa68n7jzk6j1a28l7cbgs8xfx"; depends=[car data_tree DiagrammeR dplyr e1071 ggplot2 gridExtra lubridate magrittr NeuralNetTools nnet psych r_import radiant_basics radiant_data rlang rpart sandwich shiny stringr tidyr yaml]; }; radiant_multivariate = derive2 { name="radiant.multivariate"; version="0.9.9.1"; sha256="154q06vbj13y15rz2apvy521gda8jh66yhr87kqvlv9mh2k9ws2h"; depends=[car dplyr ggplot2 ggrepel Gmedian GPArotation gridExtra magrittr MASS psych r_import radiant_data radiant_model rlang scales shiny]; }; radiomics = derive2 { name="radiomics"; version="0.1.3"; sha256="1ra94yaqw88slznhyv70kbfricxi44m4pnx1zh4ijghm491rphr5"; depends=[Rcpp reshape2 spatstat]; }; - radir = derive2 { name="radir"; version="1.0.3"; sha256="0v1w0jy19fqscwkggyjashb6n9r6xjc0d971zw0lqnh1ap3chg0y"; depends=[hermite]; }; + radir = derive2 { name="radir"; version="1.0.4"; sha256="12a99ig3n6kp5wa5rjp2w1nal4qqjs6vq05d3lrqcyl3bind6lqb"; depends=[hermite]; }; radix = derive2 { name="radix"; version="0.6"; sha256="0290n0yax8649srdjbq4439h0d9f6jsmxayyhp86igcnszcxilnb"; depends=[base64enc bookdown digest downloader htmltools jsonlite knitr lubridate mime png progress rmarkdown rprojroot rstudioapi stringr whisker xfun xml2 yaml]; }; radjust = derive2 { name="radjust"; version="0.1.0"; sha256="0krryhqid16a6jfb007n0k6rc8r7c808h859a9pjid2jbkg0bm7l"; depends=[]; }; radlibs = derive2 { name="radlibs"; version="0.1.0"; sha256="1yyd63shc35mdixkz8gigwqb9g2l1baxgmzijhshpqavixdhazmk"; depends=[data_table lexicon stringr]; }; radmixture = derive2 { name="radmixture"; version="0.0.1"; sha256="0rs60xjd43lg5c9972qhpg6bsqfg2578qvrz7gz3bdip10jb1ryj"; depends=[magrittr MCMCpack plyr quadprog]; }; radsafer = derive2 { name="radsafer"; version="2.0.1"; sha256="0qzd7zzflyr5gzk1ad3wwn8mxrzijzv9fnj76q43qb1mgr4d5sww"; depends=[dplyr ggplot2 magrittr RadData readr rlang stringr]; }; rafalib = derive2 { name="rafalib"; version="1.0.0"; sha256="1dmxjl66bfdgrybhwyaa8d4i460liqcdw8b29a6w7shgksh29m0k"; depends=[RColorBrewer]; }; + ragg = derive2 { name="ragg"; version="0.1.2"; sha256="0bb6sa8zs42p5p4hcyip89rlgyzymzfdr7n7bxfyb61l2aj5x9db"; depends=[systemfonts]; }; rags2ridges = derive2 { name="rags2ridges"; version="2.2.1"; sha256="0xiv4dhzxbxy9bqjpz8rfrh0pzxbsnkg5wgz61c643slidgs0h0d"; depends=[expm fdrtool ggplot2 graph gRbase Hmisc igraph RBGL Rcpp RcppArmadillo reshape RSpectra sfsmisc snowfall]; }; ragt2ridges = derive2 { name="ragt2ridges"; version="0.3.2"; sha256="03613amz11ixgkjhc8rg4vp3ih60g1ibhdjrldr9mazzkak46y91"; depends=[abind expm fdrtool igraph MASS Matrix mvtnorm rags2ridges Rcpp RcppArmadillo]; }; ragtop = derive2 { name="ragtop"; version="1.1.0"; sha256="1gz4hdfb4yxjqcmclxw2yacpk0km29n3gfpqkcj48wr1s6vv7djb"; depends=[futile_logger limSolve]; }; + rai = derive2 { name="rai"; version="1.0.0"; sha256="0qimfzchbrarkwmv3mxxbdgvqzk16sc8m1h140zm0cnfgr2pvi5p"; depends=[dplyr ggplot2 readr rlang]; }; railtrails = derive2 { name="railtrails"; version="0.1.1"; sha256="1hi55rcxmr7k3na3rpjqmd5fpgn51bymrp7yxmw45ff7mlzpa5h6"; depends=[tibble]; }; rainbow = derive2 { name="rainbow"; version="3.6"; sha256="11vfcck17d2xjc049ci5i8l1nqv345anmd110gdz7654i1pj9lb3"; depends=[cluster colorspace hdrcde ks MASS pcaPP]; }; raincpc = derive2 { name="raincpc"; version="0.4"; sha256="0yzpyidvf24frf82pj7rarjh0ncm5dhm0mmpsf2ycqlvp0qld10i"; depends=[SDMTools]; }; rainfarmr = derive2 { name="rainfarmr"; version="0.1"; sha256="1gasnmyjnis6vv0krx6299ck2a6v9v1fgqajzqdpjaz2fsxn245i"; depends=[]; }; rainfreq = derive2 { name="rainfreq"; version="0.3"; sha256="0985ck2bglg22gfj7m0hc7kpk0apljsbssf1ci99mgk47yi8fk9v"; depends=[RCurl SDMTools]; }; rakeR = derive2 { name="rakeR"; version="0.2.1"; sha256="0cd89q6k0y9z1qk9k06iw56lhj4c52ckr0g4qv6q95lkyrbi3qg8"; depends=[ipfp wrswoR]; }; - ramchoice = derive2 { name="ramchoice"; version="1.0"; sha256="0cjj4kk05mif0blfkw86xvnx3aaq07c64ffpvbvvb32s2pqvc91r"; depends=[MASS]; }; + ramchoice = derive2 { name="ramchoice"; version="1.1"; sha256="1im9r95109919hfmici6avdqxh3a375wmg2lfy75z1gjivvcygbr"; depends=[MASS]; }; ramcmc = derive2 { name="ramcmc"; version="0.1.0-1"; sha256="0x8q0bah8fcyqlwap9iw52xhl6b989va5c144kgmfimh2b4yinc7"; depends=[Rcpp RcppArmadillo]; }; ramify = derive2 { name="ramify"; version="0.3.3"; sha256="0cxmkxhshg0vrcxai2gbm4iih04f44liv5nh5jiq85hjz8qbhdi2"; depends=[]; }; ramlegacy = derive2 { name="ramlegacy"; version="0.2.0"; sha256="0q8qks8qapar12dzlkxlbvw4rj7qxmfw64cph834ckm4z7sis873"; depends=[cli crayon httr rappdirs readxl]; }; @@ -11620,7 +11800,7 @@ in with self; { random_polychor_pa = derive2 { name="random.polychor.pa"; version="1.1.4-2"; sha256="1ybwfn3hdwisxjn85vqrib1zhk8dcddbarbwjdf1vn27ih3c4h2c"; depends=[boot MASS mvtnorm nFactors psych sfsmisc]; }; randomForest = derive2 { name="randomForest"; version="4.6-14"; sha256="0kbmm0l42fc2d1rdq0l7k09d34kd87q4lx651ffsic4y84h8kf7l"; depends=[]; }; randomForestExplainer = derive2 { name="randomForestExplainer"; version="0.9"; sha256="0gqqm3784krl6xdx7j6xvvyi2rjbyi6c8shm44yvq59is5i7fypc"; depends=[data_table dplyr DT dtplyr GGally ggplot2 ggrepel MASS randomForest reshape2 rmarkdown]; }; - randomForestSRC = derive2 { name="randomForestSRC"; version="2.9.0"; sha256="1kdxkz7c2a73hflagz8gxhp1dgqxwdik0wxczd72iy60a5navscw"; depends=[]; }; + randomForestSRC = derive2 { name="randomForestSRC"; version="2.9.1"; sha256="1vylj5mdhy11nda644yn7mdz9kf64a9zz8j317y5n1jmzvx4fyii"; depends=[]; }; randomGLM = derive2 { name="randomGLM"; version="1.02-1"; sha256="031338zxy6vqak8ibl2as0l37pa6qndln0g3i9gi4s6cvbdw3xrv"; depends=[doParallel foreach MASS]; }; randomLCA = derive2 { name="randomLCA"; version="1.0-15"; sha256="10rx2ah50dcjxz5y492c59d3pn0dvlgjaxfdf8sknkf6s4pmwkis"; depends=[boot fastGHQuad lattice Matrix]; }; randomNames = derive2 { name="randomNames"; version="1.4-0.0"; sha256="1kchngfjv53n32z2qjrplp2xmssl8gjx1y3m7bxsfq1wjzj52qf5"; depends=[crayon data_table toOrdinal]; }; @@ -11641,7 +11821,7 @@ in with self; { rangemodelR = derive2 { name="rangemodelR"; version="1.0.4"; sha256="0y8hdqi04n3pc3iwz82gikn61h42bmfi7iccwgbglk8wkrkg4gy0"; depends=[]; }; ranger = derive2 { name="ranger"; version="0.11.2"; sha256="1sxyzxmjc6lm8wcmq15j6sscnza7aay4mr3dyri2zngx6fa8mb0k"; depends=[Matrix Rcpp RcppEigen]; }; rankFD = derive2 { name="rankFD"; version="0.0.3"; sha256="0cqvr01hbq3cz2zxmysl2k88wfckyvnlsdk8ypdxdkap4gavnvqv"; depends=[coin lattice MASS Matrix]; }; - rankdist = derive2 { name="rankdist"; version="1.1.3"; sha256="1hdafy2zzn7hwl1lx5jksgi974zjn49dwih5s2zdyv4nnmmai003"; depends=[hash optimx permute Rcpp]; }; + rankdist = derive2 { name="rankdist"; version="1.1.4"; sha256="1xqrkss8d5vv3blqpvrvdczsygphbx259hy9j7w9b2ahssw8cjr5"; depends=[hash optimx permute Rcpp]; }; rankhazard = derive2 { name="rankhazard"; version="1.1.0"; sha256="0kljn9b74alrd22b5pwfnamdbaqi2wa2z6yzpmgpfs3x0hv72fw7"; depends=[survival]; }; rapiclient = derive2 { name="rapiclient"; version="0.1.2"; sha256="072rlr7z9rj4agkzmy12cz4axh4pajavfd83lpcx2b1lgxpj6ck4"; depends=[httr jsonlite]; }; rapidjsonr = derive2 { name="rapidjsonr"; version="1.1"; sha256="0h4phjjhykbb45rg5b1xn48vqxdcvcngbm0416ds8in7j469wbwd"; depends=[]; }; @@ -11658,11 +11838,11 @@ in with self; { rasciidoc = derive2 { name="rasciidoc"; version="2.0.0"; sha256="1bqabjr8h0ldhmf7mirk0fkv6nrv80zrm2vrx836ib5cxb2hw1yv"; depends=[document highr knitr]; }; rasclass = derive2 { name="rasclass"; version="0.2.2"; sha256="1lsmv8kh519mz3szb4k9s17fz1480cw0i4qk12givhhm2rpzjy50"; depends=[car e1071 nnet randomForest RSNNS]; }; rase = derive2 { name="rase"; version="0.3-3"; sha256="03jqf5y5vj354m9psp81wzw6d7dfqr76bfjqv9kannsakkj587sy"; depends=[ape mvtnorm polyCub rgl sm spatstat]; }; - raster = derive2 { name="raster"; version="2.9-5"; sha256="0ljrymsp4zzaxdj1l0mw0a6hi88m5h0h920ixfzrg0szbyxqd0yk"; depends=[Rcpp sp]; }; + raster = derive2 { name="raster"; version="2.9-23"; sha256="1brqigic8ygr223bp2hgk5qjz3q03r4sfglrv4an0ghy7fgfralh"; depends=[Rcpp sp]; }; rasterImage = derive2 { name="rasterImage"; version="0.3.0"; sha256="0csx7wqwxdsddypd1c9wv74gcyymasn9n6pn05a35j6xhqbk2zp3"; depends=[plotrix]; }; rasterKernelEstimates = derive2 { name="rasterKernelEstimates"; version="1.0.1"; sha256="1733ic1hxym3gyibk2ysy5zzq7s9rbf6jx63x7irnrcavq151f8s"; depends=[raster]; }; rasterList = derive2 { name="rasterList"; version="0.5.8"; sha256="0q7apglxzpah04463z07cpkzyd6l6dbbdhm601brzh6yk75z20vh"; depends=[raster]; }; - rasterVis = derive2 { name="rasterVis"; version="0.45"; sha256="0x1d28jn6l78lhccbnlnzyr18734f16rcfnfyl9vqpkrn7sgwc3i"; depends=[hexbin lattice latticeExtra raster RColorBrewer sp viridisLite zoo]; }; + rasterVis = derive2 { name="rasterVis"; version="0.46"; sha256="0lzjqkm22qfcmzgnjv9k9b49hx9xa3vjwcl9935a5kjqsn57ipdy"; depends=[hexbin lattice latticeExtra raster RColorBrewer sp viridisLite zoo]; }; rasterize = derive2 { name="rasterize"; version="0.1"; sha256="18nrhmq1qmi05rkyr86xsyc8nz0fbdpf2d45h62bbfzbfynqd4qy"; depends=[png]; }; ratelimitr = derive2 { name="ratelimitr"; version="0.4.1"; sha256="06x759jxr5zcnvg9q120n5bpipkb16piw15kxrpk7i918mby889b"; depends=[assertthat]; }; ratematrix = derive2 { name="ratematrix"; version="1.2.1"; sha256="0hbwfgwkkd5a83f3nqk5gdyiqbpzsgshvcjcslaz73si05zsrkgs"; depends=[ape coda corpcor ellipse geiger MASS mvMORPH phylolm Rcpp RcppArmadillo readr]; }; @@ -11676,14 +11856,15 @@ in with self; { raustats = derive2 { name="raustats"; version="0.1.0"; sha256="0wyq45v4d5gyrn2zbn0qj7wm4a0jh0xjlp6wzzpdiy2w3c9xwx5z"; depends=[dplyr httr jsonlite lubridate readxl rvest tidyr xml2]; }; raw = derive2 { name="raw"; version="0.1.6"; sha256="0hnqwa9pwj3k2y0bs6hxrvbwksjyq0q6m73c9hhlafg8g3lkyxnf"; depends=[]; }; raws_profile = derive2 { name="raws.profile"; version="0.1.0"; sha256="04f7wk7x9j3rb6nn3zqss9vw0h9a4vpcjyilc2vqy0fm2by41xkg"; depends=[stringr tibble withr]; }; - rayshader = derive2 { name="rayshader"; version="0.10.1"; sha256="0yjqp3fgcay12iirji27nhpck51salln5793axqkj1fwjl6h12d4"; depends=[doParallel foreach imager magrittr png progress raster Rcpp RcppArmadillo rgl scales]; }; - rbacon = derive2 { name="rbacon"; version="2.3.8"; sha256="1qhph8rwziiq1787dmsjz4j43j2375h8nhdfkjfn20snm043krz9"; depends=[coda Rcpp]; }; + rayshader = derive2 { name="rayshader"; version="0.11.5"; sha256="1sycybfpw0d5d7f2579047jr60vay26hzqlvj8a5c9czdyrvlcxs"; depends=[doParallel foreach ggplot2 imager magrittr png progress raster Rcpp RcppArmadillo rgl scales]; }; + rbacon = derive2 { name="rbacon"; version="2.3.9.1"; sha256="0gnvi0aaw4yyg1cvrdyps2590gx1lwcjl21y4q9zn3k00mnwmc12"; depends=[coda Rcpp]; }; + rbart = derive2 { name="rbart"; version="1.0"; sha256="1byfm1ycw9nfhdblqklyn8pxn6b9q5fa3inbgfpynqpsid97ig35"; depends=[Rcpp]; }; 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=[]; }; rbgm = derive2 { name="rbgm"; version="0.0.5"; sha256="1gz9hxlwmj2ch1ds6mx1nlkwy4fm811jkz5fz3cl6675n11bjdpg"; depends=[dplyr geosphere raster readr rlang sp stringr tibble]; }; rbhl = derive2 { name="rbhl"; version="0.8.0"; sha256="1avx36as99za19acjh7adb72ckdn69rmiwzcrrqxskzny56vxf0d"; depends=[crul jsonlite plyr tibble xml2]; }; - rbi = derive2 { name="rbi"; version="0.10.1"; sha256="1ajvmqa4zp44nb50gb3adf8xg4vxm15w233dxvdfnxv8sdn1nll6"; depends=[data_table ncdf4 processx reshape2]; }; - rbi_helpers = derive2 { name="rbi.helpers"; version="0.3.0"; sha256="03fshs7q7pdybi3p35940hwnq971534pg3anddansbnhjihabkgx"; depends=[data_table lubridate Matrix rbi reshape2]; }; + rbi = derive2 { name="rbi"; version="0.10.2"; sha256="158yi9d8pxgb5b1x1qpjzrfnq673vmsbmgm00w0dbk03akcvlfzc"; depends=[data_table ncdf4 processx reshape2]; }; + rbi_helpers = derive2 { name="rbi.helpers"; version="0.3.1"; sha256="0hngqbdydvvp4zmicvnnmwz3fw6pjvgdxp7h80zk1qczid2yg4x5"; depends=[data_table lubridate Matrix rbi reshape2]; }; rbin = derive2 { name="rbin"; version="0.1.1"; sha256="1rbwm5xc61sva1m3n5hd9vsh7gm4hamswny35zm7j0fyc4v4bzxz"; depends=[DescTools dplyr forcats ggplot2 glue magrittr miniUI purrr recipes rlang rstudioapi shiny tibble]; }; rbiouml = derive2 { name="rbiouml"; version="1.8"; sha256="0qvc896sf6idczbxix3klf56paxf0wpfbmga8qqlcyjasv1dsdql"; depends=[RCurl RJSONIO]; }; rbison = derive2 { name="rbison"; version="0.8.0"; sha256="0x2yiq1wvm6mzmhfa3ds8mmhidv91hxi14nhz4nib6nmna3c9al2"; depends=[crul data_table dplyr ggplot2 jsonlite mapproj plyr sp]; }; @@ -11711,19 +11892,19 @@ in with self; { rcdk = derive2 { name="rcdk"; version="3.4.7.1"; sha256="1d08ajji631792b7fyfwzvcaswh8jlanfsxrj6c1wx7xh3qqpigg"; depends=[fingerprint iterators itertools png rcdklibs rJava]; }; rcdklibs = derive2 { name="rcdklibs"; version="2.0"; sha256="05g0y00bw1bqykfbwn4q42krwcfl50jcavaw7yyw9a5m34hvw0l8"; depends=[rJava]; }; rchallenge = derive2 { name="rchallenge"; version="1.3.0"; sha256="1qn2pzch5yk771jsjcsmfsi5vddfb2w50vfqlkmsl6nf5z6sdq9k"; depends=[knitr rmarkdown]; }; - rcheology = derive2 { name="rcheology"; version="3.6.0.0"; sha256="1hxs799w0lqrbd12lgrl4wm2n5qbg5hxwq3mcjrdya54mb74j7ff"; depends=[]; }; + rcheology = derive2 { name="rcheology"; version="3.6.1.0"; sha256="08z1nygygl2b5qri1nngjijzf8dnpx4f67h71f2mm6v7mykjqwrd"; depends=[]; }; rchess = derive2 { name="rchess"; version="0.1"; sha256="0qnvvvwcl02rmqra9m7qnhy40cbavswbq6i0jm47x6njmr1gpfhy"; depends=[assertthat dplyr ggplot2 htmlwidgets plyr R6 V8]; }; rchie = derive2 { name="rchie"; version="1.0.2"; sha256="1m89mwq5f81yr2vc3wvnxkpm04bad11sx5fllcd3yy8ilghmbfp6"; depends=[jsonlite V8]; }; rcicr = derive2 { name="rcicr"; version="0.3.4.1"; sha256="1sa13sbhx64cf8szr2811iq4a1asb8d3k0igxw6fbssij2lwbxzp"; depends=[aspace dplyr jpeg matlab scales]; }; rcites = derive2 { name="rcites"; version="1.0.1"; sha256="1rpalysmv0c7f23aj3k6h80cw9cmsv0vn82da07km5qfll5pis6y"; depends=[cli httr jsonlite]; }; rcitoid = derive2 { name="rcitoid"; version="0.1.0"; sha256="11iqdj1q983w28fh17rqvmhs41ks09b24p408nl7hz4iqg9c7lpi"; depends=[crul curl fauxpas jsonlite]; }; rclimateca = derive2 { name="rclimateca"; version="1.0.2"; sha256="012p6vj78m43y8n85diaf5z11h4v0p4s898jmlipvsha11q60csn"; depends=[digest dplyr httr lubridate magrittr mudata2 prettymapr purrr readr reshape2 rlang stringr tibble tidyr]; }; - rclipboard = derive2 { name="rclipboard"; version="0.1.1"; sha256="0rgvin8nk8bbj7agwb0p2x6dg1p16s9qixjqq5rnxprdj7p6dhdm"; depends=[shiny]; }; + rclipboard = derive2 { name="rclipboard"; version="0.1.2"; sha256="04vkxz2wqb3q3igjqgaaim3sb71h046c2b8rhvg51hkp1win8s5w"; depends=[shiny]; }; rcmdcheck = derive2 { name="rcmdcheck"; version="1.3.3"; sha256="1d4kzgfqy72r6b7bn1j4znyksrycgypx1jjvpv9lrmvn37mpkdhs"; depends=[callr cli crayon desc digest pkgbuild prettyunits R6 rprojroot sessioninfo withr xopen]; }; - rcompanion = derive2 { name="rcompanion"; version="2.2.1"; sha256="04a69kqn37plsy8x4lsm86w2hxvan4vhn3vlqb67fc1dkihkphyh"; depends=[boot coin DescTools EMT lmtest multcompView nortest plyr]; }; + rcompanion = derive2 { name="rcompanion"; version="2.2.2"; sha256="1jlyd4cgzksxw7sjhjdvl10vr741ybidml95qi2gwp2r3x3nw4a3"; depends=[boot coin DescTools EMT lmtest multcompView nortest plyr]; }; rcoreoa = derive2 { name="rcoreoa"; version="0.3.0"; sha256="0z9kllhk1j7c4sgnd88ngxv7xvr396azg9vr9p6i72ficr7flr64"; depends=[crul hoardr jsonlite pdftools]; }; rcorpora = derive2 { name="rcorpora"; version="2.0.0"; sha256="1b8xa81mn3afadz77576vda9b0d99f1k096drxrpqd989g993aqy"; depends=[jsonlite]; }; - rcosmo = derive2 { name="rcosmo"; version="1.1.0"; sha256="1qz040ylzclal5mmbjlaqng8cr3zm17zkzm73f94j6rzg9j5ip3q"; depends=[cli entropy FITSio geoR mmap nnls Rcpp rgl tibble]; }; + rcosmo = derive2 { name="rcosmo"; version="1.1.1"; sha256="195cxjgkcgz9qx51hsg9bd2y7c96dk69c8yvy9s2w59jy9iy5i7y"; depends=[cli entropy FITSio geoR mmap nnls Rcpp rgl tibble]; }; rcreds = derive2 { name="rcreds"; version="0.6.6"; sha256="1sdrdgn53kgcdnxfjs8jh0h538vb3b9ixz74lbnp54yp09jpqsri"; depends=[collectArgs digest jsonlite magrittr]; }; rcrossref = derive2 { name="rcrossref"; version="0.9.2"; sha256="1383xlwy3vj08hhghx5zsy0890zsm402x9hdqzs5x5q7mxkqdwjq"; depends=[bibtex crul dplyr DT jsonlite miniUI plyr R6 shiny stringr xml2]; }; rcrtan = derive2 { name="rcrtan"; version="0.1.1"; sha256="0kcp3gnjmp00i1hsjagpp0dlr6zgpc4y5ihpx93hm4m3fnzcmn7x"; depends=[dplyr magrittr purrrlyr tibble tidyr]; }; @@ -11738,7 +11919,7 @@ in with self; { rdbnomics = derive2 { name="rdbnomics"; version="0.4.7"; sha256="1qbng6hml3nafs9vv1vrpaj0755di6bcxrzvp2ng9psh2yv0plz2"; depends=[curl data_table jsonlite]; }; rdd = derive2 { name="rdd"; version="0.57"; sha256="1lpkzcjd18x51wzr4d1prdjfsw5978z6zap65psfs02nszy69nqp"; depends=[AER Formula lmtest sandwich]; }; rddapp = derive2 { name="rddapp"; version="1.1.0"; sha256="0zdm54hlxqp7r21fwdka33syjsrf6flrvwqm86hpwhg95880ixkk"; depends=[AER Formula lmtest R_utils sandwich shiny]; }; - rddensity = derive2 { name="rddensity"; version="0.2.2"; sha256="10530il8fxpgcads6yvj09jwanldlpvjgjqcknl2wly4gmwcwjq9"; depends=[ggplot2 lpdensity]; }; + rddensity = derive2 { name="rddensity"; version="1.0"; sha256="0v94izsghy35b33dq5b28p2lqs1fw1snyipdf9vgjz5s3qkzjkd8"; depends=[ggplot2 lpdensity]; }; rddtools = derive2 { name="rddtools"; version="0.4.0"; sha256="1z9sl9fwsq8zs1ygmnjnh3p6h9hjkikbm4z7cdkxw66y0hxgn96s"; depends=[AER Formula ggplot2 KernSmooth lmtest locpol np rdd sandwich]; }; rde = derive2 { name="rde"; version="0.1.0"; sha256="1zw9gdh90hl0wc5c0xwl5x7566r611wk73sbqdmpzpswjyyl9aqm"; depends=[clipr]; }; rdetools = derive2 { name="rdetools"; version="1.0"; sha256="0pkl990viv7ifr7ihgdcsww93sk2wlzp2cg931wywagfp8dijd02"; depends=[]; }; @@ -11764,7 +11945,7 @@ in with self; { re2r = derive2 { name="re2r"; version="0.2.0"; sha256="0xv355h4bps4a0picxmi6i15niq4knlail80fp9xvszyn72pm8gq"; depends=[htmlwidgets Rcpp RcppParallel stringi]; }; reGenotyper = derive2 { name="reGenotyper"; version="1.2.0"; sha256="13g4fhj25kdk6wbl1hcabcaxcpv0dj0hj2l502wl1aywk1fvmy8m"; depends=[gplots MatrixEQTL zoo]; }; reReg = derive2 { name="reReg"; version="1.1.6"; sha256="198vgf3294if9zmvl54pgx6ram63pswpjnh44fy7n60g8nza44bb"; depends=[BB dplyr ggplot2 MASS nleqslv plyr purrr SQUAREM survival tibble tidyr]; }; - reactR = derive2 { name="reactR"; version="0.4.0"; sha256="1fwbcspik8f1k307gw2vksbbk3z5ndw60cvfcjb9jw87kd14imnd"; depends=[htmltools]; }; + reactR = derive2 { name="reactR"; version="0.4.1"; sha256="0fzx0qy9s366gd81xiz36k3v4d9sdsrrf3m5azlghvbvq5h42wxv"; depends=[htmltools]; }; reactlog = derive2 { name="reactlog"; version="1.0.0"; sha256="1pajxd9k208s06sava2gqip22pzwlyslnfvkbkfw47mp4wb7zmk9"; depends=[jsonlite]; }; read_dbc = derive2 { name="read.dbc"; version="1.0.5"; sha256="1vrvxkcrk3iw5am9rsadxzf0wsr7z2mdpa5wb0v9jbhda710b4yf"; depends=[foreign]; }; read_gb = derive2 { name="read.gb"; version="1.6"; sha256="17py6al9cwq4jmab7k2164f7hi8943gi8a50d8zpn1xms9l2cnld"; depends=[]; }; @@ -11788,6 +11969,7 @@ in with self; { readsdmx = derive2 { name="readsdmx"; version="0.2.2"; sha256="1ja6fpjsbx5jzv9ys12wkcn3jrj8a2gnxpbswqk6ppckryi9hnp7"; depends=[Rcpp]; }; readstata13 = derive2 { name="readstata13"; version="0.9.2"; sha256="02mqwpzn7n3pqjxivnd1vlfc47xkyiywfz594x0f6vd2dym8rdwd"; depends=[Rcpp]; }; readtext = derive2 { name="readtext"; version="0.75"; sha256="0xbl4q3y4kzigr6rgqb04sq1xqddfzqivkjmbd0v5sfammrhla8n"; depends=[antiword data_table digest httr jsonlite pdftools readODS readxl streamR stringi striprtf tibble xml2]; }; + readwritesqlite = derive2 { name="readwritesqlite"; version="0.0.2"; sha256="064imgjl197avdsjhqvlg9yzgsp4p4yisvk62l6arcnkixwlz086"; depends=[checkr DBI dttr2 err hms RSQLite sf tibble units]; }; readxl = derive2 { name="readxl"; version="1.3.1"; sha256="15mambxr8c7k2ikdfsl1w3vxvm54dsnk0cl1qvks6iig7rql3d14"; depends=[cellranger progress Rcpp tibble]; }; realestateDK = derive2 { name="realestateDK"; version="0.1.0"; sha256="02y3c2zww9jakh9a0jqxkgcwshjz1hd5mw63603hyic7q4a07iv3"; depends=[statsDK]; }; reams = derive2 { name="reams"; version="0.1"; sha256="07hqi0y59kv5lg0nl75xy8n48zw03y5m71zx58aiig94bf3yl95c"; depends=[leaps mgcv]; }; @@ -11800,7 +11982,7 @@ in with self; { rebus_unicode = derive2 { name="rebus.unicode"; version="0.0-2"; sha256="185313wh4zpp6addfdr78pjhxzazlfwgsddwk02zrzblf4iwzjdm"; depends=[rebus_base]; }; recexcavAAR = derive2 { name="recexcavAAR"; version="0.3.0"; sha256="0b91jbgqzkgzvk658ckk639yyz1daa0xql3qgl0kzgqg68d53x20"; depends=[kriging Rcpp]; }; rechonest = derive2 { name="rechonest"; version="1.2"; sha256="0vpff8q5p6in7vjyl62bx3wmksravcg4mpx20qlgy5ia47vyhqp2"; depends=[httr jsonlite RCurl]; }; - recipes = derive2 { name="recipes"; version="0.1.5"; sha256="056zv4vhayyy8q9izcdknbb9hff2gxivg21g5mkssia78vw8g3mg"; depends=[dplyr generics glue gower ipred lubridate magrittr Matrix purrr RcppRoll rlang tibble tidyr tidyselect timeDate withr]; }; + recipes = derive2 { name="recipes"; version="0.1.6"; sha256="1ndz9h0zvdj141r63l8047wbhaj0x8fwzzyq7b8mh78pvrrdpq2i"; depends=[dplyr generics glue gower ipred lubridate magrittr Matrix purrr rlang tibble tidyr tidyselect timeDate withr]; }; reclin = derive2 { name="reclin"; version="0.1.1"; sha256="15qrdgjmclffivnljgmmipws9ks41fj4q40wnq0fk14mbv2045g2"; depends=[dplyr ldat lpSolve lvec Rcpp stringdist]; }; recluster = derive2 { name="recluster"; version="2.8"; sha256="05g8k10813zbkgja6gvgscdsjd99q124jx31whncc4awdsgk69s4"; depends=[ape cluster phangorn phytools picante vegan]; }; recmap = derive2 { name="recmap"; version="1.0.5"; sha256="1xl2j6zjk1vyf2zz8zcl4532k0c1jkrjqhp3vndnl5ynqr5nqlph"; depends=[GA Rcpp sp]; }; @@ -11820,7 +12002,7 @@ in with self; { reddPrec = derive2 { name="reddPrec"; version="0.4.0"; sha256="0zmkaiivvjq8mcaz310zgjjc7y0wgsqv29bf8nhli5qawaczvb9a"; depends=[fields snowfall]; }; redist = derive2 { name="redist"; version="1.3-3"; sha256="18asjam8hvayvnfysyjzbazjn27ds7163qhdq0p9aqlx03v89aa9"; depends=[coda doParallel foreach Rcpp RcppArmadillo sp spdep]; }; redland = derive2 { name="redland"; version="1.0.17-10"; sha256="0k28896jsxy1qxnn6iyx3xxasq4y171xfjragqkj568nn9lmzfi8"; depends=[roxygen2]; }; - redlistr = derive2 { name="redlistr"; version="1.0.2"; sha256="1s335dim68qx0i28w7586kacb8j8qawwg5az56a8ggja6yll306f"; depends=[plyr raster rgeos sp]; }; + redlistr = derive2 { name="redlistr"; version="1.0.3"; sha256="003jxfmj1gryw77vnrvaxmpvjbshlq53wgcrj02mcywfcqzg4jcr"; depends=[plyr raster rgeos sp]; }; redshiftTools = derive2 { name="redshiftTools"; version="1.0.1"; sha256="0rg9s9i7cdy2qm45bpm50d7859pqx1kmk4m8gpazkp0kgr7alb7l"; depends=[aws_s3 DBI progress purrr]; }; redux = derive2 { name="redux"; version="1.1.0"; sha256="0a551w7fph338mqzxda6y21lsad19dway7w18jw9cv1rgvcp9nvc"; depends=[R6 storr]; }; ref_ICAR = derive2 { name="ref.ICAR"; version="1.0"; sha256="0k6czsbjclgmi7vp5hl50jghkzm573s50993iz3dcv55mv662251"; depends=[coda MCMCglmm mvtnorm Rdpack rgdal spdep]; }; @@ -11852,7 +12034,7 @@ in with self; { regsubseq = derive2 { name="regsubseq"; version="0.12"; sha256="0879r4r8kpr8jd6a3fa9cifm7cv0sqzz8z1alkm1b2fr1625md3g"; depends=[]; }; regtest = derive2 { name="regtest"; version="0.05"; sha256="1wrrpp2hvkas0yc512gya3pvd0v97pn4v51k5jxkwyd1pp68zd1q"; depends=[]; }; regtools = derive2 { name="regtools"; version="1.0.1"; sha256="0807r8721qmdl8ahvlzcvqaq2rfvlvhblwbwdpi79fm7dk8vvq1i"; depends=[car dummies FNN mvtnorm]; }; - rehh = derive2 { name="rehh"; version="2.0.4"; sha256="1p5883p8fyafhz3nkg65ahcqxmmzh03wkvjm383j081bmcl1rb9x"; depends=[gplots rehh_data]; }; + rehh = derive2 { name="rehh"; version="3.0.1"; sha256="061nk9xmlbllisszpscfpa95653745v645jm3qls1cp42d73rz6k"; depends=[rehh_data]; }; rehh_data = derive2 { name="rehh.data"; version="1.0.0"; sha256="1jkvwmnnmfa7iyvrabgcfzw3vfzx0dlgq47s6yf4zayi437v4di0"; depends=[]; }; rehydratoR = derive2 { name="rehydratoR"; version="0.5.2"; sha256="1d94m9hv1l72l9lph2vzbq4qqbfcgyhv2qk82p9vb8l2ckavjzvv"; depends=[dplyr jsonlite rtweet tibble]; }; reinforcedPred = derive2 { name="reinforcedPred"; version="0.1.1"; sha256="0lf3lznzvckqg04446pvq35p31fv9ix93rxwv51zq9azk0sx42vs"; depends=[glmnet MASS refund]; }; @@ -11878,7 +12060,7 @@ in with self; { rem = derive2 { name="rem"; version="1.3.1"; sha256="1q4p26irhhl1lvc0ydv9wmng1y635zm16szpl7gwq1kyn2p90rai"; depends=[doParallel foreach Rcpp]; }; remMap = derive2 { name="remMap"; version="0.2-0"; sha256="1k2niiaq2lr4inrx443clff9cqqvyiiwd45k7yqjd8ixnbaa3mrk"; depends=[]; }; rematch = derive2 { name="rematch"; version="1.0.1"; sha256="0y3mshvpvz9csmq8hk8jbabx4nxlv5sckvfzvm6920ndg34xw2d4"; depends=[]; }; - rematch2 = derive2 { name="rematch2"; version="2.0.1"; sha256="16k0i5p7fa3qfxv59ijyn638wpz8n4jrkrnilqmh5g9l8f8bn4h6"; depends=[tibble]; }; + rematch2 = derive2 { name="rematch2"; version="2.1.0"; sha256="00cznm6rk33b53w7zybkz7549bnydc66znpi5mb0xd24pmqp0rvq"; depends=[tibble]; }; remedy = derive2 { name="remedy"; version="0.1.0"; sha256="1lsa5az9jwy4ngjmfzcb7qj4wm8phsgajlnp5kwa4nav0g1dhb4s"; depends=[knitr rematch2 rstudioapi]; }; remindR = derive2 { name="remindR"; version="0.0.1"; sha256="0b27v2qm3z8l9vcng8f0rkphjidxkw5n017ysflx180qjizqq632"; depends=[assertthat]; }; remote = derive2 { name="remote"; version="1.2.1"; sha256="1ihzjxbvas7396cwsi9am4pl94naxa9dnhbnh8k0l5p4a50mk33w"; depends=[gridExtra latticeExtra mapdata raster Rcpp scales]; }; @@ -11886,17 +12068,17 @@ in with self; { remotes = derive2 { name="remotes"; version="2.1.0"; sha256="19v8dmnk9l4i9m64p7zgmj7y1vhnnwhi5kyn0k5d034zzkvchi49"; depends=[]; }; renpow = derive2 { name="renpow"; version="0.1-1"; sha256="0kbfpzr17fvf5zzxpzdhvfmrqmlkba2w3rzxl5q5ac1w3h75gfhc"; depends=[]; }; rentrez = derive2 { name="rentrez"; version="1.2.2"; sha256="0ghrvh1czf2kbz7p5fh5c20wiwppg6x6fdns247fvlh6zmjl5jz5"; depends=[httr jsonlite XML]; }; - repeated = derive2 { name="repeated"; version="1.1.1"; sha256="1ni2rp16z73k2yj30v5qw1yg256yd98wm2n5j0lhjjngizzx09rs"; depends=[rmutil]; }; + repeated = derive2 { name="repeated"; version="1.1.2"; sha256="19kcsj96i1zpnwfan3gz5vrzc2gqlah0wrdr9vb4vvacz45wcdfq"; depends=[rmutil]; }; repec = derive2 { name="repec"; version="0.1.0"; sha256="0alr9fbmfxmnnnn1qymy65crcycynwz435jj0vangbb4p0qhv8pm"; depends=[jsonlite]; }; repfdr = derive2 { name="repfdr"; version="1.2.3"; sha256="0jpk44arg1jib0h2w90h851bs5cd1ss32fab9bfvf9iir2jk8985"; depends=[Rcpp]; }; - replicateBE = derive2 { name="replicateBE"; version="1.0.8"; sha256="1yrjr18wvk838214j9ward8niifvqi1gvb7vzx7cq4w8pb0gbgh6"; depends=[lmerTest nlme PowerTOST readxl]; }; + replicateBE = derive2 { name="replicateBE"; version="1.0.10"; sha256="0f9ws632b1gi5v3q0zxp94b30m4rzz6cg7p5vqbq88fsab1hm52a"; depends=[lmerTest nlme pbkrtest PowerTOST readxl]; }; replicatedpp2w = derive2 { name="replicatedpp2w"; version="0.1-2"; sha256="0nskwkqm9z2aphpim6pvykhc3fphlsbap3r49nghkwjpngd0qzj8"; depends=[spatstat spatstat_utils]; }; replicationInterval = derive2 { name="replicationInterval"; version="2.0.1"; sha256="1jyvyqr8r2fs1cmbz7zjcc8p116bnkslvx27pqi92y5pxgqvsqvr"; depends=[ggplot2 MASS MBESS pbapply]; }; - replyr = derive2 { name="replyr"; version="1.0.0"; sha256="12qz31wfn4qmag1zn65f18cxg781q86hbksizdix29sbkbpjg764"; depends=[DBI dplyr rlang wrapr]; }; + replyr = derive2 { name="replyr"; version="1.0.4"; sha256="1vz2lw2b587c7yc2l9x2rx9wdb2l3nfr3cjv1jy0h4y9k5rmzfpg"; depends=[DBI dbplyr dplyr rlang wrapr]; }; repmis = derive2 { name="repmis"; version="0.5"; sha256="0z5mjbsl24yjbl0aawr35grcal44rf2xbwv1hy7bdkms94ix79b5"; depends=[data_table digest httr plyr R_cache]; }; repo = derive2 { name="repo"; version="2.1.3"; sha256="1g72zvj2mg8cxfy1w3d46lkk4hayad64ns5w1y43731whzraxk95"; depends=[digest]; }; repolr = derive2 { name="repolr"; version="3.4"; sha256="13kmy09c7lk8p1mkdss0krcsfb6d7zcnqpwnl38zkanvh8q3fqhm"; depends=[Matrix Rcpp RcppArmadillo]; }; - reportROC = derive2 { name="reportROC"; version="3.3"; sha256="10q83gaaw6ybwcivbh9yimqw7x4k939a7kavxxiybn3300l2w7cv"; depends=[pROC]; }; + reportROC = derive2 { name="reportROC"; version="3.4"; sha256="1gcck5ids0prrrbv4hqi76swxjhbx796p4qlxbf63ys3gvdzanxr"; depends=[pROC]; }; reportReg = derive2 { name="reportReg"; version="0.3.0"; sha256="0qwrpn61x69hmgln5fpc58dqfa3pba0lgjjyj0f3fh96wc9jyhq1"; depends=[nlme]; }; reportRx = derive2 { name="reportRx"; version="1.0"; sha256="0npiflql0lq8sqp6xgydxbw7xdr0zdxj1s2h4bnpmn4clc05r7m4"; depends=[aod cmprsk geoR reshape stringr survival xtable]; }; reportr = derive2 { name="reportr"; version="1.3.0"; sha256="0zynplxqvbmf23cm2rsz3wz2jx6mv55z94mn1k44ny3lx625cnpw"; depends=[ore]; }; @@ -11907,14 +12089,14 @@ in with self; { represtools = derive2 { name="represtools"; version="0.1.2"; sha256="1zkabch49q23kd1786km5cb9wcaccbxds11v9hwjzsgrs15g5w35"; depends=[whisker]; }; reprex = derive2 { name="reprex"; version="0.3.0"; sha256="0v7vxzs8alwz8y1cjicpimp5yimf1g9gb8x5wy3zhvrz6kk2lg10"; depends=[callr clipr fs rlang rmarkdown whisker withr]; }; reproducer = derive2 { name="reproducer"; version="0.3.0"; sha256="0z0gkikr5219wb20hndqlflxar1mn3638zn2095ja0b2d1cn40nk"; depends=[dplyr GetoptLong ggplot2 gridExtra httr jsonlite lme4 magrittr MASS metafor openxlsx readr reshape stringr tibble tidyr xtable]; }; - reproducible = derive2 { name="reproducible"; version="0.2.8"; sha256="0i9x4wprylhd19mcq3f5a5hh3mnmvgvp0y6qymjkz6vaw8jpp6d2"; depends=[archivist backports crayon data_table digest dplyr fastdigest fasterize fpCompare gdalUtils git2r googledrive httr magrittr memoise quickPlot R_utils raster Rcpp RCurl remotes rgdal rgeos rlang sf sp testthat versions]; }; + reproducible = derive2 { name="reproducible"; version="0.2.9"; sha256="1q7lvvz7sxd5a6248rzgyx3smqih0gjncz3y05qbmy77rpkv0h7x"; depends=[archivist backports crayon data_table digest dplyr fastdigest fasterize fpCompare gdalUtils git2r googledrive httr magrittr memoise quickPlot R_utils raster RCurl remotes rgdal rgeos rlang sf sp testthat versions]; }; reproj = derive2 { name="reproj"; version="0.4.0"; sha256="0liwv4sgxdm42vyykjyc3jihcxk3b5q0d7cwgai8349nn1ah0wdh"; depends=[proj4 tibble]; }; - repurrrsive = derive2 { name="repurrrsive"; version="0.1.0"; sha256="1ffldcs30xa4wcd825bgpcmqsndfyxx70dfmbb3c86ic9kq17p01"; depends=[tibble]; }; + repurrrsive = derive2 { name="repurrrsive"; version="1.0.0"; sha256="1nmy88h2bfv2bad282kbrmnkjx9d8klgzv4mm8nspm049s09ydmz"; depends=[tibble]; }; reqres = derive2 { name="reqres"; version="0.2.2"; sha256="18ib0qbfw3sih7xs1z4szjqppr7lbj5wx0w0kx80g810m7q27wyp"; depends=[assertthat brotli jsonlite R6 stringi urltools webutils xml2]; }; request = derive2 { name="request"; version="0.1.0"; sha256="1q7zd6q00gdqmgq7s7nq1ixmns8zn2amr5zah9rwnsn8dkllj9yh"; depends=[curl httr jsonlite lazyeval magrittr R6 whisker]; }; requireR = derive2 { name="requireR"; version="1.0.0.1"; sha256="192l7i3q7s2a6n737an3fn258agjsdzh0q2w0vc8jbz7v4f3i92d"; depends=[]; }; - rerddap = derive2 { name="rerddap"; version="0.6.0"; sha256="08y2zbgi89d79d1a0mkv6xkwllvhw37sa5bv6wiaga1phfflp90k"; depends=[crul data_table digest dplyr hoardr jsonlite ncdf4 tibble xml2]; }; - rerddapXtracto = derive2 { name="rerddapXtracto"; version="0.3.5"; sha256="0wi3zwzcb6xqxzf7y62cz7b2glnii2l1l581b9kgakc6f09wv92z"; depends=[abind dplyr ggplot2 httr ncdf4 parsedate plotdap readr rerddap sp]; }; + rerddap = derive2 { name="rerddap"; version="0.6.5"; sha256="1pmpf9jdgp71ganzslwlp5qhkxhy7snaxgbrrym7swx6v2jnwhmv"; depends=[crul data_table digest dplyr hoardr jsonlite ncdf4 tibble xml2]; }; + rerddapXtracto = derive2 { name="rerddapXtracto"; version="0.4.0"; sha256="1a99acffmpywv9lx59fphy2p27xdmxsrmf9crj4m6ykj5rack7fj"; depends=[abind dplyr ggplot2 httr maps ncdf4 parsedate plotdap readr rerddap sf sp]; }; rerf = derive2 { name="rerf"; version="2.0.4"; sha256="0ykgxdmkqapdpk5zwi8h1cbsvjv6jpscqpr5cjmdzdan22m09l6k"; depends=[dummies mclust Rcpp RcppArmadillo RcppZiggurat]; }; resample = derive2 { name="resample"; version="0.4"; sha256="1rckzm2p0rkf42isc47x72j17xqrg8b7jpc440kn24mqw4szgmgh"; depends=[]; }; resampledata = derive2 { name="resampledata"; version="0.3.0"; sha256="09hp97zk31f016d65vq64gv413c6bx1dwqy74ai34xk00flkwady"; depends=[]; }; @@ -11925,7 +12107,7 @@ in with self; { reshape2 = derive2 { name="reshape2"; version="1.4.3"; sha256="03ki5ka1dj208fc0dclbm0b4xp9d769pah2j9cs34l776p4r9zwa"; depends=[plyr Rcpp stringr]; }; reshapeGUI = derive2 { name="reshapeGUI"; version="0.1.0"; sha256="0kb57isws8gw0nlr6v9lg06c8000hqw0fvhfjsjyf8w6zwbbq3zs"; depends=[gWidgets gWidgetsRGtk2 plyr reshape2]; }; respirometry = derive2 { name="respirometry"; version="1.0.0"; sha256="1cwgs951sy36fyzcm256wqbwadl4j3kvbhzw991vnlml1b48c0cy"; depends=[birk lubridate marelac measurements minpack_lm PKNCA seacarb segmented]; }; - restatapi = derive2 { name="restatapi"; version="0.1.9"; sha256="11ja8vc76s744vz8gap97h0r02q2dmz2s5mn93sb6zmn1ryknd58"; depends=[data_table rjson rsdmx xml2]; }; + restatapi = derive2 { name="restatapi"; version="0.2.3"; sha256="1rf6kl6r0i13l2zrir2y8ha3lmy3zgbjr1fwbsg1dnkgg4lq7rrc"; depends=[data_table rjson rsdmx xml2]; }; restfulr = derive2 { name="restfulr"; version="0.0.13"; sha256="1dk45mzrr6ka92yjz7hfhkj12kpx1wg4szv1h1mg80mgga4ganbv"; depends=[RCurl rjson S4Vectors XML yaml]; }; restimizeapi = derive2 { name="restimizeapi"; version="1.0.0"; sha256="1ss6fng5pmqg6cafc256g9ddz8f660c68ysxfan6mn4gdaigz7lb"; depends=[RCurl RJSONIO]; }; restlos = derive2 { name="restlos"; version="0.2-2"; sha256="083w1ldax8bnf3w4119damma2nz75c3ki187b0275i1mqxqrixp7"; depends=[geometry igraph limSolve rgl som]; }; @@ -11934,9 +12116,10 @@ in with self; { restriktor = derive2 { name="restriktor"; version="0.2-15"; sha256="1m3ng5cmkiim5gwi3v18d0987ghw1pkxxyw37pyz02iwlhzdj06s"; depends=[boot ic_infer lavaan MASS mvtnorm quadprog]; }; resumer = derive2 { name="resumer"; version="0.0.3"; sha256="0ilya3v75989zqm16x69w4599ax2s5j2n6f16bmhwydrmzxs1g48"; depends=[dplyr rmarkdown useful]; }; rethinker = derive2 { name="rethinker"; version="1.1.0"; sha256="02zfx08s5xisv1v4y16iqbddi9kb3fcr249b3414fzvs4nm5as94"; depends=[rjson]; }; - reticulate = derive2 { name="reticulate"; version="1.12"; sha256="0pqr1rcs8yg9nlh729mvlws93cqhpmv49j9bcgarh7vxzkwyv0kb"; depends=[jsonlite Matrix Rcpp]; }; + reticulate = derive2 { name="reticulate"; version="1.13"; sha256="1qwxh7zq9igl7dxl5g5qjbvv0mlac3w80djnkm0w8rxnaval3gmd"; depends=[jsonlite Matrix Rcpp]; }; retimes = derive2 { name="retimes"; version="0.1-2"; sha256="019sllyfahlqnqry2gqw4w5cy4cavrqnwpwrbb25cgjpdb19raja"; depends=[]; }; - retistruct = derive2 { name="retistruct"; version="0.5.12"; sha256="11m4i29i3zqh9chyjgdhzqj4yqlslfm8y4q0x14xxc2r9lqbkj9l"; depends=[foreign geometry png R_matlab rgl RImageJROI RTriangle sp ttutils]; }; + retistruct = derive2 { name="retistruct"; version="0.6.0"; sha256="1d7whcvz7im9h2cblldc4kjxw8fpj08q0k0hv0yyb1gkzp4snhrf"; depends=[foreign geometry png R_matlab R6 rgl RImageJROI RTriangle sp ttutils]; }; + retractcheck = derive2 { name="retractcheck"; version="1.0.0"; sha256="1c4p8afh9g359s560sswcys3manc0lqvk0aqgvd09p4rpzls2dm7"; depends=[httr plyr textreadr]; }; retrodesign = derive2 { name="retrodesign"; version="0.1.0"; sha256="173jrpzasimplv8vbm8gzpl8aibnsjkgvhz1hd75is0b2l8gnbxy"; depends=[]; }; reutils = derive2 { name="reutils"; version="0.2.3"; sha256="09dhf4s7wz3anrkzqi16abx64gk8ck2142kfd8pv71mjy3x548l7"; depends=[assertthat jsonlite RCurl tibble XML]; }; reval = derive2 { name="reval"; version="2.0.0"; sha256="1yxkyc6wdp5h3cp8i42a9cf0b1cwr4nmpd7svlp7bpfxlcnqqa0d"; depends=[doParallel foreach]; }; @@ -11946,16 +12129,17 @@ in with self; { revengc = derive2 { name="revengc"; version="1.0.4"; sha256="1nipkff9zmkdi509qfdrmvsq5c643xd7bzzw5bchxd8nmfqb412i"; depends=[dplyr mipfp stringr truncdist]; }; reverseR = derive2 { name="reverseR"; version="0.1"; sha256="0pzk97q1zs5g1v4ngqd6bkwwxcp89j890nycpc99ipycbgm2r9yw"; depends=[DT knitr markdown shiny]; }; revgeo = derive2 { name="revgeo"; version="0.15"; sha256="1ns7d1817475lriss6wwgvdm6lj760p40yxqaifla13c2xb73a55"; depends=[RCurl RJSONIO]; }; - revtools = derive2 { name="revtools"; version="0.3.0"; sha256="0k5cr2qypfjrhv0l4d6hrzc2r6d9ipc279x16jhy3zzvwzgyjf0x"; depends=[ade4 modeltools plotly shiny shinydashboard SnowballC stringdist tm topicmodels viridisLite]; }; + revtools = derive2 { name="revtools"; version="0.4.0"; sha256="138k9pcdv1gxfh52wlxavy6dinwqigrnckwka8bg3rwhdw0j8cky"; depends=[ade4 modeltools NLP plotly shiny shinydashboard SnowballC stringdist tm topicmodels viridisLite]; }; reweight = derive2 { name="reweight"; version="1.2.1"; sha256="0fv7q1zb3f4vplg3b5ykb1ydwbzmiajgd1ihrxl732ll8rkkfa4v"; depends=[]; }; rex = derive2 { name="rex"; version="1.1.2"; sha256="0alsadgjgass3wr8y5d247j12qqzg454sc84vpskclrkmz778g5x"; depends=[lazyeval magrittr]; }; - rexpokit = derive2 { name="rexpokit"; version="0.26.6.2"; sha256="08mrf80z7ckd5ad3nag2nnm5hhk2dz9f5jfkfhxz9n2lizs537yp"; depends=[Rcpp]; }; + rexpokit = derive2 { name="rexpokit"; version="0.26.6.4"; sha256="0flqf57zsf0a70yrkgp9jfq3bmj36wyfzwldpkmfvw3qvfhddysw"; depends=[Rcpp]; }; rfPermute = derive2 { name="rfPermute"; version="2.1.7"; sha256="0dhgxm9b2djgadr1wnwgd0gbqv7751y0ln4jis32p0qmwi30v76d"; depends=[abind dplyr ggplot2 gridExtra magrittr plyr randomForest reshape2 rlang scales swfscMisc tibble tidyr]; }; rfUtilities = derive2 { name="rfUtilities"; version="2.1-4"; sha256="15784vhfp5sxmy58p2xgmc1v3bxx2f78i1pzc186q77zs88c5sq9"; depends=[cluster randomForest]; }; rfVarImpOOB = derive2 { name="rfVarImpOOB"; version="1.0"; sha256="1341bicd65qw3pz1j8d6c9baj9d6s70ljdaaf87xvx8pjnajrfsw"; depends=[binaryLogic dplyr ggplot2 ggpubr magrittr prob randomForest titanic]; }; rfacebookstat = derive2 { name="rfacebookstat"; version="1.9.1"; sha256="04jd2w5g0y9m6wbk09rqfskcwixvxvv2j7blxid791jvj4jn8c74"; depends=[bitops data_table dplyr httr jsonlite purrr RCurl stringr tidyr]; }; rfbCNPJ = derive2 { name="rfbCNPJ"; version="0.1.1"; sha256="0zvpazxi184ia2wql0120kw7665dn9cs8a2kv91n79pncabb4xfg"; depends=[fs glue httr magrittr progress purrr readr stringr tibble xml2]; }; rfigshare = derive2 { name="rfigshare"; version="0.3.7"; sha256="1qgzn0mpjy4czy0pnbi395fxxx84arkg8r7rk8aidmd34584gjiq"; depends=[ggplot2 httpuv httr plyr RJSONIO XML yaml]; }; + rfinterval = derive2 { name="rfinterval"; version="1.0.0"; sha256="1z7v0sbql6g2h3fr1268nj79rbx1d33hjfaraxhbikrjgb8mbp0w"; depends=[MASS ranger]; }; rfishbase = derive2 { name="rfishbase"; version="3.0.4"; sha256="1km3xjbf3l81sfmmjs55criq4xw6l3xa74f8g1rxsbr5bci9xlia"; depends=[dplyr gh magrittr memoise purrr readr rlang stringr]; }; rfisheries = derive2 { name="rfisheries"; version="0.2"; sha256="16j3hn1py8khqadmh81qsg76c62wzqkaq3fn39z0z5mgynmcm62j"; depends=[assertthat data_table ggplot2 httr rjson]; }; rflexscan = derive2 { name="rflexscan"; version="0.1"; sha256="1akja9nm7hzkf2q6r2vd29g0xsb6hivkjx40cvdg1di6zc7q9dnq"; depends=[igraph Rcpp rgdal sp]; }; @@ -11967,9 +12151,7 @@ in with self; { rforensicbatwing = derive2 { name="rforensicbatwing"; version="1.3.1"; sha256="1i521h2nmlkhcxfxqir8jfjv0llwr6cz0ck5w6hzplk48044bn16"; depends=[Rcpp]; }; rfviz = derive2 { name="rfviz"; version="1.0.0"; sha256="0rzyy7r2ybqjnp1g5bbkxydpa93h8q4r71kdaj77r475m2i4kb6b"; depends=[loon randomForest]; }; rgabriel = derive2 { name="rgabriel"; version="0.7"; sha256="1c6awfppm1gqg7rm3551k6wyhqvjpyidqikjisg2p2kkhmyfkyzx"; depends=[]; }; - rgam = derive2 { name="rgam"; version="0.6.6"; sha256="0klf2prw5zj76az66c5hzv23yya1b45l61xdy1zbnggvwh62fqik"; depends=[Rcpp RcppArmadillo]; }; rgbif = derive2 { name="rgbif"; version="1.3.0"; sha256="1lamyylaj51vn693964xhgmx2fyrnlc4yljh63cb74gx9qjc9yga"; depends=[crul data_table geoaxe ggplot2 jsonlite lazyeval magrittr oai tibble whisker wicket xml2]; }; - rgcvpack = derive2 { name="rgcvpack"; version="0.1-4"; sha256="1vlvw9slrra18qaizqk2xglzky0i6z3bsan85x908wrg8drss4h5"; depends=[]; }; rgdal = derive2 { name="rgdal"; version="1.4-4"; sha256="1my56hdc9x40ynxx1qwqwqxjvjxybmm00w4xg5gi8zgj19pffci5"; depends=[sp]; }; rgdax = derive2 { name="rgdax"; version="1.0.0"; sha256="16ph6n1nyl2v2w51ih6wzkpw0j0hfa3f60q1g6p9zis59j0rh7d9"; depends=[digest httr jsonlite RCurl]; }; rgen = derive2 { name="rgen"; version="0.0.1"; sha256="0gl82v09q1ha58wd1014s46wzkx1yf348bc7jkl6s4qdc6c4vsb8"; depends=[]; }; @@ -11980,7 +12162,7 @@ in with self; { rgexf = derive2 { name="rgexf"; version="0.15.3"; sha256="0iw1vk32ad623aasf6f8hl0qkj59f1dsc2riwqc775zvs5w7k2if"; depends=[igraph Rook XML]; }; rggobi = derive2 { name="rggobi"; version="2.1.22"; sha256="1g7k4xais9xkjlbvrkadr5d6c5rw4jp9c0gljhm71pa1fc9fcqff"; depends=[RGtk2]; }; rgho = derive2 { name="rgho"; version="1.0.1"; sha256="0jkfmyn3i50vsqciy96wd2fpik6yfg0sz6rrhwb04jv1dmyz2nfa"; depends=[curl dplyr httr jsonlite lazyeval magrittr memoise readr tibble tidyr]; }; - rgl = derive2 { name="rgl"; version="0.100.24"; sha256="0nm3iyvhhmh0zlywkfmrq3vyh8z1l296xxfmcky0ifd2qnysfcqj"; depends=[crosstalk htmltools htmlwidgets jsonlite knitr magrittr manipulateWidget shiny]; }; + rgl = derive2 { name="rgl"; version="0.100.26"; sha256="0h77akviwjd86j2qyx326xynbmwhypd6ydprzlwqnidd4ckrr271"; depends=[crosstalk htmltools htmlwidgets jsonlite knitr magrittr manipulateWidget shiny]; }; rglobi = derive2 { name="rglobi"; version="0.2.19"; sha256="13mzx7gmpz5zhp4nplkzigipyn3vkp8d5whz617fqrv8n3hy8ybm"; depends=[curl RCurl rjson]; }; rglwidget = derive2 { name="rglwidget"; version="0.2.1"; sha256="0siqxn3gyl98i84p0yha821b4rdrp2i0942mkx819wnf7qwrpqcv"; depends=[rgl]; }; rgoogleslides = derive2 { name="rgoogleslides"; version="0.3.1"; sha256="06i1ljrib0ap87bxlbpnvx5fr05pwzcmza48gbicvg7fwhz9hs05"; depends=[assertthat httr jsonlite R6]; }; @@ -12036,7 +12218,7 @@ in with self; { rjazz = derive2 { name="rjazz"; version="0.1.7"; sha256="0wmqlpgcr98dvapfmdcph5mdv202rzzsvb06iy5sqvpizpg7pbsz"; depends=[RCurl]; }; rjdqa = derive2 { name="rjdqa"; version="0.1.0"; sha256="07qvvy3i0ak7p717wf68gx8d1m9l4lhibf0ynmc0jny58i56fiw8"; depends=[plotrix RJDemetra]; }; rje = derive2 { name="rje"; version="1.9"; sha256="1dyd34z6lb0p6zmyax5dpzflgc9a4saka33mvdfcxi5pj0rnygaz"; depends=[]; }; - rjmcmc = derive2 { name="rjmcmc"; version="0.4.4"; sha256="1xvng9a3m228k65c988clf1cpsb0ilhlxbabm9gjxyzibrs457rl"; depends=[coda madness mvtnorm]; }; + rjmcmc = derive2 { name="rjmcmc"; version="0.4.5"; sha256="14rzvp6z5avlcnmlmvb6w4gvlh6v4ncbcai3v4c4svnjv555vz45"; depends=[coda madness mvtnorm]; }; rjson = derive2 { name="rjson"; version="0.2.20"; sha256="0v1zvdd3svnavklh7y5xbwrrkbvx6053r4c5hgnk7hz7bqg7qa1s"; depends=[]; }; rjsonapi = derive2 { name="rjsonapi"; version="0.1.0"; sha256="0qshll0y8b6lbfrqmp69w9kc9hgfrz94dk68nddshk9ilg14lx4d"; depends=[crul jsonlite plumber R6]; }; rjstat = derive2 { name="rjstat"; version="0.3.0"; sha256="0r772p0a0x6g96k6r26vb6vjxa68mzjslwg71r0wysa9kqhvypm4"; depends=[checkmate jsonlite]; }; @@ -12051,8 +12233,8 @@ in with self; { rld = derive2 { name="rld"; version="1.0"; sha256="1glv4q25z14hcwifwg623h77p4awpsn3nk843pnph4sb3p5qbmn3"; depends=[emdbook MASS survival]; }; rleafmap = derive2 { name="rleafmap"; version="0.2"; sha256="1i2qczipg7lr6fl35lcl896r54jia7libxx83darrfzc1hd9sdcq"; depends=[knitr raster sp]; }; rlecuyer = derive2 { name="rlecuyer"; version="0.3-4"; sha256="0d5mcdzn6f5nhwzs165a24z36d0b8gd0cyfyzffvr6p96h8qydy7"; depends=[]; }; - rless = derive2 { name="rless"; version="0.1.0"; sha256="11w0hp8jsgs7k5kz35pzrjnifvhy1lgk3ll9im9vqjwcci5z6y8c"; depends=[V8]; }; - rlfsm = derive2 { name="rlfsm"; version="0.2.0"; sha256="08fdllzk5q77fz6ii83vbmz8dnfwwr3ixs11ia2l1vrm1gdj9gf7"; depends=[doParallel elliptic foreach ggplot2 plyr Rdpack reshape2 stabledist]; }; + rless = derive2 { name="rless"; version="0.1.1"; sha256="0ham8kf2hbswrcnc5i5b3svywdwq3kwp9n66n4k9sllahl4x9jdn"; depends=[V8]; }; + rlfsm = derive2 { name="rlfsm"; version="0.3.0"; sha256="1b8wkj333x845ss2j8daxixzhgk81pc0b3a1ahz159n2a1ha0afr"; depends=[doParallel elliptic foreach ggplot2 plyr Rdpack reshape2 stabledist]; }; rlist = derive2 { name="rlist"; version="0.4.6.1"; sha256="08awy2p7rykc272wvvya4ddszbr7b7s7qv4wr3hs8ylr4jqlh0dv"; depends=[data_table jsonlite XML yaml]; }; rlm = derive2 { name="rlm"; version="1.2"; sha256="18y735z05k9pms6iv1739qg3q12w099qhs42icxhqs5gcdhz92fm"; depends=[]; }; rlmDataDriven = derive2 { name="rlmDataDriven"; version="0.3.0"; sha256="0xq5dh3p94cqnhbbippqflmdlwy3f53hx8rph2bhdgkrwqm1751i"; depends=[MASS tseries]; }; @@ -12065,7 +12247,7 @@ in with self; { rmapshaper = derive2 { name="rmapshaper"; version="0.4.1"; sha256="0kd8hppn4d3z527s3kqz0mll7qjy0pbxbif46dfqx3rci6m62a68"; depends=[geojsonio geojsonlint jsonlite readr sf sp V8]; }; rmapzen = derive2 { name="rmapzen"; version="0.4.1"; sha256="1vql1cy38c4kv8pyl81877s587kq4l9sx9nslbgk3l41wvyyvphk"; depends=[assertthat digest dplyr geojsonio httr jsonlite maps maptools purrr rgdal sf sp tibble tidyr]; }; rmargint = derive2 { name="rmargint"; version="1.0.2"; sha256="1hl2nxmgknw74jvmc05wz6zkf7i151xl7h7hdpcivvm60yizlx8i"; depends=[]; }; - rmarkdown = derive2 { name="rmarkdown"; version="1.13"; sha256="1vv3b8nlw8ra19492rjg3na42lwh3xr5a2jy2ia81fvvs846pywn"; depends=[base64enc evaluate htmltools jsonlite knitr mime stringr tinytex xfun yaml]; }; + rmarkdown = derive2 { name="rmarkdown"; version="1.14"; sha256="0qfw5rkvwqpgix32g6qy9xrr50awmm146aqbm836xravih2b2dpn"; depends=[base64enc evaluate htmltools jsonlite knitr mime stringr tinytex xfun yaml]; }; rmatio = derive2 { name="rmatio"; version="0.14.0"; sha256="072fxg81r4rsc71qrf5p6lr5s3gchbgvxhyzwlx3wxw7y2px6w7y"; depends=[Matrix]; }; rmcfs = derive2 { name="rmcfs"; version="1.3.0"; sha256="0mvrf6d2pfdvsgfgwkkb7k7q367k5i71wbq96gjhfimxr2lxwf7f"; depends=[data_table dplyr ggplot2 gridExtra igraph reshape2 rJava stringi yaml]; }; rmcorr = derive2 { name="rmcorr"; version="0.3.0"; sha256="1p05ln653yrd02wmn8wfzawiw6a924d8an0568fcbgl1pdna43b1"; depends=[psych RColorBrewer]; }; @@ -12075,6 +12257,7 @@ in with self; { rmdcev = derive2 { name="rmdcev"; version="0.9.0"; sha256="0bcriwrfynhvw27z57374hc7llsv5l58baplqkw4diq16gpqx5ik"; depends=[BH dplyr purrr Rcpp RcppEigen rlang rstan rstantools StanHeaders stringr tibble tidyr tidyselect tmvtnorm]; }; rmdfiltr = derive2 { name="rmdfiltr"; version="0.1.0"; sha256="05hr6lrlsdp8g9y41g3zz875x9gg1533as95krb37ywp3rr4p819"; depends=[assertthat rmarkdown]; }; rmdformats = derive2 { name="rmdformats"; version="0.3.5"; sha256="16ncawidfkkzh67ak6043kg504glli5g9npfg7vsrw168r7mmyci"; depends=[bookdown htmltools knitr questionr rmarkdown]; }; + rmdplugr = derive2 { name="rmdplugr"; version="0.4.0"; sha256="10xwaxjhrkkinahv9n29br0znkfvbyvx7yjva7ycrlibndm55bxq"; depends=[bookdown rmarkdown]; }; rmdshower = derive2 { name="rmdshower"; version="2.1.1"; sha256="1sjpi5ils31adii51gaa8ly7x93l9ganp6in8rsln6si4jc2ppg9"; depends=[rmarkdown]; }; rmeta = derive2 { name="rmeta"; version="3.0"; sha256="0vkbnxp579v8zmcv1isdbzj5swpr6fq17zwparxcvzswjc2x9ydr"; depends=[]; }; rmetalog = derive2 { name="rmetalog"; version="1.0.0"; sha256="1ndw8drzhf74sjx31zfhhx9q1l6pdn4yx2i8l7klp38d5bsc27xm"; depends=[ggplot2 lpSolve]; }; @@ -12097,12 +12280,13 @@ in with self; { rnassqs = derive2 { name="rnassqs"; version="0.4.0"; sha256="1vzkcw1rmrc4vq453jz63ldypnagv5vlwvczv5c938574g2yjwix"; depends=[httr jsonlite]; }; rnaturalearth = derive2 { name="rnaturalearth"; version="0.1.0"; sha256="193b31a7n9jhc607mhwxbpx5gr0fpj3qasm9dbi6kcc7vac3ilgm"; depends=[sf sp]; }; rnaturalearthdata = derive2 { name="rnaturalearthdata"; version="0.1.0"; sha256="1z32j5lz2lb8xgpkr73majw22k0b49iazj6jjc7j4w9k4zxxa102"; depends=[sp]; }; + rnbp = derive2 { name="rnbp"; version="0.1.0"; sha256="01hx9r7ai42kcj8l7bmqrma8w3l1f9bmg2ingpqxirimxkfwv2k8"; depends=[curl httr jsonlite]; }; rncl = derive2 { name="rncl"; version="0.8.3"; sha256="03c8sizm32rdilbvf67gsw81w7i623pajn9blrrkq8rq8j3zdbns"; depends=[progress Rcpp]; }; rneos = derive2 { name="rneos"; version="0.3-2"; sha256="0m5mmhwnrk9ifv91s5ngmlvqqd7bw1n7glzkgk5i72cw0siiwmh0"; 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-5"; sha256="0b4ys525gksgqwqx9id4bdgyi9mwj6n3r87xdzf4fc9hp3cc16jb"; depends=[]; }; - rngtools = derive2 { name="rngtools"; version="1.3.1.1"; sha256="0k1nlcxggflq0043m15dfclnqnzchkpw2ik7jk82h4dqwvysiqcr"; depends=[digest pkgmaker stringr]; }; + rngtools = derive2 { name="rngtools"; version="1.4"; sha256="1kivj594bn774lbn29ws2rmzy2km99sza0j3jqvhal6hwmk27a9s"; depends=[digest pkgmaker stringr]; }; rngwell19937 = derive2 { name="rngwell19937"; version="0.6-0"; sha256="0m6icqf7nckdxxvmqvwfkrpjs10hc7l8xisc65q8iqpnpwl5p2f6"; depends=[]; }; rnn = derive2 { name="rnn"; version="0.9.8"; sha256="1f1h7x9vff0jrdkv1gpxlmlr5v1c81gsfxy4z83rq3v0drpxahnv"; depends=[shiny sigmoid]; }; rnoaa = derive2 { name="rnoaa"; version="0.8.4"; sha256="1gyvsaz3whql4jzphrlawv3rrzyjp852kwzgq4wgdm8x25qyg6pv"; depends=[crul dplyr geonames ggplot2 gridExtra hoardr isdparser jsonlite lubridate rappdirs scales tibble tidyr XML xml2]; }; @@ -12113,10 +12297,10 @@ in with self; { roahd = derive2 { name="roahd"; version="1.4.1"; sha256="0d89d21s32bsjkm8bdiqrbccd3m9badh87vrsb1laawhl4hr3dn9"; depends=[dplyr magrittr robustbase scales]; }; robCompositions = derive2 { name="robCompositions"; version="2.1.0"; sha256="17kpl35lynm1fwsl8ljwl6yjph1fps8vk2m8qxsx0x64wwfvccim"; depends=[car cluster cvTools data_table e1071 fpc GGally ggplot2 kernlab MASS mclust pls Rcpp robustbase rrcov sROC tidyr VIM zCompositions]; }; robFitConGraph = derive2 { name="robFitConGraph"; version="0.1.0"; sha256="092nc0xnjs2zxd9ij0dl1xggb8mwl8nly284yjhhygmwlwsvhzxm"; depends=[MASS mvtnorm Rcpp]; }; - robcbi = derive2 { name="robcbi"; version="1.1-2"; sha256="1n8whpnpsm9imiz8l1jxq5x597ydzb2b54jkvrl05hmwh79p97in"; depends=[robeth]; }; + robcbi = derive2 { name="robcbi"; version="1.1-3"; sha256="0rj732qdd0wd9d9pxldnsw5rif5d7wz327iydvxcf5x8lgvk42jd"; depends=[robeth]; }; robcor = derive2 { name="robcor"; version="0.1-6"; sha256="1hw8simv93jq8a5y79hblhqz157wr8q9dzgm0xhvvv5nkzyqkpzf"; depends=[]; }; robcp = derive2 { name="robcp"; version="0.2.4"; sha256="1pvd8dw0kgwxrwnafaraya1qm3cwnp2c3ma569i7nwm2xsys76xj"; depends=[]; }; - robeth = derive2 { name="robeth"; version="2.7-4"; sha256="11ghpy88r02844mw99zxl7qzkic8kcl0gw56a4kdyw84r0lyv8rg"; depends=[]; }; + robeth = derive2 { name="robeth"; version="2.7-5"; sha256="0jz3ivck9ma8x03sz41zkln3qh70ckfm5c2l57nlxi0ci5h0dfh2"; depends=[]; }; robets = derive2 { name="robets"; version="1.4"; sha256="0lvzfpv6569pjysblhadd05sglx0qvyr9wipb9cpiya4a1992n61"; depends=[forecast Rcpp]; }; robfilter = derive2 { name="robfilter"; version="4.1.1"; sha256="1fxqva2khk16sj5ka5zdpaknh2w9n925ys0i4v7ahqvzhnxg6l3b"; depends=[lattice MASS robustbase]; }; robis = derive2 { name="robis"; version="2.1.8"; sha256="1qi6ay0v3vc2gz5xalgj8vfx7zaiz5726mkkgwawxfj35gmdq0mk"; depends=[dplyr ggplot2 httr jsonlite leaflet]; }; @@ -12126,7 +12310,7 @@ in with self; { robreg3S = derive2 { name="robreg3S"; version="0.3"; sha256="0rv8qh98wws1f40d1kmysyy9qin0ngsvwq63cnxbwi290wsnrvls"; depends=[GSE MASS robustbase]; }; robsurvey = derive2 { name="robsurvey"; version="0.1.1"; sha256="0rf2sd7maz565hlgpyhvkswqyck01hif4mg5isbnnky9n3nc98pi"; depends=[survey]; }; robumeta = derive2 { name="robumeta"; version="2.0"; sha256="1ynlfxlzh442jd1cf02j0f948m16d536a30gb4bf7208baqri1vg"; depends=[]; }; - robust = derive2 { name="robust"; version="0.4-18"; sha256="1b7qh1aff500nd6dh4y2ipmjgdiq8991shflb63pc39vpc0ny6g4"; depends=[fit_models lattice MASS robustbase rrcov]; }; + robust = derive2 { name="robust"; version="0.4-18.1"; sha256="0xs098pfw5zdcdk3rsxkylfl6d2pyp566s5v92bzhgl7h8c90cfy"; depends=[fit_models lattice MASS robustbase rrcov]; }; robustBLME = derive2 { name="robustBLME"; version="0.1.3"; sha256="18wx116l1riy4wn4083kxl637mkyyi9wbwnmvhkgqw3vb36s4vxd"; depends=[doParallel foreach iterators lme4 mvtnorm numDeriv Rcpp RcppArmadillo]; }; robustDA = derive2 { name="robustDA"; version="1.1"; sha256="1yys6adkyms5r4sw887y78gnh97qqr7sbi5lxv5l9bnc4ggcfiz6"; depends=[MASS mclust Rsolnp]; }; robustETM = derive2 { name="robustETM"; version="1.0"; sha256="1dlj79v08bls500lb81rya6vwx58h97rpq1sy9zwd3mfl9b6awp9"; depends=[]; }; @@ -12143,7 +12327,6 @@ in with self; { robustrao = derive2 { name="robustrao"; version="1.0-3"; sha256="0gcxxizsg380blrv55vl9f3az8gnr274c6idi0pimhh5c26h7ma6"; depends=[doParallel foreach gmp igraph iterpc quadprog]; }; robustreg = derive2 { name="robustreg"; version="0.1-11"; sha256="08c6dyzki68hzl006s12bkjiirlw2n2isirjh8b79sd6zjrjlh72"; depends=[Matrix Rcpp RcppArmadillo]; }; robustsae = derive2 { name="robustsae"; version="0.1.0"; sha256="0fi1fpqnfj6vkmidlr90kqbn1bxxxqb5qpqqrz9rrimlsvrc4ddl"; depends=[coda lattice MCMCpack mvtnorm pscl]; }; - robustvarComp = derive2 { name="robustvarComp"; version="0.1-5"; sha256="0jzcjfimycpbgr40hpal426lc8ckxyyd5wvjl7728qbnz85s75qj"; depends=[GSE numDeriv plyr robust robustbase]; }; rocNIT = derive2 { name="rocNIT"; version="1.0"; sha256="18vxyh1wcq6dv62xf2dyl4226cd00n4hlbaqnynl9j5gnrmmsvi1"; depends=[]; }; rocTree = derive2 { name="rocTree"; version="1.0.0"; sha256="0zq2w4jjkh6b657b92knkmnl121xiybnxq81x4xzz5nsg1sc8w1q"; depends=[data_tree DiagrammeR dplyr flexsurv ggplot2 MASS survival tibble]; }; rocc = derive2 { name="rocc"; version="1.2"; sha256="00yxbbphhwkg4sj2h7pd9vw86yavl711nk8yylwmjd3qv39qjml0"; depends=[ROCR]; }; @@ -12158,6 +12341,7 @@ in with self; { roll = derive2 { name="roll"; version="1.1.2"; sha256="16s60r8p85q176k5smzcdcqzx9snf62v8q6r3ddvpp7mh5l9clgj"; depends=[Rcpp RcppArmadillo RcppParallel]; }; rollRegres = derive2 { name="rollRegres"; version="0.1.2"; sha256="1cgdg4a40dqy7kc7bx567w8hirlwzg5aqn41hi5m1plzzprmcfzm"; depends=[checkmate Rcpp RcppArmadillo]; }; rollbar = derive2 { name="rollbar"; version="0.1.0"; sha256="1q2ym0vkgbdnibxmwx0bp9c20g3bm8fzwwgs3j4bxg1ydg3gnkj4"; depends=[httr]; }; + rolldown = derive2 { name="rolldown"; version="0.1"; sha256="1awr8lcxz7y9mjhia4p85jvixc72gj525gk2jjl13njgq6shp0b5"; depends=[bookdown htmltools jsonlite]; }; rollmatch = derive2 { name="rollmatch"; version="2.0.1"; sha256="1nyxsl2n8bnx31i78pzq0b19d58w70rqdn62bzrxdd11h9ph2dpr"; depends=[dplyr magrittr]; }; roloc = derive2 { name="roloc"; version="0.1-1"; sha256="0xynj12gp010c23f6ll9p343vwgxwa22s771p1w2pi65cj2ixhas"; depends=[colorspace]; }; rolocISCCNBS = derive2 { name="rolocISCCNBS"; version="0.1"; sha256="100jh5m2c1zp5wg3wd4y2i47dzx1j0g6lfwyqmwk4bz99yzzz5am"; depends=[colorspace roloc]; }; @@ -12176,12 +12360,12 @@ in with self; { roptim = derive2 { name="roptim"; version="0.1.2"; sha256="0kamdhyc7s1i7mbgzf6zbdbcs2qjjq4wgl1v181xzhq6gpv7fhy6"; depends=[Rcpp RcppArmadillo]; }; rorcid = derive2 { name="rorcid"; version="0.5.0"; sha256="0508dc3av593bqylrq5zysav56p9243hg35gs8vhnbqjngfm1pib"; depends=[crul data_table fauxpas httr jsonlite tibble xml2]; }; rorutadis = derive2 { name="rorutadis"; version="0.4.2"; sha256="13a7xj4qw1nd8xgrqhrki3php960lgy9gy38sg4kpvs4j2rwijzc"; depends=[ggplot2 gridExtra hitandrun Rglpk]; }; - rosetta = derive2 { name="rosetta"; version="0.0.1"; sha256="0ricxia5vc6hhx82m7xlbr7f31f4djb1ycg4p66fnjmxdmj85xd4"; depends=[car ggplot2 gridExtra lme4 multcompView pander psych rio ufs userfriendlyscience]; }; + rosetta = derive2 { name="rosetta"; version="0.1.1"; sha256="0q2rhz9icx4w7ihb289v1bzngbi3dnsvyviv6mvg32il1xfw8ji9"; depends=[car ggplot2 ggrepel gridExtra lme4 multcompView pander plyr psych pwr rio ufs]; }; rosetteApi = derive2 { name="rosetteApi"; version="1.12.1"; sha256="1b3cwxg7ja7g3bdl13j23xs8lw6ip70r4bah92pqs5pzmb5hx0wz"; depends=[httr jsonlite]; }; - rosm = derive2 { name="rosm"; version="0.2.4"; sha256="00c5cj65fvi0aa07da90vcms3w4qshag2gws7jhpb3wb8nw0hmqq"; depends=[abind curl jpeg plyr png prettymapr rgdal rjson sp]; }; + rosm = derive2 { name="rosm"; version="0.2.5"; sha256="10n3yzhk29i3mzbcg6nkjqgvwc9n53ax0d7imn9l4a9msa06as07"; depends=[abind curl jpeg plyr png prettymapr rgdal rjson sp]; }; rospca = derive2 { name="rospca"; version="1.0.4"; sha256="1pxm34xsc2610n0i6dwcm4rhn016yqb03f8vrm93r7285c04n4q7"; depends=[elasticnet mrfDepth mvtnorm pcaPP pracma robustbase rrcov rrcovHD]; }; rosqp = derive2 { name="rosqp"; version="0.1.0"; sha256="0975g7p75bq238g7lr200svsqm9i11z7l331r0igm5ycahljrlsm"; depends=[Matrix R6 Rcpp]; }; - rosr = derive2 { name="rosr"; version="0.0.7"; sha256="0yzyavdyhcm27cfjamjknjnlsgvawhkq0d24pial1h1hlqzm3s2a"; depends=[blogdown bookdown bookdownplus clipr devtools htmlwidgets knitr mindr rmarkdown rstudioapi shiny tinytex]; }; + rosr = derive2 { name="rosr"; version="0.0.8"; sha256="1v1lllqim6m6c2j3s7zgd9nxbxja719995lqlawijifrksrkncds"; depends=[blogdown bookdown bookdownplus clipr devtools htmlwidgets knitr mindr rmarkdown rstudioapi shiny tinytex]; }; rotasym = derive2 { name="rotasym"; version="1.0-5"; sha256="15kw50c08vdamsxmi2ybripzh0vqif14jyrclyyflihrsw9l8p9p"; depends=[Rcpp RcppArmadillo RcppZiggurat]; }; rotationForest = derive2 { name="rotationForest"; version="0.1.3"; sha256="1z2wk3mcs5hrahsxralidbc0dd8gxdbwjpr2f71g4g3isfx1ic8d"; depends=[rpart]; }; rotations = derive2 { name="rotations"; version="1.5"; sha256="1zksh6hyxdkm0lvvrld6dgkmhszn6wsjrjzr2xbn3af3gsvsydaa"; depends=[ggplot2 Rcpp RcppArmadillo rgl sphereplot]; }; @@ -12194,7 +12378,7 @@ in with self; { roxygen2 = derive2 { name="roxygen2"; version="6.1.1"; sha256="0wq29ilqas8yn2z8v49fk0hbgchg29nmyyhwczgdipz0cbhbfipd"; depends=[brew commonmark desc digest pkgload purrr R6 Rcpp stringi stringr xml2]; }; roxygen2md = derive2 { name="roxygen2md"; version="1.0.0"; sha256="1gvrfy0sk5qi8d93zxj5f7xgnnw0w38zyxdik4ckf0pkk0zdm27a"; depends=[desc devtools enc rex rlang tibble usethis withr]; }; royston = derive2 { name="royston"; version="1.2"; sha256="1rywc89qzx0hldbq10201bjdhz60pq2gmgd9b9j52mza3w4canjz"; depends=[moments nortest]; }; - rpact = derive2 { name="rpact"; version="2.0.1"; sha256="03v06ic2m3psblzbw3sfch3cjh3qjxs6iazdn51kha6r99vzqc6m"; depends=[Rcpp]; }; + rpact = derive2 { name="rpact"; version="2.0.2"; sha256="0g5r0mqrp48bl3jsq83ga0b7b7fypv84idwxfgnrsj0gvjyzrgny"; depends=[Rcpp]; }; rpanel = derive2 { name="rpanel"; version="1.1-4"; sha256="0yzasb4k5jcx3wfsll9k9alyrwc0l1x6pk91nj7cqrdiapw8j519"; depends=[]; }; rpart = derive2 { name="rpart"; version="4.1-15"; sha256="0p5frya963ppn476p5dxs2mnarsalksr6gw9zzmjsn8ikq7bx3ib"; depends=[]; }; rpart_plot = derive2 { name="rpart.plot"; version="3.0.7"; sha256="0i4ix8vabnfvcaf7vs2mvyx85ix0wkxfrhr98nvhfxchzanzrrq4"; depends=[rpart]; }; @@ -12231,17 +12415,18 @@ in with self; { rptR = derive2 { name="rptR"; version="0.9.22"; sha256="0vvjc6qiq71d5wckl77z606q1fp43mgrfzp1bxcab96n5whb2r9k"; depends=[lme4 pbapply]; }; rpubchem = derive2 { name="rpubchem"; version="1.5.10"; sha256="06j9ir65ykky5hdbyv74fnddwqd39jxvr6jig0kjqisc75k4spjz"; depends=[base64enc car data_table fingerprint iterators itertools RCurl RJSONIO stringr XML]; }; rqPen = derive2 { name="rqPen"; version="2.1"; sha256="195s2l60llw2hb5abykydajadzg44700j5kahkw57413hh86qrh0"; depends=[quantreg regpro]; }; - rqdatatable = derive2 { name="rqdatatable"; version="1.1.8"; sha256="10kf8081njxbsk92psh7bjn6s5x8a7117zi7k7v79ab3m9g2xb4m"; depends=[data_table rquery wrapr]; }; - rquery = derive2 { name="rquery"; version="1.3.5"; sha256="048c9sqacpmcpfnwami9zhg318zczg9yw47573106sj27chx5q4j"; depends=[wrapr]; }; + rqdatatable = derive2 { name="rqdatatable"; version="1.1.9"; sha256="1j8cczhid1im0afxnfhqcsy36vmcyrnqfwfbvns11ysjw5i6gh2v"; depends=[data_table rquery wrapr]; }; + rquery = derive2 { name="rquery"; version="1.3.7"; sha256="05zygsf02p3dlbaap1mfi5whhq55mwj2h2p0wcx60hqwbfq2xj4k"; depends=[wrapr]; }; rr = derive2 { name="rr"; version="1.4"; sha256="1c2h6ibjfwrjfqh1if3c90pdh0g2rf3p71j4p9w23xbbrx2l80pl"; depends=[arm coda magic MASS]; }; rr2 = derive2 { name="rr2"; version="1.0.2"; sha256="099vjg91ni2bnxlra18pvgsvzrl28zrj639cdjrh3wkpqv99d04q"; depends=[ape lme4 Matrix nlme phylolm]; }; rrBLUP = derive2 { name="rrBLUP"; version="4.6"; sha256="1bw4pjj9hm9ik5bvvklnlkykhlqm6k7pbkma1iwc3kbg8shpbd18"; depends=[]; }; rrBlupMethod6 = derive2 { name="rrBlupMethod6"; version="1.3"; sha256="1qwv954mhry46ff2ax48xcmnasygi5alv8d413g3qbk2da6i0d8l"; depends=[]; }; + rray = derive2 { name="rray"; version="0.1.0"; sha256="0x4wavvjsiy8b9bhgxddisx82k6q52qhngr2am50bf38d3x2n58h"; depends=[glue Rcpp rlang vctrs xtensor]; }; rrcov = derive2 { name="rrcov"; version="1.4-7"; sha256="14zjyqcdiqx6js99nx5s8hmyx564ixy2d8s6i7wa50xmx368rl6b"; depends=[cluster lattice mvtnorm pcaPP robustbase]; }; rrcov3way = derive2 { name="rrcov3way"; version="0.1-10"; sha256="0ybl759mfva185z2mjs5s8cjim9h8dk4gkqnva2rj9kxp7i45srd"; depends=[robustbase rrcov ThreeWay]; }; rrcovHD = derive2 { name="rrcovHD"; version="0.2-5"; sha256="1wv50lcjf0fsxb1zagxbrcx68ilfmnmkc8ccpy9hw3qql5p368ij"; depends=[pcaPP pls robustbase robustHD rrcov spls]; }; rrcovNA = derive2 { name="rrcovNA"; version="0.4-9"; sha256="1qc9xqm5x55dqjx1y7s4a2nwc07v32rygicbb8469knxasf92cs3"; depends=[cluster lattice norm robustbase rrcov]; }; - rrd = derive2 { name="rrd"; version="0.2.1"; sha256="1n4590h3xzja7j8fzay4b8rp98wnilg2znnkbw4ffk9fdac2wr5l"; depends=[assertthat tibble]; }; + rrd = derive2 { name="rrd"; version="0.2.2"; sha256="104iz2y49vzm92a8nrvgzrjyljxl467mp1hjnjmzl4rhf9kl809y"; depends=[assertthat tibble]; }; rrecsys = derive2 { name="rrecsys"; version="0.9.7.3.1"; sha256="1qnjriv1xq4gjjhzz8jxrbk88mw5xddl2l2i4bmfhnxhi51d2rk3"; depends=[ggplot2 knitr MASS Rcpp registry]; }; rredis = derive2 { name="rredis"; version="1.7.0"; sha256="0wzamwpmx20did8xj8x9dllri2ps83viyqjic18ari7i4h1bpixv"; depends=[]; }; rredlist = derive2 { name="rredlist"; version="0.5.0"; sha256="12dqilcwyxad5yjz8gh29ycwj2rbm1g0hxfsqkl7zsjaz5lbcka0"; depends=[crul jsonlite]; }; @@ -12260,11 +12445,11 @@ in with self; { rrum = derive2 { name="rrum"; version="0.2.0"; sha256="0w0f2n14if2b8x7n6v8y8q2vghd8j7xm1xhpxnvy3z50flinwgm7"; depends=[Rcpp RcppArmadillo rgen simcdm]; }; rsMove = derive2 { name="rsMove"; version="0.2.7"; sha256="0an5kknfap7hrg62gvdvrylx79p6fjdmbryhzlrj60i8n7cnc1c1"; depends=[caret ggplot2 lubridate plyr pryr raster Rcpp RCurl sp]; }; rsae = derive2 { name="rsae"; version="0.1-5"; sha256="1f3ry3jwa6vg2vq2npx2pzzvfwadz8m48hjrqjk860nfjrymwgx5"; depends=[]; }; - rsample = derive2 { name="rsample"; version="0.0.4"; sha256="0f10975j7gi4m6mq3i1g5j5khqi4ffr5aa8777mk9c9y55i1wrx8"; depends=[dplyr generics purrr rlang tibble tidyr]; }; + rsample = derive2 { name="rsample"; version="0.0.5"; sha256="0lkwhydb8csg24zkpsblyykzfsjqr930h46kbpm2wk9kgygkfspd"; depends=[dplyr furrr generics purrr rlang tibble tidyr tidyselect]; }; rsatscan = derive2 { name="rsatscan"; version="0.3.9200"; sha256="00vgby24jknq8nl7rnqcwg7gawcxhwq8b7m98vjx2hkqx39n4g21"; depends=[foreign]; }; - rscala = derive2 { name="rscala"; version="3.2.13"; sha256="11mgdmz5gxh96a68v8k9m11x000y5nhmhqfpz8rcqr14knfikr2d"; depends=[]; }; + rscala = derive2 { name="rscala"; version="3.2.15"; sha256="1d1aiy07cgfnp51vpqfypypkfwzmvw3y81xi81i33p6ylk3mmzi8"; depends=[]; }; rscimark = derive2 { name="rscimark"; version="1.0"; sha256="1jsjz4d5bnxb90qqzz42m4nyvm8d8w8bs0m1r5g2n78zmckqb8vy"; depends=[checkmate]; }; - rsconnect = derive2 { name="rsconnect"; version="0.8.13"; sha256="00bfkg8qndyicc2xin2mjk0g086gsi7vnnfxlc548fvd49ji885f"; depends=[jsonlite openssl packrat RCurl rstudioapi yaml]; }; + rsconnect = derive2 { name="rsconnect"; version="0.8.15"; sha256="018cdbcxlbvqpwzv0qxvvz8yhl0d6gcavpbk1m5fyrgpvys1brri"; depends=[curl jsonlite openssl packrat rstudioapi yaml]; }; rscopus = derive2 { name="rscopus"; version="0.6.3"; sha256="1fplb7wmzp78a1xi9b4bw6xis16gixhvl227yfhip650ib4srpv1"; depends=[dplyr httr plyr tidyr]; }; rscorecard = derive2 { name="rscorecard"; version="0.12.0"; sha256="112gcziyg8cpdw5aiyzc8473sqp8nr9q1ih4hh68hpvmxk8b407p"; depends=[dplyr httr jsonlite lazyeval magrittr tidyselect]; }; rsdepth = derive2 { name="rsdepth"; version="0.1-5"; sha256="064jbb6gnx0sm41w3sbi6mvsbzsfkjqfici6frk8sfm9ybvm591j"; depends=[]; }; @@ -12274,9 +12459,10 @@ in with self; { 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]; }; - rsimsum = derive2 { name="rsimsum"; version="0.5.2"; sha256="1fcg6g3dr774pbklzgsd8bnwbqgmnxpaz5dmlmxqhaqzzrm633vc"; depends=[checkmate ggplot2 ggridges rlang]; }; + rsimsum = derive2 { name="rsimsum"; version="0.6.0"; sha256="0awb07dqi8cb6pqh81nw522aqrx29v981vpv62281nak9s4bjryg"; depends=[checkmate ggplot2 ggridges rlang scales]; }; rsinaica = derive2 { name="rsinaica"; version="0.6.1"; sha256="1ba19b2fgnnl50qp6hgjppgxbadghq68qap9f0m51k2k3ijgfiwn"; depends=[dplyr httr jsonlite lubridate stringr]; }; rskey = derive2 { name="rskey"; version="0.4.1"; sha256="0l9z5zbii4wi7da6cl9mr62zn72pc3dgfhk6dp8sjx4jbzpa94s3"; depends=[berryFunctions miniUI rstudioapi shiny]; }; + rsleep = derive2 { name="rsleep"; version="1.0.1"; sha256="0kjb5sgv1y50cqg54dy5cx9ngr64hx2bhfav314vm2alnxsk19jh"; depends=[edfReader ggplot2 jsonlite phonTools signal]; }; rslp = derive2 { name="rslp"; version="0.1.0"; sha256="06glpdsd309058kxww114j9sshvj6gw9g5sdm4zkmzq3cl91fa6h"; depends=[magrittr plyr stringi stringr]; }; rslurm = derive2 { name="rslurm"; version="0.4.0"; sha256="1ck4ky5d0pf8hnxz1ijbjk0nfyj1hfnhf9la5qrqw2spa09z82ki"; depends=[whisker]; }; rsm = derive2 { name="rsm"; version="2.10"; sha256="0a6bxrb0qad40lnigqjv2pnwwzcwi1rcmh9gb1a1b00k1n3mnmlc"; depends=[estimability]; }; @@ -12285,27 +12471,26 @@ in with self; { rsolr = derive2 { name="rsolr"; version="0.0.9"; sha256="1mxvzb7wvm1agv35r82pr1hxa3fimixcwf36j98qjlxj9p7valrw"; depends=[BiocGenerics graph RCurl restfulr rjson S4Vectors XML]; }; rspa = derive2 { name="rspa"; version="0.2.5"; sha256="0jvrr3jaw66zqi5pal9dycpac24dn9v7lf2m63q01wmd8m3mlnv9"; depends=[lintools validate]; }; rsparkling = derive2 { name="rsparkling"; version="0.2.18"; sha256="0lhq9jxxib2krl298hy3sglh5lm5lyibknigpbxx68pn71jwp1hm"; depends=[h2o sparklyr]; }; - rsparse = derive2 { name="rsparse"; version="0.3.3.1"; sha256="14i3bmyp6s72zy298r2y6wl2lh9dn11fcy8gisvd9ds45nf1cj2j"; depends=[data_table float lgr Matrix mlapi Rcpp RcppArmadillo RhpcBLASctl]; }; + rsparse = derive2 { name="rsparse"; version="0.3.3.3"; sha256="0kdgyn9qcmblwqmz8c0hwcysvz38bjf98b6sj9qsg83kq7prj8zg"; depends=[data_table float lgr Matrix mlapi Rcpp RcppArmadillo RhpcBLASctl]; }; rsppfp = derive2 { name="rsppfp"; version="1.0.4"; sha256="123yv54i58xj4wx9n08qp50mm4l271fm1zhzimrxx22wn2bg8zy5"; depends=[doParallel dplyr foreach igraph stringr tidyr]; }; rsq = derive2 { name="rsq"; version="1.1"; sha256="0pvnyf875jybid16mg1y3dmnlrk1vahckhr5zaai1a0k4i6mh4jf"; depends=[MASS]; }; rstack = derive2 { name="rstack"; version="1.0.0"; sha256="19vbfmkd6ymadah1y1w5rn52f4hviddccyc6qj2cv5viqwbwws2z"; depends=[R6]; }; rstackdeque = derive2 { name="rstackdeque"; version="1.1.1"; sha256="0i1qqbfj0yrqbkad8bqc1qlxmyxpn7zycbnq83cdmfbilcmi87ql"; depends=[]; }; - rstan = derive2 { name="rstan"; version="2.18.2"; sha256="1zvh5qlxkwi947nqmlhazr7jwii68fpxnkcsr38s3m8havcxlxad"; depends=[BH ggplot2 gridExtra inline loo pkgbuild Rcpp RcppEigen StanHeaders]; }; + rstan = derive2 { name="rstan"; version="2.19.2"; sha256="1nh8sm97ck1fwmqj5ia70p5w8alcagx7y2956a3n5k97qfwwxr1i"; depends=[BH ggplot2 gridExtra inline loo pkgbuild Rcpp RcppEigen StanHeaders]; }; rstanarm = derive2 { name="rstanarm"; version="2.18.2"; sha256="0jflfj7g1rx0zhq0kbi1b1zwad1m7lhbvymz43g5c9cx3hh4gi68"; depends=[bayesplot BH ggplot2 lme4 loo Matrix nlme Rcpp RcppEigen rstan rstantools shinystan StanHeaders survival]; }; rstanemax = derive2 { name="rstanemax"; version="0.1.0"; sha256="0xwacxaj99qz4i2npgpiq4jggx73q53il3jm4qlhmpapbwrkbl5f"; depends=[BH dplyr ggplot2 magrittr Rcpp RcppEigen rstan rstantools StanHeaders tidyr]; }; rstantools = derive2 { name="rstantools"; version="1.5.1"; sha256="11dlrz3mj1j9qigh2qff0ixdcfds4ppxd37112yq8bn16b0idasw"; depends=[]; }; rstap = derive2 { name="rstap"; version="1.0.3"; sha256="176z39k54l5r60md6wziz828c46alv2pmqivvmhvb358crrb8x7n"; depends=[abind bayesplot BH dplyr ggplot2 lme4 loo Matrix nlme pracma Rcpp RcppEigen rstan rstantools StanHeaders]; }; - rstatix = derive2 { name="rstatix"; version="0.1.1"; sha256="1a39f4haxvzw06kbl5qxnnhzh4nqri0w66c4jxdp7g3plp67hn09"; depends=[broom car corrplot dplyr magrittr purrr rlang tibble tidyr tidyselect]; }; + rstatix = derive2 { name="rstatix"; version="0.1.2"; sha256="0jww4div56b57bnf7pxkhnhgrdbyf6wfbxlbd74bl974vdg0dxv3"; depends=[broom car corrplot dplyr magrittr purrr rlang tibble tidyr tidyselect]; }; rstatscn = derive2 { name="rstatscn"; version="1.1.3"; sha256="07w7ixq1faq7mif2ksxcgl8n6ali9h0wx0nb2yz4kbdgvz68r7b9"; depends=[httr jsonlite]; }; rstiefel = derive2 { name="rstiefel"; version="1.0.0"; sha256="0g09fpp3432v78gqgn0hiva6zqr8yqn379wz4428wanmiskqr3f0"; depends=[]; }; rstpm2 = derive2 { name="rstpm2"; version="1.4.5"; sha256="0xdvv27cf3b45ahvlzbn8n0kmj4kyc7sl52xjr71757ymf154q3g"; depends=[bbmle fastGHQuad mgcv Rcpp RcppArmadillo survival]; }; rstream = derive2 { name="rstream"; version="1.3.5"; sha256="1wprsnwl63cc4a6j5h18r09wlh32bq5z6hj6r5klp7rkpjchsplp"; depends=[]; }; rstudioapi = derive2 { name="rstudioapi"; version="0.10"; sha256="15mbw607ncdf53mgga76n3va5zzdcjqz14nb0jcn9axwccqamic0"; depends=[]; }; rsubgroup = derive2 { name="rsubgroup"; version="0.6"; sha256="1hz8rnbsl97ch6sjwxdicn2sjyn6cajg2zwmfp03idzpb3ixlk7l"; depends=[foreign rJava]; }; - rsunlight = derive2 { name="rsunlight"; version="0.7.0"; sha256="0v2wrgq8fxvkf8sf4z4wi4bbvbskw5wzcplns9imwfmm3y2pabyi"; depends=[crul data_table jsonlite plyr stringr tibble]; }; rsurface = derive2 { name="rsurface"; version="1.1.0"; sha256="1pymbgvr72nqd66wap5wrcizzx2k9bfr6vkxv6dkvjmi8q7jl2gv"; depends=[plotly rsm]; }; rsurfer = derive2 { name="rsurfer"; version="0.2"; sha256="14zd8fhak12yha6miwb84085722v5ipk8lagijhc6af291kp70i9"; depends=[gdata stringr]; }; - rsvd = derive2 { name="rsvd"; version="1.0.1"; sha256="1faskhf5j2bj9f971qljsmh182g3rnyilj1wwijz530a6skxidzz"; depends=[Matrix]; }; + rsvd = derive2 { name="rsvd"; version="1.0.2"; sha256="0fia77y5fxnhwkcxlgp98ygb8fdfraky75x80hkf7kvvpwc5rzn8"; depends=[Matrix]; }; rsvg = derive2 { name="rsvg"; version="1.3"; sha256="11mccgf6hfskg45wqc114sx3qy2r494y6axdf73z6xwhs1wpm97g"; depends=[]; }; rsyslog = derive2 { name="rsyslog"; version="1.0.1"; sha256="1i33bpv894jk7cixsvn85h1g532zj39f8dfqq8cyzgsav9wba2y4"; depends=[]; }; rt_test = derive2 { name="rt.test"; version="1.18.7.9"; sha256="0ywkdjvfzmrmmsfkz4jbhwzbzv7wivx80xy8wr92dch1862h6ias"; depends=[]; }; @@ -12316,11 +12501,10 @@ in with self; { rtext = derive2 { name="rtext"; version="0.1.21"; sha256="0j2jfz0mz9552dwa78d527lxipmj5ql8q8np8qq5jw4ka6wj5lbs"; depends=[digest hellno magrittr R6 Rcpp RSQLite stringb]; }; rtf = derive2 { name="rtf"; version="0.4-14"; sha256="1v4vb2ijqlbqcjqdhf85kfzs67whkhm6ygp5cw8xa6qw179vkgd5"; depends=[R_methodsS3 R_oo]; }; rtfbs = derive2 { name="rtfbs"; version="0.3.9"; sha256="02irj6c7nfgp42yb5zdmhbr5pi09xgx0z76d1ccfczjf0r1cyvfz"; depends=[rphast]; }; - rticles = derive2 { name="rticles"; version="0.8"; sha256="13nhvzgcv6lpnz2xr253q3wm0whmn9n0k4avm8kj43ha9qljalzp"; depends=[knitr rmarkdown tinytex xfun yaml]; }; + rticles = derive2 { name="rticles"; version="0.9"; sha256="19kp0fk2skdnsk6vmgf5p9m9c2lf112kir1kpw33hmzyn8cf1fjv"; depends=[knitr rmarkdown tinytex xfun yaml]; }; rtide = derive2 { name="rtide"; version="0.0.5"; sha256="0ns79xkkl141bbns8zlvx3gf48k4a03qa21pjyhnhgkm9lsihwfc"; depends=[abind checkr lubridate]; }; rtiff = derive2 { name="rtiff"; version="1.4.6"; sha256="09p4rki1z6zy79z9hb8pajglznnklr4hg7fcyrdxnqs1sjbw1iwy"; depends=[pixmap]; }; - rtika = derive2 { name="rtika"; version="1.21"; sha256="042kg26pkcsl5n4x9bk0gmgi52f3wcnz9d8kkj8191qayaby8f71"; depends=[curl digest rappdirs sys]; }; - rtimes = derive2 { name="rtimes"; version="0.5.0"; sha256="1z8iaxkvd99fnk46vzbw6lax2qayng6s5n1sxn78kvp8py552f61"; depends=[crul data_table dplyr jsonlite tibble]; }; + rtika = derive2 { name="rtika"; version="1.22"; sha256="1vlv2v7s7p6plahph1wvki68ssyqq8l49brj3pp3r0cnz082askl"; depends=[curl digest rappdirs sys]; }; rtimicropem = derive2 { name="rtimicropem"; version="1.4.0"; sha256="0z6bnzks8mcb871m3z5b3cd883hj1i17swjgly005hvwbvi9h61f"; depends=[changepoint dplyr fs ggplot2 knitr lazyeval lubridate R6 rbokeh readr stringr tibble tidyr]; }; rtip = derive2 { name="rtip"; version="1.1.1"; sha256="0lfny8nvgnf90xsmgmr32nzjbw8117m4vw7d0bc3xm4pzpnymjdq"; depends=[boot ggplot2 mvtnorm plyr rootSolve]; }; rtk = derive2 { name="rtk"; version="0.2.5.7"; sha256="0h2664z7rbpj0zqnixb5swkkpjbbsgiagmd6dl92k10zphw0c8i0"; depends=[Rcpp]; }; @@ -12363,7 +12547,8 @@ in with self; { rvg = derive2 { name="rvg"; version="0.2.1"; sha256="0j61qlswrivz4a4jx8laprcyfzm867x3qibr65vd0fyvf7m6dl8p"; depends=[gdtools officer Rcpp rlang xml2]; }; rvgtest = derive2 { name="rvgtest"; version="0.7.4"; sha256="1lhha5nh8fk42pckg4ziha8sa6g20m0l4p078pjj51kz0k8929ng"; depends=[]; }; rviewgraph = derive2 { name="rviewgraph"; version="1.2"; sha256="0qw1fdfwg2763a1k1qmryblw5rpagsi5p70rs7fj256zfcjvwrz8"; depends=[rJava]; }; - rvinecopulib = derive2 { name="rvinecopulib"; version="0.3.1.1.0"; sha256="1405fc7svxm62isjb2k3f8ppb1q9dbnwbclnf17laimwrqlvg0m9"; depends=[assertthat BH cctools kde1d lattice Rcpp RcppEigen RcppThread wdm]; }; + rvinecopulib = derive2 { name="rvinecopulib"; version="0.3.2.1.1"; sha256="093iy7jy7iair3qiqifmbml420bkyzyj8xd09vyffwnw1q3cri1d"; depends=[assertthat BH cctools kde1d lattice Rcpp RcppEigen RcppThread wdm]; }; + rvkstat = derive2 { name="rvkstat"; version="2.6.2"; sha256="11jaxmf24rkzmymx5dvfjbw2i6lxw4n4g4f83kpjf2768cvscyp2"; depends=[httr jsonlite RCurl tidyr]; }; rwalkr = derive2 { name="rwalkr"; version="0.4.0"; sha256="01ia1wkmbigly45kyc1ydrah0yzxlymsnj3vy6wf8ck24lv51dif"; depends=[dplyr httr tidyr]; }; rwars = derive2 { name="rwars"; version="1.0.0"; sha256="0kmwpr6gn3xsf0pqx153vblpjbhc34mzlgyv8xb2nw78nf8znfij"; depends=[httr]; }; rwavelet = derive2 { name="rwavelet"; version="0.4.0"; sha256="0wb3kd97inyh985q1hspnzwxfawfdps43r3zzdpw0jd8sgd7zqxp"; depends=[signal]; }; @@ -12377,7 +12562,7 @@ in with self; { rwunderground = derive2 { name="rwunderground"; version="0.1.8"; sha256="02p26gkicd5v511kb04p1h3wxj57r7j5vr97n3ibywc6ivz7nqxa"; depends=[countrycode dplyr httr lubridate tibble]; }; rxSeq = derive2 { name="rxSeq"; version="0.99.3"; sha256="0g0n2pzbssz61psghjp1vrlspgph4s39x1k1zhcz7ivdn5pjb2nx"; depends=[MASS numDeriv VGAM]; }; rxylib = derive2 { name="rxylib"; version="0.2.4"; sha256="0va7kw40nycjn8gh9blzpbph4z319r5a16yim8lwx3hi6rs9myhr"; depends=[BH Rcpp]; }; - ryandexdirect = derive2 { name="ryandexdirect"; version="3.1.6"; sha256="0g7xslhrfjhmw51f0qs5mqflm0fkwgdz9cjsg6f9qrlzlw7zhhsr"; depends=[bitops data_table dplyr httr jsonlite magrittr readr xml2]; }; + ryandexdirect = derive2 { name="ryandexdirect"; version="3.2.0"; sha256="0mzdxkbndyjqn0hx2hchcfnpfj2n2fc1gfgfgrj66r3cdvxsazsy"; depends=[bitops data_table dplyr httr jsonlite magrittr readr xml2]; }; rym = derive2 { name="rym"; version="0.5.2"; sha256="1j69fmc0wgj8w5y68ix13kh3rsc4blmyc9hsmp41crgr10mi3nvi"; depends=[httr stringr]; }; ryouready = derive2 { name="ryouready"; version="0.4"; sha256="1d9z3paxcrkwsgn5g83x57jwz2iqarks30x0bwg48i5ispw6xbr3"; depends=[car ggplot2 stringr]; }; rysgran = derive2 { name="rysgran"; version="2.1.0"; sha256="1l2mx297iyipap8cw2wcw5gm7jq4076bf4gvgvij4q35vp62m85z"; depends=[lattice soiltexture]; }; @@ -12399,13 +12584,13 @@ in with self; { sSDR = derive2 { name="sSDR"; version="1.2.0"; sha256="1fqsglqzsbzdvcdnwwf7mg6x20zfpw66x63r6avac3w1pz3n7kvx"; depends=[MASS Matrix]; }; sValues = derive2 { name="sValues"; version="0.1.6"; sha256="0830f4w6jgpiysk0vz0bxaxwa8m3k94fgj9l3qb42r3jjf9cdn29"; depends=[ggplot2 reshape2]; }; saasCNV = derive2 { name="saasCNV"; version="0.3.4"; sha256="12h5vrl55sb4wmx0hzib5iax8p0q2qzk19h15r0asfkh9l7qz94l"; depends=[DNAcopy RANN]; }; - sabre = derive2 { name="sabre"; version="0.2.1"; sha256="0zfw3mb21p48xjjwvz7p5q5ckh1sk17rymkkhln97jjfy5q1zwz8"; depends=[dplyr entropy rlang sf tibble tidyr]; }; + sabre = derive2 { name="sabre"; version="0.3.1"; sha256="0yqw126yr7syjdwq780b395b9qwncqr86vjkmwcvs2w6v1j3nppi"; depends=[dplyr entropy raster rlang sf tibble tidyr]; }; 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.3"; sha256="17jlzx5h5l1w7riz0rs99w31n6lxnnxwzbzqn2z5r292j2nxvmkw"; depends=[hypergeo orthopolynom PDQutils]; }; sads = derive2 { name="sads"; version="0.4.2"; sha256="1j6vdjvpnbqp4kwbvhcl8p51ln29mmk9n150718wsqlifb8d1lw9"; depends=[bbmle GUILDS MASS poilog VGAM]; }; sae = derive2 { name="sae"; version="1.2"; sha256="1fai9lkyyssnkkdrjrrx7vzj88nglmd4bkzan3hdhrc49abclp59"; depends=[lme4 MASS]; }; - sae2 = derive2 { name="sae2"; version="0.1-1"; sha256="0fbbh2s0gjhyhypaccnd37b5g2rhyzq7mrm6s0z36ldg1pzi4dd9"; depends=[MASS]; }; + sae2 = derive2 { name="sae2"; version="1.0-1"; sha256="0cnqlacglwyx4cdm3wl3j3g2xv2sx3921mnzk2v0bk704i9y7qq3"; depends=[MASS survey]; }; saeRobust = derive2 { name="saeRobust"; version="0.2.0"; sha256="1bdfrsm59xwkga0kxl3r5n83mhhkyzj7gplrgx26gyflashyd1zc"; depends=[aoos assertthat ggplot2 magrittr MASS Matrix memoise modules pbapply Rcpp RcppArmadillo spdep]; }; saeSim = derive2 { name="saeSim"; version="0.10.0"; sha256="0nh8x2v0g8i0rjq4s5q0ayhyxhl5p0126plmd4vnnhaifm6pn0q3"; depends=[dplyr functional ggplot2 MASS parallelMap spdep]; }; saemix = derive2 { name="saemix"; version="2.2"; sha256="1gp9xww9q3cq9dr6nifp4wlyg9gmamab845py1ag07vnr2gfwx5c"; depends=[]; }; @@ -12427,9 +12612,10 @@ in with self; { sampling = derive2 { name="sampling"; version="2.8"; sha256="06pj7dan0mknpsblmlnk7am78qrnwgnql5vvx7vmbfvib7rj6s9m"; depends=[lpSolve MASS]; }; samplingDataCRT = derive2 { name="samplingDataCRT"; version="1.0"; sha256="0ah3fi2sn642c8nicikhjhl1hdsjzshrf1j02swq0jaqggcqjdvk"; depends=[mvtnorm]; }; samplingEstimates = derive2 { name="samplingEstimates"; version="0.1-3"; sha256="1srdchlpxksfdqhf5qdvl7nz0qsxkxww7hzqj0q71asbzlq3am3p"; depends=[samplingVarEst]; }; - samplingVarEst = derive2 { name="samplingVarEst"; version="1.3"; sha256="031iwgiw7dcncw1smxidn3kyvl0n06j5ag4pbhnicfqpj0pnx3l3"; depends=[]; }; + samplingVarEst = derive2 { name="samplingVarEst"; version="1.4"; sha256="0gzz0qz67h3vpdsi5g1w7fkyacj8789qxmj353q7pd0jm20q60l1"; depends=[]; }; samplingbook = derive2 { name="samplingbook"; version="1.2.2"; sha256="1szx9bdlxxn2yhy9i362fcscn5cydvrkw9kggr7yqb715k5n1j6n"; depends=[pps sampling survey]; }; samr = derive2 { name="samr"; version="3.0"; sha256="01km0f7qgm73x19vbvsxl083hs1dq4dj8qm5h64cxbf20b08my15"; depends=[GSA impute matrixStats openxlsx shiny shinyFiles]; }; + samurais = derive2 { name="samurais"; version="0.1.0"; sha256="0s00hd3ax4r662n8iqmd9i56sgyjxbgc59la7qvh3jwcnzcvmgz9"; depends=[MASS Rcpp RcppArmadillo]; }; sand = derive2 { name="sand"; version="1.0.3"; sha256="0h7djria9v75gqcygjcfznpchqgxjqc6b43arvq9ni1xjrq8sszf"; depends=[igraph igraphdata]; }; sandwich = derive2 { name="sandwich"; version="2.5-1"; sha256="1mk685b9wq7k566pbml52rj96i5h6b3vf215k9picgmq296nzvyv"; depends=[zoo]; }; sanitizers = derive2 { name="sanitizers"; version="0.1.0"; sha256="1c1831fnv1nzpq8nw9krgf9fm8v54w0gvcn4443b6jghnnbhn2n6"; depends=[]; }; @@ -12441,10 +12627,9 @@ in with self; { sapfluxnetr = derive2 { name="sapfluxnetr"; version="0.0.7"; sha256="0lnhg4apsvvyzyz89x778nhxjp4y0mycgajxjyb57wcwgn16gygm"; depends=[assertthat dplyr furrr ggplot2 glue lubridate magrittr purrr rlang stringr tibble tidyr]; }; saqgetr = derive2 { name="saqgetr"; version="0.1.17"; sha256="0ba005pv6iswv0q3jg6h7dh6j1c318c53sndjwaibqxnmy8by7mb"; depends=[dplyr fs lubridate magrittr purrr readr stringr tidyr]; }; sarima = derive2 { name="sarima"; version="0.8.1"; sha256="03261mqv4l8wkan0phg7085qsy9q1vhhyx6bfnygjva7vvxafvpc"; depends=[dplyr FitAR FitARMA Formula KFAS lagged ltsa numDeriv PolynomF Rcpp RcppArmadillo Rdpack]; }; - sars = derive2 { name="sars"; version="1.1.2"; sha256="0grc3mkcfdbzcppwziphssshjhy89wqwd5gzsj6mv15dix54wjca"; depends=[cli crayon dplyr nortest numDeriv]; }; + sars = derive2 { name="sars"; version="1.2.0"; sha256="03pqdnfchin541fb5awb5i5xl8ryh382wh898hxgxi05qaz1cv07"; depends=[cli crayon dplyr nortest numDeriv]; }; sas7bdat = derive2 { name="sas7bdat"; version="0.5"; sha256="0qxlapb6wdhzpwlmzlhscy3av7va3h6gkzsppn4sx5q960310an3"; depends=[]; }; sasMap = derive2 { name="sasMap"; version="1.0.0"; sha256="11vhhxhakqm1gsb3p4s4966sapmrqfyw79zfppbx5lnqi3xr0ngn"; depends=[readr stringi stringr]; }; - sass = derive2 { name="sass"; version="0.1.1"; sha256="15wib808y7xszrn2nvmsrjxy7ralqh5w7nz0qq3sckv39j9ss4wv"; depends=[digest]; }; satellite = derive2 { name="satellite"; version="1.0.1"; sha256="1g8zzlsdvb56l2jph7i5wjgbpyx5dkwa3nv8mzmg0qyh3zd9pyi0"; depends=[plyr raster Rcpp]; }; satscanMapper = derive2 { name="satscanMapper"; version="1.0.1"; sha256="1qr7xz7qp39nylkrx3smzga7rvi2z9yws8kbpmfk13avixr4asvy"; depends=[foreign RColorBrewer SeerMapper sp stringr]; }; saturnin = derive2 { name="saturnin"; version="1.1.1"; sha256="0cjp4h1s9ivn17v8ar48mxflaj9vgv92c8p9l2k5bc9yqx9mcs36"; depends=[Rcpp RcppEigen]; }; @@ -12479,7 +12664,7 @@ in with self; { scatterD3 = derive2 { name="scatterD3"; version="0.9"; sha256="0miadn406viqzw1sc27fl3xb1l0vvachrfiv72jl9r7qgk2ga5jv"; depends=[digest ellipse htmlwidgets]; }; scatterpie = derive2 { name="scatterpie"; version="0.1.2"; sha256="0r3m3781jvzxr0ry7rhd085c0xl5620sf5zcq9nnfl613imwxj2b"; depends=[ggforce ggplot2 rlang rvcheck tidyr]; }; scatterplot3d = derive2 { name="scatterplot3d"; version="0.3-41"; sha256="152xqz9c70qab86mpgng049gxsg5f4fpf1m8dh93fb9v1avjd0sc"; depends=[]; }; - scbursts = derive2 { name="scbursts"; version="1.4"; sha256="0kdzgkc9gbbxi9pjw13d54pz6bxckdkgi56rgrgcl97ykzii3jxq"; depends=[readxl tibble]; }; + scbursts = derive2 { name="scbursts"; version="1.6"; sha256="09yxnq6m35xmp0priavjnh0bdcwkr5hhy7j33cz13xwkrd1cgw5j"; depends=[readxl tibble]; }; scclust = derive2 { name="scclust"; version="0.2.2"; sha256="0w0qwz8wfdprs2bgv1cjvd2yb6g12jylad21a9rr3w5bkgxprcrp"; depends=[distances]; }; scdensity = derive2 { name="scdensity"; version="1.0.2"; sha256="173xm3bf8vxl30zk4n451al7m003byg9q4d1l1pfyfa4xnv8qdg9"; depends=[lpSolve quadprog]; }; scdhlm = derive2 { name="scdhlm"; version="0.3.1"; sha256="1b5x4kqvmkpb8wbgfhnwqakisw6hfnvama2bsnd8kvw4alfanxhm"; depends=[nlme]; }; @@ -12501,7 +12686,7 @@ in with self; { scoper = derive2 { name="scoper"; version="0.1.0"; sha256="1a170x1h2wglsmqp0fjga2q29yfnfdbgjcm62412n575j9d4xp5n"; depends=[alakazam doParallel dplyr foreach ggplot2 iterators lazyeval shazam stringi]; }; scopr = derive2 { name="scopr"; version="0.3.3"; sha256="1j45l5zcrpc4dnb6ik1v0jlqizpkijl0p656s869jhhvv55r6v2i"; depends=[behavr data_table memoise readr RSQLite stringr]; }; score = derive2 { name="score"; version="1.0.2"; sha256="1p289k1vmc7qg70rv15x05dyb92r7s6315whr1ibi40sqln62a5s"; depends=[msm]; }; - scorecard = derive2 { name="scorecard"; version="0.2.4"; sha256="0vc8484d3d933kddg37hbql5l6h7kpfl6iqi4irwy1vq63xf2126"; depends=[data_table doParallel foreach ggplot2 gridExtra openxlsx]; }; + scorecard = derive2 { name="scorecard"; version="0.2.5"; sha256="1amy5qbc7xcqa46rk9dbcvkpsndvjv7hm2vl9lvylv44xg98sb8a"; depends=[data_table doParallel foreach ggplot2 gridExtra openxlsx]; }; scorecardModelUtils = derive2 { name="scorecardModelUtils"; version="0.0.1.0"; sha256="09znaxrv14m58hsk5pac458xbpcsidc6ygcsw4q9j0p4yd80qbvl"; depends=[car e1071 gbm ggplot2 partykit randomForest reshape2 sqldf stringr]; }; scorer = derive2 { name="scorer"; version="0.2.0"; sha256="1mc4hxcrqzh4dmz5fy40740bnrp4fxia81fj3cdw9382p67ivhim"; depends=[Rcpp]; }; scoring = derive2 { name="scoring"; version="0.6"; sha256="114jlpbnm15fdan5lr40adxdzwajy3yhdw6dm4kvkvky6qhcx7q5"; depends=[]; }; @@ -12525,8 +12710,9 @@ in with self; { sdStaf = derive2 { name="sdStaf"; version="1.0.2"; sha256="0r7lqj30r3f0b18kpahi63zsdizcw2zjf1vvvs04s4cg1djjbcp3"; depends=[dismo dplyr ggplot2 raster rasterVis rgdal rgeos sp tidyr]; }; sda = derive2 { name="sda"; version="1.3.7"; sha256="1v0kp6pnjhazr8brz1k9lypchz8k8gdaby8sqpqzjsj8klghlcjp"; depends=[corpcor entropy fdrtool]; }; sdat = derive2 { name="sdat"; version="1.1"; sha256="1mxijw2yfblqjvqqb2xrzhfn9c872i1q9ggw24xicvr2fk4lvjw6"; depends=[]; }; - sdcHierarchies = derive2 { name="sdcHierarchies"; version="0.18"; sha256="0bgrgs3v5jfhpy9y3fv06nydn3fkj8bxpc8h78igr1qjxbx3lc5n"; depends=[cli data_table jsonlite rlang shiny shinyjs shinythemes shinyTree]; }; + sdcHierarchies = derive2 { name="sdcHierarchies"; version="0.18.1"; sha256="0k7kks4kg62pk00zs7y5gbikaz2fpgkldw9p5jzhghdlkykz03xw"; depends=[cli data_table jsonlite rlang shiny shinyjs shinythemes shinyTree]; }; sdcMicro = derive2 { name="sdcMicro"; version="5.4.0"; sha256="0qh9rcjg5pbq2lnymjzf5xh3h22f0j30xmq5hqsk9lkhr863mbn6"; depends=[car carData cluster data_table DT e1071 ggplot2 haven knitr MASS prettydoc Rcpp rhandsontable rmarkdown robustbase sets shiny shinyBS VIM xtable]; }; + sdcSpatial = derive2 { name="sdcSpatial"; version="0.1.1"; sha256="1szv2nb758k3x5scxml2ns11fi99rlmd11r3fhzy3dgylf0m0xnm"; depends=[raster]; }; sdcTable = derive2 { name="sdcTable"; version="0.28"; sha256="1r15gz107mm2s3bnbxbrn2py80ran0753qcbqlgy61kr9dwbhh5x"; depends=[data_table knitr lpSolveAPI Rcpp Rglpk rlang sdcHierarchies slam 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=[]; }; @@ -12536,7 +12722,7 @@ in with self; { sdmpredictors = derive2 { name="sdmpredictors"; version="0.2.8"; sha256="18374f2bnhh3nb62xf1h6fbqgpimlnkc2vbx5xkg5gyfylydz0v9"; depends=[R_utils raster rgdal]; }; sdmvspecies = derive2 { name="sdmvspecies"; version="0.3.2"; sha256="19avkag13ij1k65vqhmvcy8j50j8vrgw4mjc49x8i63w3d4z1wxh"; depends=[psych raster]; }; sdnet = derive2 { name="sdnet"; version="2.4.1"; sha256="0z0wqc4hcmxqbavj9zma9j3dkg978l8dxcbyh9mlsbpfi4d1zph8"; depends=[]; }; - sdols = derive2 { name="sdols"; version="1.7"; sha256="18c9y80pvhcqfl5ppfsfdhiygzx073xrzm1zzj08wn4r6snw04sh"; depends=[commonsMath rscala]; }; + sdols = derive2 { name="sdols"; version="1.7.5"; sha256="0pdd63pm56prvy7b3bagpnc5ri6n0xj7p0jkndyfzj9cvgwbhb0f"; depends=[commonsMath rscala]; }; sdprisk = derive2 { name="sdprisk"; version="1.1-6"; sha256="061x78irryc5phd8bv9cs2mfgiajgwmr85ryp1r47anadydb2haa"; depends=[numDeriv PolynomF rootSolve]; }; sdpt3r = derive2 { name="sdpt3r"; version="0.3"; sha256="02qv889mkzcilxzszzqcqgn9z5zmki0093mdriradbl1y8a27bp5"; depends=[Matrix]; }; sdtoolkit = derive2 { name="sdtoolkit"; version="2.33-1"; sha256="0pirgzcn8b87hjb35bmg082qp14idc5pfvm6dikpgkswag23hwh8"; depends=[]; }; @@ -12546,7 +12732,7 @@ in with self; { sealasso = derive2 { name="sealasso"; version="0.1-2"; sha256="0cjy3fj170p5wa41c2hwscmhqxwkjq22vhg9kbajnq7df2s20jcp"; depends=[lars]; }; searchConsoleR = derive2 { name="searchConsoleR"; version="0.3.0"; sha256="1z8bdlxq2sk8bcg164wy0yrmsx0inf0aj5ya2pybvadss8wr0qlr"; depends=[googleAuthR stringr]; }; searchable = derive2 { name="searchable"; version="0.3.3.1"; sha256="0xc87i2q42j7dviv9nj4hkgjvpfiprkkjpgzwsy47vp7q8024dv0"; depends=[magrittr stringi]; }; - searcher = derive2 { name="searcher"; version="0.0.3"; sha256="004k757hn5y80k7kim3049n3mjrsimqpzdz5fis2ggxbdwwf1bs1"; depends=[]; }; + searcher = derive2 { name="searcher"; version="0.0.4"; sha256="0xxawwa95vfcbq8gg61ylnsg1qg6q1ng9iq4r1a1ai9440p5mvh3"; depends=[]; }; seas = derive2 { name="seas"; version="0.5-2"; sha256="0hn4d5dc01zyycd7l3vj1sx6bq668n7fzffw9ypaa5l20fizs0ay"; depends=[MASS]; }; season = derive2 { name="season"; version="0.3.8"; sha256="0kw3gvy7rv0rms0zj1rvqlfdn3yxr9r9ldm21zl2xrpx9cy04d2d"; depends=[ggplot2 MASS survival]; }; seasonal = derive2 { name="seasonal"; version="1.7.0"; sha256="1mna8w1haj5h2rhiw7jkhprr6cc9qr0n8x73d10v0l732kx41n31"; depends=[x13binary]; }; @@ -12560,13 +12746,14 @@ in with self; { secsse = derive2 { name="secsse"; version="2.0.0"; sha256="0qsbn56vc6y19hmc94bimv1mf86ayxa8rj38qvvsxjfm9czmw2ac"; depends=[ape apTreeshape DDD deSolve doParallel foreach geiger phylobase]; }; secure = derive2 { name="secure"; version="0.5"; sha256="16pv5m7rrcs8hcjj3kylq7smyzf2qk8rkg9m1b421w0ac7lg04x1"; depends=[MASS Rcpp RcppArmadillo]; }; securitytxt = derive2 { name="securitytxt"; version="0.1.0"; sha256="117xmhclv219ci8vki8ni8yqvlnwgj0pd8n0r752wd8333y130wr"; depends=[Rcpp]; }; - see = derive2 { name="see"; version="0.2.0"; sha256="0bwdq3zvj53qmacmwy4ffbqyngjziql4arb009ns4himhndkjyj9"; depends=[bayestestR dplyr ggplot2 ggridges gridExtra insight magrittr rlang scales]; }; + see = derive2 { name="see"; version="0.2.1"; sha256="0c4hw3x30zip8rp04knw07b3cvczfkpx7zi7m6n411d5bl90xiij"; depends=[bayestestR dplyr ggplot2 ggridges gridExtra insight magrittr rlang scales]; }; seeclickfixr = derive2 { name="seeclickfixr"; version="1.1.0"; sha256="1agsqq2msrqrssffc6liyjjs6nqm90xy2inlcjbkdac5dhinjc4n"; depends=[jsonlite RCurl]; }; seedCCA = derive2 { name="seedCCA"; version="1.0"; sha256="1grs6ykiyp8p5gh93hgb4niggppbh2wzwl6yx0l1qs9fkcz5zvy7"; depends=[CCA corpcor]; }; seedwater = derive2 { name="seedwater"; version="1.0"; sha256="0qqhjax16lnyriv6q9n89g93bs1zy8xwx9jp0xbilba7djzjh33g"; depends=[rpanel tkrplot]; }; - seewave = derive2 { name="seewave"; version="2.1.3"; sha256="0mi5pqgf0x3lfhdhqmjrp04rb4c0vffi068kdalvywjkkprnqygi"; depends=[tuneR]; }; + seewave = derive2 { name="seewave"; version="2.1.4"; sha256="0xi3jw07fvfabsi1k0nf7cbp598b865z430bzkjdrldvc0ckb9cf"; depends=[tuneR]; }; seg = derive2 { name="seg"; version="0.5-6"; sha256="187ib8vgkj8zqzwlmwq6q8yldxsv63lahb9mlhrp9fa702650jv7"; depends=[sp splancs]; }; segMGarch = derive2 { name="segMGarch"; version="1.2"; sha256="0chw41h25jka9wa3rf3d8dq2ym47379jflv33q6qxaak8xy1kmd9"; depends=[corpcor doParallel fGarch foreach iterators mvtnorm Rcpp RcppArmadillo]; }; + segRDA = derive2 { name="segRDA"; version="1.0.2"; sha256="0az27z4pppyz5slckwmgk6qqix710m1s96drlq4fh8bqn2qmz812"; depends=[vegan]; }; segclust2d = derive2 { name="segclust2d"; version="0.2.0"; sha256="1n5h92dza7wgfpfyzlfb7hbrqb0a8dhc38vml9645gym3a1riwn5"; depends=[dplyr ggplot2 magrittr plyr RColorBrewer Rcpp RcppArmadillo reshape2 scales zoo]; }; segmag = derive2 { name="segmag"; version="1.2.4"; sha256="1i717xg1z7s35pkwzywgjf9wx7zj9xksv0k87h7p1q62y073qbqm"; depends=[plyr Rcpp]; }; segmenTier = derive2 { name="segmenTier"; version="0.1.2"; sha256="01xbcddinjbkbqkwq2lnsxd3gw8fxys58p498dc2lw8psz3g2wgc"; depends=[Rcpp]; }; @@ -12598,6 +12785,7 @@ in with self; { semds = derive2 { name="semds"; version="0.9-6"; sha256="10kvcmcy6qa2r5sram6azqgzl528rghfxgw2f2bq2fvhhq127dzq"; depends=[minpack_lm pracma]; }; semiArtificial = derive2 { name="semiArtificial"; version="2.3.1"; sha256="1rjf8wsbwi6kfwsh89kblhl0f3m7rrma7gly7b4xm7bj7jdkljkr"; depends=[cluster CORElearn flexclust fpc ks logspline MASS mcclust nnet robustbase RSNNS StatMatch timeDate]; }; seminr = derive2 { name="seminr"; version="0.7.0"; sha256="1zf3qyqvlk8f7a5q39980cyci8smn2z326qlp275qs23yawnch9c"; depends=[]; }; + semnar = derive2 { name="semnar"; version="0.7.1"; sha256="0g6l4377i9wdwbcrdhdmsph68bd6qwc5mjlw824mpxn0ggg6vx72"; depends=[jsonlite leaflet lubridate magrittr urlshorteneR]; }; semsfa = derive2 { name="semsfa"; version="1.1"; sha256="1k6i1m4r9y7j85rlrsgfjm8w15ax4xgf70xyvqwsszmf9950ldxx"; depends=[doParallel foreach gamlss iterators mgcv moments np]; }; semtree = derive2 { name="semtree"; version="0.9.13"; sha256="0am7fm7f9kgq6kmd17axrswlg191ny3pq6b5sf731diz1ghyncmp"; depends=[bitops cluster digest OpenMx plotrix rpart rpart_plot sets stringr]; }; semver = derive2 { name="semver"; version="0.2.0"; sha256="10wpkyms2cix3bsin2q0qhkbl445pwwpa5gm2s4jjw1989namkxy"; depends=[assertthat Rcpp]; }; @@ -12622,7 +12810,7 @@ in with self; { sentimentr = derive2 { name="sentimentr"; version="2.7.1"; sha256="13myh7w9pynmgvqspsxpnj8mz8jz8nwkwjyax4hahvwb9707hf2s"; depends=[data_table ggplot2 lexicon stringi syuzhet textclean textshape]; }; sentometrics = derive2 { name="sentometrics"; version="0.5.6"; sha256="073xhygj833a8k249kw5sbg7jmmcs9k4fsva88say5xhkbq62yqr"; depends=[caret data_table foreach ggplot2 glmnet ISOweek quanteda Rcpp RcppArmadillo RcppParallel RcppRoll stringi]; }; separationplot = derive2 { name="separationplot"; version="1.1"; sha256="0qfkrk8n6jj8l7ywngwsaikfwmd9hbrpr43x0l9wkjjp1asgs5l6"; depends=[]; }; - seplyr = derive2 { name="seplyr"; version="0.8.3"; sha256="1v4rr7v1hsrn15r4cbqd6ym9j9aiwnkmcix585fj3d4vfy1jklh5"; depends=[dplyr rlang tidyr wrapr]; }; + seplyr = derive2 { name="seplyr"; version="0.8.4"; sha256="18z3nfxghzzcn23ilgsimbxz8mqi3q45i7b3ihdmkllc3ln1f0vk"; depends=[dplyr rlang tidyr wrapr]; }; seqCBS = derive2 { name="seqCBS"; version="1.2.1"; sha256="176ggpdcgmpsjixmz0ldknyd0vw120kjyrid3bq2bn4cgkwzb74z"; depends=[clue]; }; seqDesign = derive2 { name="seqDesign"; version="1.2"; sha256="10p8ldj83mvhpcz1yas4xns5qh8zbs533na8nv87phngi8dsb76m"; depends=[survival]; }; seqHMM = derive2 { name="seqHMM"; version="1.0.13"; sha256="1kg0vjwbmapvrwh0cn2rfzsbkp8f2l0hlaw4qd5hxjij177h0whx"; depends=[gridBase igraph Matrix nloptr numDeriv Rcpp RcppArmadillo TraMineR]; }; @@ -12639,7 +12827,7 @@ in with self; { sergeant = derive2 { name="sergeant"; version="0.5.2"; sha256="02chkyvmwd4nimw62v82rfbid1xqw5b1335na44pdi675g904250"; depends=[DBI dbplyr dplyr htmltools httr jsonlite purrr readr scales]; }; serial = derive2 { name="serial"; version="2.1.4"; sha256="1wvs3aa9h1dff2jrxszqwrfv2b281zap1dj2mhlx2w4k8hnggas0"; depends=[]; }; seriation = derive2 { name="seriation"; version="1.2-7"; sha256="0dbz5b5msy4fr2whhphyriqk1xc6305zpjq59rrwxyz3d7rzwpa6"; depends=[cluster colorspace dendextend gclus gplots MASS qap registry TSP]; }; - serieslcb = derive2 { name="serieslcb"; version="0.3.0"; sha256="07z1ihdi1ng865fkg2mm593d6hl25nxaqfna5pwdppqvgx6hajqy"; depends=[gplots shiny]; }; + serieslcb = derive2 { name="serieslcb"; version="0.4.0"; sha256="1ip4k2xzg06hwsni62ai1whs1zzhwlf94507inpfpqz3jmmafrhq"; depends=[gplots shiny]; }; seroincidence = derive2 { name="seroincidence"; version="2.0.0"; sha256="0sam4y7w6prswz0izkm1a9v2k5rv7z22g1ajy15n9xix9aml5ms4"; depends=[]; }; serrsBayes = derive2 { name="serrsBayes"; version="0.4-0"; sha256="060zs1n5h9ns9dd004f69qmbwbbqla97bhbldm8narhm84f8pf6i"; depends=[Matrix Rcpp RcppEigen truncnorm]; }; servosphereR = derive2 { name="servosphereR"; version="0.1.1"; sha256="0m1fjd3f1s2ss54xmcrm3p0c33hhi2dj0vim790g4y0mw2aicc8l"; depends=[data_table dplyr magrittr purrr rlang]; }; @@ -12652,7 +12840,7 @@ in with self; { setter = derive2 { name="setter"; version="0.0-1"; sha256="10fwrx8yysp99rrkbnn3rbz79vyzr2h3p7zxxlqapw1k2lllp0r5"; depends=[assertive_base]; }; settings = derive2 { name="settings"; version="0.2.4"; sha256="092sv6nccm6p2d695l9w0zfi2xgymk12c8p8lhl9nb86mxrb3nry"; depends=[]; }; severity = derive2 { name="severity"; version="2.0"; sha256="1mp19y2pn7nl9m8xfljc515kk5dirv0r2kypazpmd956lcivziqq"; depends=[]; }; - sf = derive2 { name="sf"; version="0.7-4"; sha256="0vnyr7xyfcl928kbrb1k8l4fkd0cjrfq486g6gxpvy5j0cc2h4i1"; depends=[classInt DBI magrittr Rcpp units]; }; + sf = derive2 { name="sf"; version="0.7-7"; sha256="192hw52x1qlif8zyai1kff1wiyr3yl5f7jj1rk3k0nr8das0qy6i"; depends=[classInt DBI magrittr Rcpp units]; }; sfa = derive2 { name="sfa"; version="1.0-1"; sha256="1acqxgydf8j5csdkx0yf169x3yaa31r0ccdrqarh6vj1hacm89ad"; depends=[]; }; sfadv = derive2 { name="sfadv"; version="1.0.1"; sha256="1rfpm6km5pckwhqgpvidm6qsj5sjdaqqj5b0sgvpslivfa4c80cr"; depends=[gmm minpack_lm]; }; sfc = derive2 { name="sfc"; version="0.1.0"; sha256="0cm4mfcfd9bhf2j5fppsihzrfipnldb6q3xradd88z9pwgrkfx2a"; depends=[dplyr sna tidyr triangle zoo]; }; @@ -12662,39 +12850,41 @@ in with self; { sft = derive2 { name="sft"; version="2.2-1"; sha256="0fxz64ba58n6ghfqsgq64n1c7qkvi8c3lsa86732mil9w71yxw33"; depends=[fda SuppDists]; }; sgPLS = derive2 { name="sgPLS"; version="1.7"; sha256="1jk2j1zn5vq82rcjflnk7g6y2q0v5jl14k804dmigqg013gbykql"; depends=[mixOmics mvtnorm]; }; sgRSEA = derive2 { name="sgRSEA"; version="0.1"; sha256="0vyypnq81l36x0j44q2l9wbf3x4krz4fzypi7vyqhaq97mkzaw5j"; depends=[]; }; + sgd = derive2 { name="sgd"; version="1.1.1"; sha256="055khw3jr7kr8la3jpzq1q25gk0qcclkv7g0q1sylhyqq2qdriwb"; depends=[BH bigmemory ggplot2 MASS Rcpp RcppArmadillo]; }; sgee = derive2 { name="sgee"; version="0.6-0"; sha256="055iydainzywb1s5id5rl9i94dj5arr9b6qz15p8wps49vm2mlp3"; depends=[copula mvtnorm]; }; sgeostat = derive2 { name="sgeostat"; version="1.0-27"; sha256="1iq9p2jk8bpv1h853a1l91d5c5dxnhkk3cmkd01siqqvj04hv4vb"; depends=[]; }; sglOptim = derive2 { name="sglOptim"; version="1.3.8"; sha256="15bkkvgp9v9vsp65wps48g3c2fa0fj1025hbrziywq14j7wayyjr"; depends=[BH doParallel foreach Matrix Rcpp RcppArmadillo RcppProgress]; }; sglasso = derive2 { name="sglasso"; version="1.2.3"; sha256="1xf4jni7gybk66wp542p92jxrp4lf63ypbwsnb3av5db04bis7ll"; depends=[igraph Matrix]; }; - sglg = derive2 { name="sglg"; version="0.1.4"; sha256="1s7ygvlbal8iakhl7mkdnk0x914vvq53lnvjg5sy61zmh0gqwdj1"; depends=[AdequacyModel Formula robustloggamma ssym survival]; }; + sglg = derive2 { name="sglg"; version="0.1.5"; sha256="0b2lksn887h92y8l1gjmhm2pxzfn6kk0rjvyh9k2b1j4plkvp73b"; depends=[AdequacyModel Formula ggplot2 gridExtra moments robustloggamma ssym survival]; }; sglr = derive2 { name="sglr"; version="0.7"; sha256="11gjbvq51xq7xbmpziyzwqfzf4avyxj2wpiz0kp4vfdj3v7p4fp9"; depends=[ggplot2 shiny]; }; sgmcmc = derive2 { name="sgmcmc"; version="0.2.4"; sha256="1bivg3rw5c98355z4d596pwf4ciibbrmr3ay2ixj16dqd7g23j94"; depends=[reticulate tensorflow]; }; sgmodel = derive2 { name="sgmodel"; version="0.1.0"; sha256="03s9z7n7w3pys5dp1z5x91bszgv3q1sax5z591dz9rvmn5glp2lj"; depends=[ggplot2 ramify Rtauchen tidyverse]; }; sgof = derive2 { name="sgof"; version="2.3"; sha256="12bpyvg5df1m2ar6frpi10zlj3dk9h61r13rzn3w5a3nyk8gljsg"; 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="1.3.1"; sha256="0v0xp9l1zyq4iysmkrbdwk4r1rksjj8p5c1726yrcgyg55mj59nv"; depends=[]; }; + shades = derive2 { name="shades"; version="1.4.0"; sha256="1zg95sjhrfvbdlfc387g9p0vnb8nb6agdk1mb3wq3kwkm2da0bqj"; depends=[]; }; shadow = derive2 { name="shadow"; version="0.6.1"; sha256="1jlbjx2wcl3rdvidkp8cg33br9z87bic98s8dr74768cgc36hg4k"; depends=[plyr raster rgeos sp]; }; shadowtext = derive2 { name="shadowtext"; version="0.0.5"; sha256="1hnkn2pfbsz2ziymx4da34mqxsxa4av9f5ig2q9543227amxb0sk"; depends=[ggplot2 scales]; }; - shallot = derive2 { name="shallot"; version="0.4.5"; sha256="0r1zxpqqdfck7a9f868f9knr1ccnv8kf006milafjci57pvim1fg"; depends=[commonsMath rscala sdols]; }; + shallot = derive2 { name="shallot"; version="0.4.6"; sha256="0p8rbkjizgl9fvl480s53rcc5kwifirlghf5616rb295c512l4vk"; depends=[rscala sdols]; }; shape = derive2 { name="shape"; version="1.4.4"; sha256="0hadk3mapkhbh8xjkiz52vxdagmmgvm15xwpzb90ikw4giyipjzl"; 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.2.4"; sha256="1zqykhx8rz1k2ahi2lmmzll1c8k0as6vw4gbd3rpfb5fvpni3ni0"; depends=[MASS minpack_lm rgl scatterplot3d]; }; - shapper = derive2 { name="shapper"; version="0.1.0"; sha256="04ncsq29fbiki1s83gh2gla1a7qb8kh0gp5267in3fhh62297xwp"; depends=[ggplot2 reticulate]; }; - shar = derive2 { name="shar"; version="0.4"; sha256="0gjm8n3ifjnhzx21fhcg69dmy18wdq0kl1vh6s3jsjp4xkfill0i"; depends=[classInt raster Rcpp spatstat]; }; + shapper = derive2 { name="shapper"; version="0.1.2"; sha256="0z2ad0hk1gwxbr4kqbk26lzl25hrcifcp92i3am5j6y0ys71dwsx"; depends=[ggplot2 reticulate]; }; + shar = derive2 { name="shar"; version="0.5"; sha256="1vscs19ca5m8hiq280gra7cwwwk6yf4nlab02fd7czvxv6zhlyy1"; depends=[classInt raster Rcpp spatstat]; }; + sharpData = derive2 { name="sharpData"; version="1.1"; sha256="05gvbf2j3mfrinl4rr8cjrglr6hbjf5xgzyjh2v7j76i1ckkpz4h"; depends=[KernSmooth]; }; sharpeRratio = derive2 { name="sharpeRratio"; version="1.1"; sha256="0rgsad8idhjyjgwlzk358jlqkqf6sk7g6vl3fchkamjzxnhbb8p9"; depends=[ghyp Rcpp]; }; sharpr2 = derive2 { name="sharpr2"; version="1.1.1.0"; sha256="1r7anfr296l5sbhgry6rb15hlca6mpcm24qssdzz9bckavyfvqgi"; depends=[Matrix mvtnorm]; }; sharpshootR = derive2 { name="sharpshootR"; version="1.0"; sha256="1x9cava7b9lg8qpmjqlbkqmpc9a2dn8k4kl71s4himr4wzp9z4y3"; depends=[ape aqp circular cluster digest Hmisc igraph lattice latticeExtra plyr RColorBrewer reshape2 scales soilDB sp vegan]; }; sharx = derive2 { name="sharx"; version="1.0-5"; sha256="10sfjg6946jfk4051da0w1v89503av40wckqaabr12syf8kn0aw8"; depends=[dclone dcmle Formula]; }; - shazam = derive2 { name="shazam"; version="0.1.11"; sha256="0j6b7cbfvqz0xdcbyfx0abfklnv7yvjaalx2l3863m81qn877d65"; depends=[alakazam ape diptest doParallel dplyr foreach ggplot2 igraph iterators kedd KernSmooth lazyeval MASS progress scales SDMTools seqinr stringi tidyr]; }; + shazam = derive2 { name="shazam"; version="0.2.1"; sha256="1qqrjddkj29b7c9vgc2x4w6ya0gilgc983sqbgmm60ljl1ihl958"; depends=[alakazam ape diptest doParallel dplyr foreach ggplot2 igraph iterators kedd KernSmooth lazyeval MASS progress rlang scales SDMTools seqinr stringi tidyr]; }; shelltrace = derive2 { name="shelltrace"; version="3.5.1"; sha256="1xgbavaa26185i6q3907ds3bzq4xrw027x1sw5vsybqrxdz04jiz"; depends=[bmp tiff xlsx]; }; shiftR = derive2 { name="shiftR"; version="1.5"; sha256="18y2qzqx8hd6yph1wnsq4ygm16pcdszynh174xsrxrhvx2h9mi4x"; depends=[]; }; shiny = derive2 { name="shiny"; version="1.3.2"; sha256="0ky2w2f1lgak2q5a3ym44g0mlna7j8vw25g8yr2shv0rdjp53f18"; depends=[crayon digest htmltools httpuv jsonlite later mime promises R6 rlang sourcetools xtable]; }; shiny_i18n = derive2 { name="shiny.i18n"; version="0.1.0"; sha256="15llwr4yrx6rlk32b92wcq3dn360y5cvy4mh2aqkza9ikcvlhcvv"; depends=[jsonlite yaml]; }; shiny_router = derive2 { name="shiny.router"; version="0.1.1"; sha256="0biwni6bk39qafvsh8w32crlgm4hf8r9kwkmnlc3w5za2x2fja4c"; depends=[magrittr shiny]; }; shiny_semantic = derive2 { name="shiny.semantic"; version="0.2.1"; sha256="0m0f22qlmf7f2cf33myn72dm48yslqyx4kwzb96i78a3yz6a2awp"; depends=[htmltools htmlwidgets jsonlite magrittr purrr shiny]; }; - shinyAce = derive2 { name="shinyAce"; version="0.3.3"; sha256="02q6wqw349nlyf3mbf18cxif1xv9cal5qzccrdlnv73szqn9jk7j"; depends=[jsonlite shiny]; }; + shinyAce = derive2 { name="shinyAce"; version="0.4.0"; sha256="0hvih5g0pswlnz5rf3blx5yqw11ssxvm8w4klxddp1ap20ncbgl1"; depends=[jsonlite shiny]; }; shinyBS = derive2 { name="shinyBS"; version="0.61"; sha256="0rhim4mbp4x9vvm7xkmpl7mhb9qd1gr96cr4dv330v863ra2kgji"; depends=[htmltools shiny]; }; shinyDND = derive2 { name="shinyDND"; version="0.1.0"; sha256="0nkvz4hmjzmxlzj4vkjrdy8xlbxapg1amk180irgvwicqldi4jpm"; depends=[htmltools shiny]; }; shinyEffects = derive2 { name="shinyEffects"; version="0.1.0"; sha256="03fm2i1ydlp90w299nvz7dqs9724g0m2f0bc44ni8m2gz9cfpccs"; depends=[htmltools shiny shinydashboard]; }; @@ -12704,8 +12894,9 @@ in with self; { shinyHeatmaply = derive2 { name="shinyHeatmaply"; version="0.1.0"; sha256="1vl80vp7yslnh0dvcrpysfn5rndjavphy31y15546q7ax7d0fn6v"; depends=[dplyr DT heatmaply htmltools htmlwidgets jsonlite plotly RColorBrewer readxl shiny viridis xtable]; }; shinyKGode = derive2 { name="shinyKGode"; version="1.0.5"; sha256="004zwz4kqfijzvvwkq8v1gi25w1wrdlg8230g93w36gbi6cl2vk1"; depends=[ggplot2 gridExtra KGode mvtnorm pracma pspline reshape2 shiny shinyjs XML]; }; shinyLP = derive2 { name="shinyLP"; version="1.1.2"; sha256="1sjcll10ciq6pj9h8c6ybjqp8763wc423hddlalcblxxpajf6avz"; depends=[shiny]; }; + shinyML = derive2 { name="shinyML"; version="0.1.0"; sha256="17400crygl4zz7v6p8if4i3af3r1rz3sjc7281z6cyl82ba7a0wl"; depends=[data_table dplyr DT dygraphs ggplot2 h2o plotly shiny shinycssloaders shinydashboard shinyWidgets sparklyr tidyr]; }; shinyMatrix = derive2 { name="shinyMatrix"; version="0.1.0"; sha256="14933x96cchkbdy0pw555vva7d83z5qyyjxxpz3gm6qwiipr9r3q"; depends=[jsonlite shiny]; }; - shinyMolBio = derive2 { name="shinyMolBio"; version="0.1"; sha256="11plarwjap8853aq7dk8m3x1jv9mw95vwvci208f6s7dvc1448pv"; depends=[checkmate dplyr lazyeval plotly purrr RColorBrewer RDML shiny stringr whisker]; }; + shinyMolBio = derive2 { name="shinyMolBio"; version="0.2"; sha256="09lq5pvis450il1agcq5n9cilnq84rfv08w2dz1d0bbq1qgrgnvg"; depends=[checkmate dplyr plotly purrr RColorBrewer RDML shiny stringr whisker]; }; shinyRGL = derive2 { name="shinyRGL"; version="0.1.0"; sha256="07llg1yg5vmsp89jk60ly695zvxky6n06ar77mjxzlyc294akwmy"; depends=[rgl shiny]; }; shinyShortcut = derive2 { name="shinyShortcut"; version="0.1.0"; sha256="101wz9s4rk7fbaqgm0r2v3v8za20vdxwq4vhkz8xr7y5pr65sxiq"; depends=[]; }; shinyTime = derive2 { name="shinyTime"; version="1.0.0"; sha256="16gv01fbvnrn64kxf9kmard2cjjd99n3s37b1hp90ziqw479sgz4"; depends=[htmltools shiny]; }; @@ -12720,11 +12911,12 @@ in with self; { shinycustomloader = derive2 { name="shinycustomloader"; version="0.9.0"; sha256="1klx71vr26g0gjf6hbiia1qidqii5d467i1sdjvlrg1hxdcggqff"; depends=[glue shiny]; }; shinydashboard = derive2 { name="shinydashboard"; version="0.7.1"; sha256="0khac8b27q3swdw07kl609hm0fjfjsjv591b388q99mqqr2rk92i"; depends=[htmltools promises shiny]; }; shinydashboardPlus = derive2 { name="shinydashboardPlus"; version="0.7.0"; sha256="0hxg9gxravalfbrh05jixk9pz1qsq92pspysgx0vn2smgvp7rzlb"; depends=[htmltools shiny shinydashboard]; }; + shinyglide = derive2 { name="shinyglide"; version="0.1.1"; sha256="1jl48s4pl0f69j3gg9y1zpxnx0l4p6f4czjr27g6cs9y780z3r96"; depends=[htmltools shiny]; }; shinyhelper = derive2 { name="shinyhelper"; version="0.3.1"; sha256="1z3wb3vdpz9pcn6rfmpbxky05cf8bxldhpwzldrmhn03spz3n987"; depends=[markdown shiny]; }; shinyhttr = derive2 { name="shinyhttr"; version="1.0.0"; sha256="1l02g0qgvycwpfr6wl7svnms128fhlzbn9p7i4mr7ghgsd5qr58a"; depends=[shinyWidgets]; }; shinyjqui = derive2 { name="shinyjqui"; version="0.3.2"; sha256="1a73vsq1wc3xf14y64hkgnk5jgxj98b8aj3g0fs7mgayar3an5g0"; depends=[htmltools htmlwidgets jsonlite shiny]; }; shinyjs = derive2 { name="shinyjs"; version="1.0"; sha256="113zpijri0l80rlgrvqn6bxk0sdqgl79h7yhja2p76f9dc9i2sr8"; depends=[digest htmltools jsonlite shiny]; }; - shinylogs = derive2 { name="shinylogs"; version="0.1.5"; sha256="0989d78q9dbpl95v08hxlgm21yh5c15aazdxhyv9db8l42w4cvvy"; depends=[anytime bit64 data_table DBI digest htmltools jsonlite nanotime RSQLite shiny]; }; + shinylogs = derive2 { name="shinylogs"; version="0.1.6"; sha256="0lk69snnazns2883szw0ihlyr6gdihqs28fj92qm9vdn6awjxy9d"; depends=[anytime bit64 data_table DBI digest htmltools jsonlite nanotime RSQLite shiny]; }; shinymanager = derive2 { name="shinymanager"; version="1.0"; sha256="0hg92ij4ixn4xp0fqhpvyfxvnpyzyr88ymzxxk7n55hr50l8vbqi"; depends=[billboarder DBI DT htmltools openssl R_utils R6 RSQLite shiny]; }; shinymaterial = derive2 { name="shinymaterial"; version="0.5.5"; sha256="0wbi2ccnxjyq4y5xijvn0a38sv56s9cab0c8k86cv5gapyzdzs7x"; depends=[jsonlite shiny]; }; shinyrecap = derive2 { name="shinyrecap"; version="0.1.0"; sha256="1mic7azxz2in67g3a2ir550w8psh6kc75p6hja6m62a0yy7j2n92"; depends=[CARE1 coda conting dga future ggplot2 ipc LCMCR promises Rcapture reshape shiny shinycssloaders testthat]; }; @@ -12734,19 +12926,18 @@ in with self; { shinytoastr = derive2 { name="shinytoastr"; version="2.1.1"; sha256="01j2z4gf1wxblrjayykwxdr2s8394i7k930x8g4hmrj7c9pv264n"; depends=[shiny]; }; shipunov = derive2 { name="shipunov"; version="1.2"; sha256="020xfdq5k6fw0nisskh7lysj5xrmf4b7n7vajwr6273hx6m08bbi"; depends=[]; }; 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.7.4"; sha256="1x2ar8ybb972nd146gqz57hxybxc1myx862wbb743rpa70c7iawc"; depends=[boot coin CompQuadForm KernSmooth robustbase]; }; + shopifyr = derive2 { name="shopifyr"; version="1.0.0"; sha256="05hih1v5vvr7vmwarizsdx8517g74s96fdsz3klcz3g12idx1nqn"; depends=[curl jsonlite R6]; }; + shotGroups = derive2 { name="shotGroups"; version="0.7.5.1"; sha256="0il6hlv2hnfx5rmj3vk3q9p24xqii77z6hdz5fsgyh4i3kgcyrjy"; depends=[boot coin CompQuadForm KernSmooth robustbase]; }; showimage = derive2 { name="showimage"; version="1.0.0"; sha256="1c0x3iqjdjsz3cdhc02b3qm2pwxjr1q2k87jwvxj9lnzzw81f1pl"; depends=[png]; }; showtext = derive2 { name="showtext"; version="0.7"; sha256="1ihgqzfia36b0n9aa41p1w98wxxvs1lxh1zz0570hbfqmph1sk73"; depends=[showtextdb sysfonts]; }; showtextdb = derive2 { name="showtextdb"; version="2.0"; sha256="1qwwj9x2jvadvwn60h75k99c9xi7yhqjsgaakahz5paxgj583bsh"; depends=[sysfonts]; }; shp2graph = derive2 { name="shp2graph"; version="0-5"; sha256="1l9mg98hkb0bvr5dzd2p26g8mw5hqjxrym2gmbm10kyapvccfk56"; depends=[igraph maptools sp]; }; shrink = derive2 { name="shrink"; version="1.2.1"; sha256="0pd967wsys8fd7gyvr9y08km118yamfk5c1a1i2k8nr2ifpqmy0w"; depends=[MASS mfp rms survival]; }; - shrinkTVP = derive2 { name="shrinkTVP"; version="1.0.0"; sha256="09bcpzclb41hslkcx8j7gnmny2gz6gvxvjxpsclk9b7raqvwsg8z"; depends=[coda GIGrvg Rcpp RcppArmadillo RcppProgress stochvol]; }; + shrinkTVP = derive2 { name="shrinkTVP"; version="1.0.1"; sha256="1nf6lpl38jyrd4mnfx2gk4wfpccw2mjy9ajlsy0rwnd9dk81wx4n"; depends=[coda GIGrvg Rcpp RcppArmadillo RcppProgress stochvol]; }; shuffle = derive2 { name="shuffle"; version="1.0.1"; sha256="0aqb11h340picx7z2jg3k46l3pr6fkknlpyzc0z89hhrc90pss48"; depends=[]; }; shuffleCI = derive2 { name="shuffleCI"; version="0.1.0"; sha256="1n9k28m1fcnw1my9a7v0gy9waygd48lab45vj9k2wwijbc325zai"; depends=[plotrix]; }; shutterstock = derive2 { name="shutterstock"; version="0.1.0"; sha256="1vqbrjbwl2gdcf607f51cdzkjbkmk11n08mzx01j7bwcd278ny8r"; depends=[httr jsonlite]; }; siar = derive2 { name="siar"; version="4.2"; sha256="1c4z72jr81dzkp9xqyrrkwjsalvvksl67pnbaadkc52v84fhzx3r"; depends=[bayesm coda hdrcde MASS mnormt spatstat]; }; - sicegar = derive2 { name="sicegar"; version="0.2.2"; sha256="0fnr0wv8zbhs2i5y1kqyvhm0kzisc68ys3iy0wxwbdj3bnfgzj70"; depends=[dplyr fBasics ggplot2 minpack_lm]; }; sideChannelAttack = derive2 { name="sideChannelAttack"; version="1.0-6"; sha256="1xcsy1h8gc8a4f9nzs7zv8x6v55g1pg8vy1kg64iqxm0gnz2f20l"; depends=[ade4 corpcor infotheo MASS mmap]; }; sidier = derive2 { name="sidier"; version="4.0.3"; sha256="0pfzx0a5f597iqigq9xidm9b9xv18zaiqa35yp4xlk1y7gv0nj6c"; depends=[ape ggmap ggplot2 gridBase igraph network]; }; sidrar = derive2 { name="sidrar"; version="0.2.4"; sha256="1zwxafc4xaa4386a9jdg3gwflpdxql3f33bkqx1l2yl30x3517rw"; depends=[dplyr magrittr RCurl rjson rvest stringr tidyr xml2]; }; @@ -12764,10 +12955,11 @@ in with self; { signalHsmm = derive2 { name="signalHsmm"; version="1.5"; sha256="1d4v6cbvcbi8pb5zmn58s01h3jb0kv7yr7qvcnx4p2v82knvhik7"; depends=[Rcpp seqinr shiny]; }; signmedian_test = derive2 { name="signmedian.test"; version="1.5.1"; sha256="05n7a4h2bibv2r64cqschzhjnm204m2lm1yrwxvx17cwdp847hkm"; depends=[]; }; sigora = derive2 { name="sigora"; version="3.0.1"; sha256="1pz9jibxjvvbc0wmd7sj2fss6hd8h1fvcg8vg72qwqvfy3f9jdry"; depends=[]; }; - sigr = derive2 { name="sigr"; version="1.0.5"; sha256="0i7nah32x0llbkkfcdv355507vc8w0dw3kl2hz37xj3fxcpz9218"; depends=[wrapr]; }; + sigr = derive2 { name="sigr"; version="1.0.6"; sha256="01crx8r9bcq1kwlq66vypnv1r48fp3hbl06ykd8g2k5zm06w0yyi"; depends=[wrapr]; }; siland = derive2 { name="siland"; version="1.2"; sha256="1njn5a4gr4rpf8xwbfvxiyg7h64pfzxijakn9sbhb1agspn5z1zz"; depends=[ggforce ggplot2 lme4 raster rgdal sp]; }; sim1000G = derive2 { name="sim1000G"; version="1.40"; sha256="1avq6xfc34izavvp9vb5ccc2b9nc4m7cwr06ygnsmpgwi5nswbb8"; depends=[hapsim MASS readr stringr]; }; simEd = derive2 { name="simEd"; version="1.0.3"; sha256="1yq0qblrz0zddx682rzwdaa0k0r223i123la7wbp73spnn38g4br"; depends=[rstream]; }; + simExam = derive2 { name="simExam"; version="1.0.0"; sha256="10p3y67cli5is2gj23cjy8y7zpbnn2jbxmfiq01ls0hc1jind82w"; depends=[Matrix msm]; }; simFrame = derive2 { name="simFrame"; version="0.5.3"; sha256="154d4k6x074ib813dp42l5l8v81x9bq2c8q0p5mwm63pj0rgf5f3"; depends=[lattice Rcpp]; }; simIReff = derive2 { name="simIReff"; version="1.0"; sha256="0yi43splda8chnh4bq5x6chbrl5c0y9sv1k2m31763da0czayall"; depends=[bde extraDistr ks MASS np rvinecopulib truncnorm]; }; simLife = derive2 { name="simLife"; version="0.5.2"; sha256="1dhrjszfgxr0j4dkc2bwykyj515ji5rkb572nmnyjgkyi652j01v"; depends=[splancs]; }; @@ -12775,7 +12967,7 @@ in with self; { simMSM = derive2 { name="simMSM"; version="1.1.41"; sha256="04icijrdc269b4hwbdl3qz2lyxcxx6z63y2wbak1884spn6bzbs8"; depends=[mvna survival]; }; simPATHy = derive2 { name="simPATHy"; version="0.2"; sha256="0ai5wmjz8k0glbwkclgg3m3ncsjghja4iys2mn1psn3r8gxk79yc"; depends=[ggm graph gRbase htmlwidgets igraph mvtnorm qpgraph R_utils shiny shinydashboard]; }; simPH = derive2 { name="simPH"; version="1.3.10"; sha256="0br32m28ynmhr4xal69bsv925rlmih898rk5bskn1s6bhsshalqq"; depends=[data_table dplyr ggplot2 gridExtra lazyeval MASS mgcv quadprog stringr survival]; }; - simPop = derive2 { name="simPop"; version="1.1.1"; sha256="10dsr1rbglv5kwm5q05dxv4396wxwzhlf0851ynndlcbyxl8rvc0"; depends=[colorspace data_table doParallel e1071 EnvStats fitdistrplus foreach laeken lattice MASS nnet party plyr ranger Rcpp RcppArmadillo vcd VIM wrswoR]; }; + simPop = derive2 { name="simPop"; version="1.2.0"; sha256="05f1azdz202bap4pkqxiacj7wqkbmw3naw6p7xgmvx8nlh5xl40h"; depends=[colorspace data_table doParallel e1071 EnvStats fitdistrplus foreach laeken lattice MASS nnet party plyr ranger Rcpp RcppArmadillo vcd VIM wrswoR]; }; simSummary = derive2 { name="simSummary"; version="0.1.0"; sha256="1ay2aq6ajf1rf6d0ag3qghxpwj0f8b3fhpr2k0imzmpbyag1i3gj"; depends=[abind gdata svUnit]; }; simTool = derive2 { name="simTool"; version="1.1.3"; sha256="1vjl2hf6nw108vidbrc6hxsl6qdkr56ahldavx2s9klkqg2kmhwr"; depends=[dplyr plyr purrr reshape tibble tidyr]; }; simba = derive2 { name="simba"; version="0.3-5"; sha256="14kqxqavacckl5s1518iiwzrmlgbxz1lxy33y8c9qq7xaln41g9h"; depends=[vegan]; }; @@ -12783,17 +12975,17 @@ in with self; { simcausal = derive2 { name="simcausal"; version="0.5.5"; sha256="0k1dbg10bmpxc37nq9vk849qsdi09whc8r85rj08pbcfaac8cgfv"; depends=[assertthat data_table igraph Matrix R6 stringr]; }; simcdm = derive2 { name="simcdm"; version="0.1.1"; sha256="1qzxxpz3nvqf9801k6zgphv6vd8alf2sf6cvzggk7cz6x5jc3w1r"; depends=[Rcpp RcppArmadillo]; }; simctest = derive2 { name="simctest"; version="2.5"; sha256="038ipxww0n09sh8al5isbm1fikr8kazwxn9cj2d0wgm6cdpy681n"; depends=[]; }; - simdistr = derive2 { name="simdistr"; version="1.0.0"; sha256="0r7qfrq4vcjqrzajc6xmn0rrkinqwbr8cqghgp4iklbhsjbk2xfl"; depends=[]; }; - simecol = derive2 { name="simecol"; version="0.8-12"; sha256="06zw9xhj8jwhmqwxxbj8hgz9cxrw1b4syy6z79aawv9cg1bnwfhf"; depends=[deSolve minqa]; }; + simdistr = derive2 { name="simdistr"; version="1.0.1"; sha256="16fsj42zr627i57q1q72l1nhin7g6rxq9hfy487hf1ywd6rvns18"; depends=[]; }; + simecol = derive2 { name="simecol"; version="0.8-13"; sha256="0641qh5ih1mkbdr0a5qg9i280qkzdvdjyzw56awlv66zqbjqvqq8"; depends=[deSolve minqa]; }; simest = derive2 { name="simest"; version="0.4"; sha256="1wp08dkbshn5parq69d7iizp4g16qzpdim37kcg09pgsc3aghwaj"; depends=[cobs nnls]; }; - simex = derive2 { name="simex"; version="1.7"; sha256="0dmyxhg3bk23y08xbgwlg791pcl3131im3jkh9x5pjqczfjvim0a"; depends=[]; }; + simex = derive2 { name="simex"; version="1.8"; sha256="1849wayygyqv0fh1i2qva7ggh2yah2nn0sgbcy9pldxrjq8q9iw0"; depends=[]; }; simexaft = derive2 { name="simexaft"; version="1.0.7.1"; sha256="0n3n2g07pnpcqhbrjf78lbvqvc136g7jxlx6q27vnk96kwizh3f1"; depends=[mvtnorm survival]; }; simglm = derive2 { name="simglm"; version="0.7.4"; sha256="0lgzbcfqqw94jib6vxl2cv8xcnjjikvdy8qlhq874g0h8spg0l5i"; depends=[broom dplyr future_apply Matrix purrr rlang]; }; - simmer = derive2 { name="simmer"; version="4.2.2"; sha256="0anzg70cqaixd32j14ry028hxhkazzj6k3pb9v9j2jpd4wlizdyp"; depends=[BH codetools magrittr R6 Rcpp]; }; + simmer = derive2 { name="simmer"; version="4.3.0"; sha256="1j7mpgi0sicc673rma3h40n651bdy03dmyjvs7ry8y7d10lj01ls"; depends=[BH codetools magrittr Rcpp]; }; simmer_bricks = derive2 { name="simmer.bricks"; version="0.2.1"; sha256="1s73mfmpjz91n932kjk50aai5j3p1sjibq73yxrjdhlyhiy4d8lp"; depends=[simmer]; }; simmer_plot = derive2 { name="simmer.plot"; version="0.1.15"; sha256="0g13d6qw6cl7bzmpkckiswvg9n4mrrdbs195r3pyljaw5c5bmvhp"; depends=[DiagrammeR dplyr ggplot2 scales simmer tidyr]; }; simml = derive2 { name="simml"; version="0.1.0"; sha256="0j3vv3kp8rl4an6r0vzzn6syzi9h058v9040pshz0hldkhi21pby"; depends=[mgcv plyr]; }; - simmr = derive2 { name="simmr"; version="0.4.0"; sha256="0i5gzzd5wwxjq1dblmrsv20c0hy1px43lpv8qf5zapnmzjwx07an"; depends=[bayesplot boot coda compositions ggplot2 MASS R2jags reshape2 viridis]; }; + simmr = derive2 { name="simmr"; version="0.4.1"; sha256="0903fh8vhl7r9cspanzkrn23kq68dkxhn01bjhyhf3c8wc9zfdy5"; depends=[bayesplot boot compositions ggplot2 MASS R2jags reshape2 viridis]; }; simode = derive2 { name="simode"; version="1.1.4"; sha256="04ld7mf2xi3s7jrcs1w9wqbbnrjjb0kbzn8bn58ma2kxxb4cygq0"; depends=[deSolve pracma quadprog]; }; simone = derive2 { name="simone"; version="1.0-4"; sha256="09d8kdg2wxpmjgcn4dk6yqr6nmf7mzqqi6x1rz3fv7qknja6l1xi"; depends=[blockmodels]; }; simpleCache = derive2 { name="simpleCache"; version="0.4.1"; sha256="1prhahphyb4dg9qv813ahpwfngmr9blirb97pvypc5npzvahj5lv"; depends=[]; }; @@ -12812,6 +13004,7 @@ in with self; { simstudy = derive2 { name="simstudy"; version="0.1.13"; sha256="06lf8srcz5i5glz09sjg61v1a5blr6iv1s4v24syl28pf6f627i8"; depends=[data_table mvnfast mvtnorm Rcpp]; }; simsurv = derive2 { name="simsurv"; version="0.2.3"; sha256="0jlacjgrnnlmcl6k83clfkdfb1kr2xbyz2zcmq1f3xg2z0zwypjq"; depends=[]; }; simtimer = derive2 { name="simtimer"; version="4.0.0"; sha256="1c5017xmh4767d75k4rs1pssyn7p5w41bcsjjmwk4c9g6w1jgx1w"; depends=[]; }; + simts = derive2 { name="simts"; version="0.1.1"; sha256="1b76grf7c14pgyhphplnil4lkzbwn3dih4pv4xdy721ih9n9llby"; depends=[broom dplyr magrittr purrr Rcpp RcppArmadillo robcor scales tidyr]; }; simukde = derive2 { name="simukde"; version="1.1.0"; sha256="0g4qb57q1g9ixl70zwiw8y934gcr421xmz4dl515lxzfzk0605fc"; depends=[ks MASS mvtnorm]; }; simulator = derive2 { name="simulator"; version="0.2.0"; sha256="18x0c9bf9anbykq9f46fxnnx7g36bh01s4cdmrn7mdygs6ac9c8z"; depends=[magrittr]; }; simule = derive2 { name="simule"; version="1.3.0"; sha256="0jzyk1r2jfs7qivmy9x44c5bagy55jpy3hf0xpl9xnk409c3y2wd"; depends=[igraph lpSolve pcaPP]; }; @@ -12819,20 +13012,21 @@ in with self; { sindyr = derive2 { name="sindyr"; version="0.2.1"; sha256="0977qb9f2247y6bzlsp9lqfbmncq2prqr57myrgd6f60jc09n3mj"; depends=[arrangements crqa igraph matrixStats pracma]; }; sinew = derive2 { name="sinew"; version="0.3.8"; sha256="1ggx7wgmgnsv69nnc55mg9g7rzjv5m23sygz7x8q68pybmjr7fc1"; depends=[cli crayon miniUI rematch2 rstudioapi shiny sos stringi yaml]; }; sinib = derive2 { name="sinib"; version="1.0.0"; sha256="08x2a5hn41vcsai3r36w1kgzka4ks53pkp6dxn90bsqh40ydb0db"; depends=[]; }; + sinx = derive2 { name="sinx"; version="0.0.12"; sha256="0hv54n6pc8qdxl1kmwbrnnmgmd8mz6fzlplz9nr7iws1y1v0ckf5"; depends=[bookdownplus clipr cowsay crayon jsonlite multicolor pagedown rmsfact rosr xaringan]; }; siplab = derive2 { name="siplab"; version="1.4"; sha256="1kayskawq9dqwwmk17akl68xw9kwllkmh4i251gdqkfcz61j3bb4"; depends=[spatstat]; }; sirad = derive2 { name="sirad"; version="2.3-3"; sha256="0vhmk2fmq4797gj6c8803zw1ipmdxfvdfgi2bygzxbn5bqd4da2n"; depends=[raster zoo]; }; - sirt = derive2 { name="sirt"; version="3.5-53"; sha256="1wcc0p2d0d1x6fp9kqr3khsfdz1jqff87rff580nvyf6pfzwqfrd"; depends=[CDM pbv Rcpp RcppArmadillo TAM]; }; + sirt = derive2 { name="sirt"; version="3.6-21"; sha256="0khjjps3q1gdanszmgzi30yrk5qcwi2fxf8jq71raj77hfvgd2s8"; depends=[CDM pbv Rcpp RcppArmadillo TAM]; }; sisVIVE = derive2 { name="sisVIVE"; version="1.4"; sha256="1vh53irxgk8ahw52cdqbbm89dvmzyf54izg4lm8a3v92k5p6nzwz"; depends=[lars]; }; sisal = derive2 { name="sisal"; version="0.46"; sha256="00szc3l69i0cksxmd0lyrs4p6plf05sl4vxs3nl4gkbja5y4lvpc"; depends=[boot digest lattice mgcv R_matlab R_methodsS3]; }; - sismonr = derive2 { name="sismonr"; version="1.1.2"; sha256="0ak5j4myr2jxb5k0vg7rqp938dmlkkxpbs266m1bapnm72w8wsri"; depends=[dplyr ggplot2 ggpubr igraph jsonlite magrittr rlang scales stringr tictoc tidyr truncnorm XR XRJulia]; }; + sismonr = derive2 { name="sismonr"; version="1.1.4"; sha256="0dimah8lzscg9bx5vd3ll32zyp74va7a4nk9j9k5nzzyg06rs3l4"; depends=[dplyr ggplot2 ggpubr igraph jsonlite magrittr rlang scales stringr tictoc tidyr truncnorm XR XRJulia]; }; sitar = derive2 { name="sitar"; version="1.1.1"; sha256="1klnfp54sq0jgsyaha6k4i5fv313icjmri5khfsdg1q1zzqxw1f8"; depends=[dplyr glue nlme purrr quantreg rlang rsample tibble tidyr]; }; sitmo = derive2 { name="sitmo"; version="2.0.1"; sha256="0apdhwy3kxs39agsbvx5vn3xsgb22bf3jrwmr2cmqk9kmxbx740c"; depends=[Rcpp]; }; sitools = derive2 { name="sitools"; version="1.4"; sha256="0c0qnvsv06g6v7hxad96fkp9j641v8472mbphvaxa60k3xc7ackb"; depends=[]; }; - sitree = derive2 { name="sitree"; version="0.1-6"; sha256="0plarfxa1gxggq88z1w2sbw6ixk49fz6i1zvdcbaa0va0ifc1gcm"; depends=[data_table lattice latticeExtra]; }; - sitreeE = derive2 { name="sitreeE"; version="0.0-3"; sha256="1rj2gr9qyhd366iy7d4p1y42rcy6swhykdh33ynawdsggmmvmxbf"; depends=[data_table sitree]; }; + sitree = derive2 { name="sitree"; version="0.1-7"; sha256="08yamivn2vxgrizh5gvvr9cn3cn1657r0p2nrkwbqljqrhmzi7qd"; depends=[data_table lattice latticeExtra]; }; + sitreeE = derive2 { name="sitreeE"; version="0.0-5"; sha256="16m8w0rxb40pimzd06znqskz74jk4rrki4gjy8nk24r1zih2cjq1"; depends=[data_table sitree]; }; sivipm = derive2 { name="sivipm"; version="1.1-4.2"; sha256="0y1wpzvndbyyzf063mzisqdk9ndj29ygiipmmz7i4xdpwidv21p6"; depends=[seqinr]; }; - sizeMat = derive2 { name="sizeMat"; version="1.0.0"; sha256="05dw4hgpw5msgy5cabf5dixr6ma66i9wz9wlajihqkpbg134jz1k"; depends=[MASS matrixStats mcmc MCMCpack]; }; - sjPlot = derive2 { name="sjPlot"; version="2.6.3"; sha256="0h1mkmp5mrkbf7y3zh6m4cnm737cpg1m5si0lrmal7j2ixqicwjy"; depends=[bayestestR broom dplyr forcats ggeffects ggplot2 glmmTMB insight knitr lme4 magrittr MASS modelr nlme performance psych purrr rlang scales sjlabelled sjmisc sjstats tidyr]; }; + sizeMat = derive2 { name="sizeMat"; version="1.1.0"; sha256="1pxb99gd0zfrpbq2ndmhciv2bc8xdfgm0q1y771f6ji5665qxgfw"; depends=[MASS matrixStats MCMCpack]; }; + sjPlot = derive2 { name="sjPlot"; version="2.7.0"; sha256="1m0gy991fmxvqry91kkzdkdapyalhrwql25d0hg2a2naxgfw4zpk"; depends=[bayestestR broom dplyr forcats ggeffects ggplot2 ggrepel glmmTMB insight knitr lme4 magrittr MASS modelr nlme performance psych purrr rlang scales sjlabelled sjmisc sjstats tidyr]; }; sjdbc = derive2 { name="sjdbc"; version="1.6.0"; sha256="17ncgj2s2pjn3w3c1dgxv8g7y17h4p78iic86gsj2ahn0xpsmkcc"; depends=[rJava]; }; sjlabelled = derive2 { name="sjlabelled"; version="1.1.0"; sha256="0rnmlwpp41h04dzfjd5ncvzjzs43slaimb4v2in1axznv3haafyc"; depends=[haven insight magrittr purrr rlang tidyselect]; }; sjmisc = derive2 { name="sjmisc"; version="2.8.1"; sha256="1a30n3cyd9h9ilaiai9ywy53f03nikafc47rvpws2c2vghc8mbn7"; depends=[dplyr insight magrittr purrr rlang sjlabelled]; }; @@ -12855,12 +13049,13 @@ in with self; { sleekts = derive2 { name="sleekts"; version="1.0.2"; sha256="0syk244xrsv8hz5sxm7wizk0kyn1nc6z4c63c8xn57fz130zj75k"; depends=[]; }; sleepr = derive2 { name="sleepr"; version="0.3.0"; sha256="1ka4pl6a09d1qga5svcirc5ywmzz9pcml09053745lz3p1v8fnn3"; depends=[behavr data_table]; }; sleepwalk = derive2 { name="sleepwalk"; version="0.1.0"; sha256="1vfvpxzq16dmh6qrh7kwbndyfnr209frdz5hck3ry4gfz9rqzm5f"; depends=[cowplot ggplot2 httpuv jrc jsonlite scales]; }; - slfm = derive2 { name="slfm"; version="0.2.3"; sha256="04prsliiqbv5qx2lp9wf1h5hdjj6s6iaqpli7lpf74sfzxw773vw"; depends=[coda lattice Rcpp RcppArmadillo]; }; + slfm = derive2 { name="slfm"; version="1.0.0"; sha256="1q4hm1lp498fqcnwr59agg08l1rh5gd8jqrjgkk4mh89zp3x5vaw"; depends=[coda lattice Rcpp RcppArmadillo]; }; slickR = derive2 { name="slickR"; version="0.2.4"; sha256="14y4rwa450xqw6prdgp2l7xs9vv6zqbxwg7hc3hjgq47jy8qsdm1"; depends=[base64enc htmltools htmlwidgets xml2]; }; slideview = derive2 { name="slideview"; version="0.1.0"; sha256="0zq5s6qdxn6ri88pp0wf2kg2k4byrrsfvwh0ai892p4szqbc3w4v"; depends=[htmltools htmlwidgets lattice raster viridisLite]; }; slim = derive2 { name="slim"; version="0.1.1"; sha256="0x9bk6w6lmw15s85gw9g8d1wlb57kkvnmx1wsyasn93x9llkjva1"; depends=[data_table MASS]; }; slimrec = derive2 { name="slimrec"; version="0.1.0"; sha256="1qzcvk7z8y11hwmybvppk1gf8di596zxy7qs22fclp6h6y18s377"; depends=[assertthat bigmemory glmnet Matrix pbapply]; }; slippymath = derive2 { name="slippymath"; version="0.3.1"; sha256="0dqnv089mcfxvpsc1px7mblim6m77n59xpcysz75jrvpc5q4lsrg"; depends=[png purrr raster]; }; + slm = derive2 { name="slm"; version="1.0.0"; sha256="06r04kamg9y491q9wl4cvnvl301y7a47l70sl25vzi2q7y3bcf8y"; depends=[capushe ltsa]; }; sloop = derive2 { name="sloop"; version="1.0.1"; sha256="00fk5fr5zsk2qxc1kfhmshhjxgnamm3401089sx8m2l529zd6r8j"; depends=[codetools crayon purrr rlang tibble]; }; slouch = derive2 { name="slouch"; version="2.1.2"; sha256="0xf2saf4q0ywmng3avl6hjd2wjjzfpbwlnagggvs8ri41jyk7gma"; depends=[ape memoise]; }; slowraker = derive2 { name="slowraker"; version="0.1.1"; sha256="0glc3ldvbqkvzfvhs4s5mzx1kfz05px4k7rx5jfp9dm9d0gfpvsx"; depends=[NLP openNLP SnowballC]; }; @@ -12885,13 +13080,13 @@ in with self; { smdc = derive2 { name="smdc"; version="0.0.2"; sha256="1j6xnzjbmmakbmk3lyjck3bsy8w8hyd9d8h04s4gbddhci283mqm"; depends=[proxy tm]; }; smds = derive2 { name="smds"; version="1.0"; sha256="0aqf3wfn6mlsl8a32gaf9qdpyxwsx19g6mma8qzgaysdmk6vhbpd"; depends=[MASS]; }; sme = derive2 { name="sme"; version="1.0.2"; sha256="0gszpy1sx2qsypps3iza79sab475wcrscl7wnbbrv97a3ry0ybp6"; depends=[lattice]; }; - smerc = derive2 { name="smerc"; version="0.4.5"; sha256="1455fjfihznzivz80jad7pyfjms8yyvmsz6wqdvqv3n6dsyr8fvb"; depends=[fields maps matrixStats smacpod sp SpatialTools spdep]; }; + smerc = derive2 { name="smerc"; version="1.0.1"; sha256="0gxqz5v33w428sqalhzx7nrjjkn3sqpx3jk5a7i9g0786m3y9azj"; depends=[maps matrixStats pbapply randtoolbox smacpod sp]; }; smfsb = derive2 { name="smfsb"; version="1.3"; sha256="1328w7zpwd3nam6ha4bh14g919jjl87v323ijmbp1j71gc64nn2i"; depends=[abind]; }; smicd = derive2 { name="smicd"; version="1.0.3"; sha256="0z7j14ijyccy6m4mnh3xn1m4pppmm8apbgm5x3cdpfiwfksw3j37"; depends=[formula_tools ineq laeken lme4 MuMIn mvtnorm spatstat truncnorm weights]; }; smirnov = derive2 { name="smirnov"; version="1.0-1"; sha256="09mpb45wj8rfi6n6822h4c335xp2pl0xsyxgin1bkfw97yjcvrgk"; depends=[]; }; smnet = derive2 { name="smnet"; version="2.1.1"; sha256="0fa47zgm7jxvs3jfai54wsc6qa9ycqw4f3yr941fvkczwzh4ch02"; depends=[DBI RSQLite spam SSN]; }; smoof = derive2 { name="smoof"; version="1.5.1"; sha256="01jkldmxn86vmcmmz81mdlhpm1m3bddj4sv550a3b4wm1r3gddng"; depends=[BBmisc checkmate ggplot2 mco ParamHelpers plot3D plotly RColorBrewer Rcpp RcppArmadillo RJSONIO]; }; - smooth = derive2 { name="smooth"; version="2.5.1"; sha256="1vrdkvr7svf6scknh5v2n0y401d0gf7s1ii8rwfs3bhcp3gxpbfw"; depends=[forecast greybox nloptr Rcpp RcppArmadillo zoo]; }; + smooth = derive2 { name="smooth"; version="2.5.2"; sha256="08ifnvldjcpnwpmkkg9r6dr2p8k1i1jihjz1g3qdb34axf08jql1"; depends=[forecast greybox nloptr Rcpp RcppArmadillo zoo]; }; smoothAPC = derive2 { name="smoothAPC"; version="0.3"; sha256="11f34qqdm8m0hmy9jf29q439slchvmqgdfrmak7vcdhfnjcylr5r"; depends=[colorspace lmtest quantreg rgl SparseM]; }; smoothHR = derive2 { name="smoothHR"; version="1.0.2"; sha256="0l33xg3p9pyfrp4rhavz8m1jakk4wr8i14g6jjiizb03rpxdpzqy"; depends=[survival]; }; smoothROCtime = derive2 { name="smoothROCtime"; version="0.1.0"; sha256="03iihjxb5xdaf74cm9cajqqjli754mdmv5v1y4hla9vv23017ca1"; depends=[ks]; }; @@ -12909,6 +13104,7 @@ in with self; { smurf = derive2 { name="smurf"; version="1.0.1"; sha256="1jp0dziqpiffj08kkm28bg4jzsijs30xlz237q8xdxdrf64igvik"; depends=[catdata glmnet MASS Matrix mgcv RColorBrewer Rcpp RcppArmadillo speedglm]; }; sn = derive2 { name="sn"; version="1.5-4"; sha256="0x46gxkplxbnhaqbpiav1r4xlv4ib7n57kxmca7scqwj22y7wrs6"; depends=[mnormt numDeriv]; }; sna = derive2 { name="sna"; version="2.4"; sha256="1ks8819qvpdfansfqj9p32s1rhvl26frvbi78m4rx1wd1qcv74i2"; depends=[network statnet_common]; }; + snahelper = derive2 { name="snahelper"; version="0.3.0"; sha256="036pwzs4x1qgb4bsn39afv1c34fxky259vl0zbac6l12wmysnpqv"; depends=[colourpicker DT formatR ggplot2 ggraph graphlayouts igraph miniUI rstudioapi shiny]; }; snakecase = derive2 { name="snakecase"; version="0.11.0"; sha256="1ky1x2cp5rd0ffd9m1fji9sq4z4jsrpxzg30brw8bb4ihfjj114r"; depends=[stringi stringr]; }; snappier = derive2 { name="snappier"; version="0.1.0"; sha256="0334zwhqdl3lfw7rg8ql7z10qj8jjrm17yi9mgdcxnzaf3f1p859"; depends=[]; }; snapshot = derive2 { name="snapshot"; version="0.1.2"; sha256="0cif1ybxxjpyp3spnh98qpyw1i5sgi1jlafcbcldbqhsdzfz4q10"; depends=[]; }; @@ -12926,7 +13122,6 @@ in with self; { snowflakes = derive2 { name="snowflakes"; version="1.0.0"; sha256="0adna9jfs0wv4dhyjczxhq7c0ldjfai07p1q9119avxyilv9x0vi"; depends=[]; }; snp_plotter = derive2 { name="snp.plotter"; version="0.5.1"; sha256="16apsqvkah5l0d5qcwp3lq2jspkb6n62wzr0wskmj84jblx483vv"; depends=[genetics]; }; snpEnrichment = derive2 { name="snpEnrichment"; version="1.7.0"; sha256="1lja1n26nr8lgbca2kraryv933jwa2w3h41appzylflf0w3liz9y"; depends=[ggplot2 snpStats]; }; - snpRF = derive2 { name="snpRF"; version="0.4"; sha256="1amxc4jprrc6n5w5h9jm2as025gqdqkla2asz7x97sjdnnj9kzzn"; depends=[]; }; snpReady = derive2 { name="snpReady"; version="0.9.6"; sha256="1r96j8zh84dn7qh3zgl0p0v3a80hx2wd3c4jgjlr43hzl7yglpqr"; depends=[impute Matrix matrixcalc rgl stringr]; }; snpStatsWriter = derive2 { name="snpStatsWriter"; version="1.5-6"; sha256="04qhng888yih8gc7yd6rrxvvqf98x3c2xxz22gkwqx59waqd4jlq"; depends=[colorspace snpStats]; }; snpar = derive2 { name="snpar"; version="1.0"; sha256="0c9myg748jm7khqs8yhg2glxgar1wcf6gyg0xwbmw0qc41myzfnq"; depends=[]; }; @@ -12934,8 +13129,10 @@ in with self; { sns = derive2 { name="sns"; version="1.1.2"; sha256="132zd57xb2y0nshw4lakf49r2mvvkv7j32f7l7hqrh91mw7wyqpr"; depends=[coda mvtnorm numDeriv]; }; sobolnp = derive2 { name="sobolnp"; version="0.1.0"; sha256="00rmigjyd3fsmhrhbvjzrfsl4ir0xpfr4xbgjws6vkx2rmcqnq1s"; depends=[minqa np pbmcapply]; }; soc_ca = derive2 { name="soc.ca"; version="0.7.3"; sha256="0z3phmvgwd3s6swfaywq851my12a2n48i6k26vhggc6pf9d28phl"; depends=[ellipse ggplot2 ggrepel gridExtra reshape2 shiny]; }; + socceR = derive2 { name="socceR"; version="0.1.1"; sha256="1vd0r3vixavg1br2q3kfn3nvl7dw854vkcfwcvyw411k84ivb13y"; depends=[Rcpp]; }; social = derive2 { name="social"; version="1.0"; sha256="0ny81bhj80rlwwa6cgbkdz2rxz6bp0f3nvjr1sqxr4s8l8rnf4ic"; depends=[Rcpp]; }; - socialmixr = derive2 { name="socialmixr"; version="0.1.3"; sha256="16z0ykbji9vh2j0d02x6vcrxwwqpzjckfxr1wjkvfc86mqpgpqmd"; depends=[countrycode curl data_table httr jsonlite oai stringr wpp2015 XML]; }; + socialmixr = derive2 { name="socialmixr"; version="0.1.4"; sha256="0mwbdqbnqii80rgy6yk7q2b427wmqw7inciywrq7mbradqqyag48"; depends=[countrycode curl data_table httr jsonlite oai stringr wpp2015 XML]; }; + sociome = derive2 { name="sociome"; version="1.0.2"; sha256="0nvzxxchcml8aprva4gn0hlqgik7y3dssl78mw11zbaacldlv99s"; depends=[dplyr magrittr mice psych purrr rlang stringr tibble tidycensus tidyr]; }; socviz = derive2 { name="socviz"; version="1.0.0"; sha256="14713g5saa167c5wk06i9v5708cj60znc8a7c3a2wpk0h2idfjlb"; depends=[dplyr fs magrittr rlang tibble]; }; sodavis = derive2 { name="sodavis"; version="1.2"; sha256="1jf5sml51qxlpgv5b1rvyig4dm4ijw2hpnk85zf790jp22xm64jw"; depends=[MASS mvtnorm nnet]; }; sodium = derive2 { name="sodium"; version="1.1"; sha256="1zxzi8xvxnhgcd5qrylf08nz1cdq3aslrswjas440qg63ypmbf6w"; depends=[]; }; @@ -12963,7 +13160,7 @@ in with self; { 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="3.9.3"; sha256="0ylwck1w1nw43f12gcfminx4b6sz6xwmywddbpi7lf44ickqm14m"; depends=[crayon lattice MASS Matrix Rcpp RcppArmadillo]; }; + sommer = derive2 { name="sommer"; version="4.0.1"; sha256="1yzi090kj9rqygsjwl80yzf6dlnll68gpnyp1wpp018f6lyg7xww"; depends=[crayon lattice MASS Matrix Rcpp RcppArmadillo]; }; somplot = derive2 { name="somplot"; version="1.6.4"; sha256="06c8p2lqz3yxmxdl7ji8a3czvxnsbl7bwyiig76pkwc3a5qqfbb9"; depends=[hexbin]; }; somspace = derive2 { name="somspace"; version="1.0.0"; sha256="1cp7mprapidzfphis697r3jipm1ig5198580mmdygvbajxcjib75"; depends=[data_table ggplot2 kohonen maps]; }; sonar = derive2 { name="sonar"; version="1.0.2"; sha256="1f0f5iqi3y9vnxyym14nm8dqxw0vcpnxmvvkx4sm612i4fclg1f9"; depends=[]; }; @@ -12980,12 +13177,13 @@ in with self; { sotu = derive2 { name="sotu"; version="1.0.2"; sha256="0aqwkawaydsm91hz13msjg1a5llg7xmv6hxmfmsaganrl7iaym3c"; depends=[]; }; sound = derive2 { name="sound"; version="1.4.5"; sha256="1kbbb614d0fmj9l0yjiwf5yqnl7sby4xklp7qwp6rwjvq9bnm0ab"; depends=[]; }; soundecology = derive2 { name="soundecology"; version="1.3.3"; sha256="16h6gbdlyav7wbfisdv1f2zsqhr45liidgj7qqk8giwjxgan8q97"; depends=[ineq oce pracma seewave tuneR vegan]; }; - soundgen = derive2 { name="soundgen"; version="1.4.0"; sha256="1qaidf5acb78bjk4jak939d48cxm81hp2h393ks9x4wdqvwpyi3z"; depends=[dtw mvtnorm phonTools plyr reshape2 seewave shiny tuneR zoo]; }; + soundgen = derive2 { name="soundgen"; version="1.4.1"; sha256="13xq7ak4ggrqlpfb2c6xav1kpafvm3i9k1vk9vj28mcack870961"; depends=[dtw mvtnorm phonTools plyr reshape2 seewave shiny tuneR zoo]; }; source_gist = derive2 { name="source.gist"; version="1.0.0"; sha256="03bv0l4ccz9p41cjw18wlz081vbjxzfgq3imlhq3pgy9jdwcd8fp"; depends=[RCurl rjson]; }; sourceR = derive2 { name="sourceR"; version="1.0.1"; sha256="01qxa44s9szaxl0rdcx4p0wn4vby17hdzdjzpsbls3prsnr0jaad"; depends=[assertthat cluster dplyr gplots gtools hashmap R6 reshape2 SPIn tensorA]; }; sourcetools = derive2 { name="sourcetools"; version="0.1.7"; sha256="1jnjir0q2dj724f1mjm6p5h77yzyx6xcqy9r2g7gmcxkxw349627"; depends=[]; }; sp = derive2 { name="sp"; version="1.3-1"; sha256="17xm1ig80p9wc860hm3bgishz6lj9fxgwqidj7rkbk4ap99qp62p"; depends=[lattice]; }; sp23design = derive2 { name="sp23design"; version="0.9"; sha256="1ihvcld19cxflq2h93m9k9yaidhwixvbn46fqqc1p3wxzplmh8bs"; depends=[mvtnorm survival]; }; + spANOVA = derive2 { name="spANOVA"; version="0.99.0"; sha256="09zzwgl6w3lwynh4b65c5hg9mgx6wn5miv48fj6fwgj9bz3kkb3y"; depends=[ape car devtools DT geoR gtools knitr MASS Matrix multcomp multcompView mvtnorm rmarkdown ScottKnott shiny shinyBS shinythemes spatialreg spdep xtable]; }; spAddins = derive2 { name="spAddins"; version="0.2.0"; sha256="19wbcghcf0f9qvqy92jhsdcpmd9b4lkhxndvr71cyhzga539lh1n"; depends=[magrittr purrr rstudioapi stringr]; }; spBayes = derive2 { name="spBayes"; version="0.4-2"; sha256="0qmh8sdawhssr1jmx9dc56mxxwsgya8spsss88jgg0npvmpl5khb"; depends=[abind coda Formula magic Matrix]; }; spBayesSurv = derive2 { name="spBayesSurv"; version="1.1.3"; sha256="0syb4x05j878jhcql8prfw1aqxmpi1idxk1d4xl52j32wngkpn8b"; depends=[coda fields MASS Rcpp RcppArmadillo survival]; }; @@ -13010,7 +13208,7 @@ in with self; { spacetime = derive2 { name="spacetime"; version="1.2-2"; sha256="0bgaarh2ibj3z6z504mzcb94x6w2bh5vyn1ar1lllqf4wn93z78y"; 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-5"; sha256="0b6yh4q9f0ibwlwyckwaya9m645j22x6bdz9mz3chass8qza6bls"; depends=[foreach iterators lme4 Matrix nlme spdep]; }; - spacyr = derive2 { name="spacyr"; version="1.0"; sha256="02vfcj4sr08xb6004h0gfsa3szshikhjxn1yahhxz8g04zhsi1g0"; depends=[data_table reticulate]; }; + spacyr = derive2 { name="spacyr"; version="1.2"; sha256="1xsiz6zx89vs6ykrkkp011d8fz4ksdgnf5nyaq5ynjr6zv865vks"; depends=[data_table reticulate]; }; spaero = derive2 { name="spaero"; version="0.5.0"; sha256="1r3rgvmkcrkzm6ikbbmnm4rfdrnwgmn4wq21mxgjs2bzg2r72mw6"; depends=[]; }; spagmix = derive2 { name="spagmix"; version="0.3-1"; sha256="0xfrm4i28sy490g5324bc43dxlrgcnzxg27gsd5b81mqi03sry9j"; depends=[abind mvtnorm RandomFields sparr spatstat]; }; spam = derive2 { name="spam"; version="2.2-2"; sha256="024dgfnjfxvsiymbzrhadinamj6qy509f4sbd1zxql8ymkyxn7vi"; depends=[dotCall64]; }; @@ -13018,14 +13216,13 @@ in with self; { spanel = derive2 { name="spanel"; version="0.1"; sha256="1riyvvfij277mclgik41gyi01qv0k466wyk2wbqqhlvrlj79yzsc"; depends=[]; }; spanish = derive2 { name="spanish"; version="0.4.2"; sha256="15drc11lh0qxpww50p0smi8qxfbln82bx0yd74jqf71irhk5jxyp"; depends=[magrittr xml2]; }; spant = derive2 { name="spant"; version="0.14.0"; sha256="0zz75i8z64w474s5c142rzdc5483xyxamx5gzcxaipqd7vqaracz"; depends=[abind complexplus foreach magrittr matrixcalc minpack_lm nnls plyr pracma readr signal smoother stringr svd tibble tkrplot]; }; - sparc = derive2 { name="sparc"; version="0.9.0"; sha256="0jsirrkmvrfxav9sphk8a4n52fg0d1vnk3i8m804i4xl0s7lrg8s"; depends=[]; }; sparcl = derive2 { name="sparcl"; version="1.0.4"; sha256="138krflvfdlx4hlh90mswds51i8aw2vv00gm5lgkfsvxj4w324jg"; depends=[]; }; spark_sas7bdat = derive2 { name="spark.sas7bdat"; version="1.2"; sha256="1kvzfjhf1q5jzlq5d04s7d96j63vnvqqrh8s03rwkl79h1dhqhhp"; depends=[sparklyr]; }; sparkTable = derive2 { name="sparkTable"; version="1.3.0"; sha256="1fc2nihxfrjpmxm9g9296mz5czd3ydvi1v37g8qgb20j7b73c64h"; depends=[boot Cairo ggplot2 gridExtra pixmap Rglpk RGraphics shiny StatMatch xtable]; }; sparkavro = derive2 { name="sparkavro"; version="0.2.0"; sha256="005pdfb08clq2fsabdxcbmd4n8nj5ix6yqk5pxpv3gvrzw8s7y32"; depends=[DBI dplyr sparklyr]; }; sparkbq = derive2 { name="sparkbq"; version="0.1.0"; sha256="0jcxnivi5zfbixmdywhn1v42lxi085wh7r4c26laclz9j2wvj8mk"; depends=[sparklyr]; }; sparkline = derive2 { name="sparkline"; version="2.0"; sha256="0lrr1lm7603di7x3mf53cp13d9ssjh9gmb43wa6z9yqapis2djm2"; depends=[htmltools htmlwidgets]; }; - sparklyr = derive2 { name="sparklyr"; version="1.0.1"; sha256="1zq2qpg43hkp9j1hidjb15137qry0zqb43zd21invzl13n65x3qw"; depends=[assertthat base64enc config DBI dbplyr digest dplyr ellipsis forge generics httr jsonlite openssl purrr r2d3 rappdirs rlang rprojroot rstudioapi tibble tidyr withr xml2]; }; + sparklyr = derive2 { name="sparklyr"; version="1.0.2"; sha256="06l1rjmmgxdg5ala6hzrbnx0swpn9qyv81i98ab8dpfw70lk1fhi"; depends=[assertthat base64enc config DBI dbplyr digest dplyr ellipsis forge generics httr jsonlite openssl purrr r2d3 rappdirs rlang rprojroot rstudioapi tibble tidyr withr xml2]; }; sparklyr_nested = derive2 { name="sparklyr.nested"; version="0.0.3"; sha256="0lva7fbjp253kxq3970h52cr8s52xycbi03d5shsyna8grhkbczj"; depends=[dplyr jsonlite listviewer purrr rlang sparklyr]; }; sparktex = derive2 { name="sparktex"; version="0.1"; sha256="0r6jnn9fj166pdhnjbsaqmfmnkq0qr1cjprihlnln9jad05mrkjx"; depends=[]; }; sparktf = derive2 { name="sparktf"; version="0.1.0"; sha256="0jd018n7553q0ldv6whxbj2s38myig0m8zq4fbp8fsv34q5wnsx4"; depends=[sparklyr]; }; @@ -13051,7 +13248,7 @@ in with self; { sparsepp = derive2 { name="sparsepp"; version="1.22"; sha256="0wa1585pkbn3y11apyim4z1ixn300c1yyv9bf2qldb6cjfiv7699"; depends=[]; }; sparsereg = derive2 { name="sparsereg"; version="1.2"; sha256="1ipsang2fppmjx4h5ljgzx3c44z3lggc376ghrqqgmxb5ql8bcp3"; depends=[coda ggplot2 GIGrvg glmnet gridExtra MASS MCMCpack msm Rcpp RcppArmadillo VGAM]; }; sparsestep = derive2 { name="sparsestep"; version="1.0.0"; sha256="0f3wrwiyn990sn3x9r50zgs8cr76nmyisdc7qismgx1nn5yx5z0g"; depends=[Matrix]; }; - sparsesvd = derive2 { name="sparsesvd"; version="0.1-4"; sha256="1yf373552wvdnd65r7hfcqa3v29dqn7jd4cn431mqd2acnqjrsam"; depends=[Matrix]; }; + sparsesvd = derive2 { name="sparsesvd"; version="0.2"; sha256="1xm969fjq3fv1p2sqza2apz8picibj4s2agpwf1sx9nwn3b587qs"; depends=[Matrix]; }; sparsevar = derive2 { name="sparsevar"; version="0.0.10"; sha256="069r0kbypmx7pw3z2v9l17qidw3d73rzf5zs6yn1adyvpsddjxi8"; depends=[doParallel flare ggplot2 glmnet Matrix mvtnorm ncvreg picasso reshape2]; }; sparsio = derive2 { name="sparsio"; version="1.0.0"; sha256="12nbydgzl3qlanlsfdy8bvg6rxa439lv0z0vbyqssqwky3mmg5c3"; depends=[Matrix Rcpp]; }; spartan = derive2 { name="spartan"; version="3.0.2"; sha256="040iq7y5fk93zcvbinnmlhj9l8w3bjq3yqcf7v715i77hx5d18bs"; depends=[e1071 ggplot2 gplots lhs mco mlegp neuralnet plotrix psych randomForest XML]; }; @@ -13062,7 +13259,7 @@ in with self; { spatial_tools = derive2 { name="spatial.tools"; version="1.6.0"; sha256="1jh9psc2im0mp52mmz596x5h64m6w1d8hibnm7x52di5j2jp29vz"; depends=[abind doParallel foreach iterators mmap raster rgdal sp]; }; spatialClust = derive2 { name="spatialClust"; version="1.1.1"; sha256="042yrmh1rb0hxynxlbdpcissgy9zazs5aqx7vj388ibynzijck3r"; depends=[ggplot2 maptools rgeos sp]; }; spatialCovariance = derive2 { name="spatialCovariance"; version="0.6-9"; sha256="1m86s9a059spp97y37dcirrgjshcqzpdj11cq92vji624w4nrhlb"; depends=[]; }; - spatialEco = derive2 { name="spatialEco"; version="1.1-1"; sha256="1sgc1a45wpx79h2y5i1k1qq7jqwf5a69lvl2sgaq4621f4l0b60b"; depends=[cluster EnvStats maptools MASS RANN raster RCurl readr rgeos rms SDMTools sf sp SpatialPack spatstat spdep yaImpute]; }; + spatialEco = derive2 { name="spatialEco"; version="1.2-0"; sha256="110kzq8qhfjqqc2dcvy43a4m2q4a8vs2009kzhcnl1r8j843ibni"; depends=[cluster EnvStats maptools MASS RANN raster RCurl readr rgeos rms SDMTools sf sp SpatialPack 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]; }; spatialfusion = derive2 { name="spatialfusion"; version="0.6"; sha256="13bpiw1f847nlrsvg6bpgb62pfgm5j47v7cy7x4bqxh497ci263b"; depends=[fields geoR Rcpp rstan SDraw sp]; }; @@ -13070,7 +13267,7 @@ in with self; { 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]; }; spatialreg = derive2 { name="spatialreg"; version="1.1-3"; sha256="1004rz4x34i0nmm46ac2vq7ddxp31cvbbdhd79jd49z4vzycs2bn"; depends=[boot coda expm gmodels LearnBayes MASS Matrix nlme spData spdep]; }; - spatialrisk = derive2 { name="spatialrisk"; version="0.6.1"; sha256="00n7kzxyg42sxfaxj0gxrj8h5cfwpqfx8mfhg0h5x3qvjr9b0l3b"; depends=[classInt dplyr ggplot2 Rcpp RcppProgress sf tmap viridis]; }; + spatialrisk = derive2 { name="spatialrisk"; version="0.6.2"; sha256="1n7akj7jhl6m3gqa51wi4cmbi3bblzrja3ss6ni664pargnkvd0q"; depends=[classInt dplyr ggplot2 Rcpp RcppProgress sf shiny tmap viridis]; }; spatialsegregation = derive2 { name="spatialsegregation"; version="2.45"; sha256="04ibvk6shs15b8piln2lcnlj8s5gy6r7wraz6591dbc31grzaa36"; depends=[spatstat]; }; spatialwarnings = derive2 { name="spatialwarnings"; version="1.3.1"; sha256="139m6jaw6f5gglwqrd4f5mzr4vkqk2r1a069971y7ap2klzzbhns"; depends=[ggplot2 plyr Rcpp RcppArmadillo reshape2 tidyr VGAM]; }; spatialwidget = derive2 { name="spatialwidget"; version="0.2"; sha256="105pgsv4dq3pmk9bylb3fxzvp44frfp6xcvq5d01ja4gnwmb35p2"; depends=[BH colourvalues geojsonsf jsonify rapidjsonr Rcpp]; }; @@ -13136,7 +13333,7 @@ in with self; { splancs = derive2 { name="splancs"; version="2.01-40"; sha256="0qs3lwyllrkahnvqbm8bzrf03bm9zk4s7p1n19s638y4xf0l6x3r"; depends=[sp]; }; splashr = derive2 { name="splashr"; version="0.6.0"; sha256="0l57w5gwr0p2049z1201nlqsy23h37gsybd1lj3vycxz43ir7213"; depends=[curl dplyr formatR HARtools httr jsonlite lubridate magick openssl purrr scales stevedore stringi xml2]; }; splines2 = derive2 { name="splines2"; version="0.2.8"; sha256="0ygzqq0swhcss5v8bn7qg98fpvp3wibbnbzkbpw4nvfd8bg51m1v"; depends=[]; }; - splinetree = derive2 { name="splinetree"; version="0.1.1"; sha256="1cspjj7757p7na8kvd3p0vjixmhv8pnmkazqp2x1j1c7wwgp48zq"; depends=[ggplot2 mclust mosaic nlme rpart treeClust]; }; + splinetree = derive2 { name="splinetree"; version="0.2.0"; sha256="0gqb3kwca42crrx6fj42ryl5pkxvankhp1chdlvi5lgg8mzmqsnl"; depends=[ggplot2 mclust mosaic nlme rpart treeClust]; }; splitFeas = derive2 { name="splitFeas"; version="0.1.0"; sha256="1cfiis32h5kkp8r1mndmj4xss9gw96vdzk7q68q3jhbwqiaxp9rp"; depends=[corpcor matrixStats]; }; splitfngr = derive2 { name="splitfngr"; version="0.1.2"; sha256="0cf9y68m72j890a732m0n784nr12ydljr6s8i80f0in6q8lmw8ls"; depends=[lbfgs]; }; splithalf = derive2 { name="splithalf"; version="0.5.2"; sha256="16ydqj1mjsii18zllm5v24qw8na88sa3ml2s1b0xlc72fvy76646"; depends=[dplyr Rcpp robustbase tidyr]; }; @@ -13150,7 +13347,7 @@ in with self; { splusTimeSeries = derive2 { name="splusTimeSeries"; version="1.5.0-75"; sha256="14bg0yzwk3v0b1qrlfaxv48dpk380ha6wb2w4k02c9vmb51ysmw0"; depends=[splusTimeDate]; }; spm = derive2 { name="spm"; version="1.2.0"; sha256="0kn3ahhvpcr0qpsqid4d7rx613a9dpdw2x4zgrnmsimmw026q7xn"; depends=[biomod2 gbm gstat psy randomForest ranger sp]; }; spm12r = derive2 { name="spm12r"; version="2.8.1"; sha256="1ndak1ba6gh3hij0x4njr4hv6nfvq91dpgb0zdw0nl11bi6999b0"; depends=[git2r matlabr neurobase oro_nifti R_utils]; }; - spmoran = derive2 { name="spmoran"; version="0.1.6.2"; sha256="0vhv5nnv9ihfr7phgqk8i2ld7hgndvwsn5q73k87xn4mdgclfv4k"; depends=[doParallel fields foreach ggplot2 Matrix rARPACK spdep vegan]; }; + spmoran = derive2 { name="spmoran"; version="0.1.7.1"; sha256="0nxg1xl3m4lkpxrkfcbnmf1x0gf43llz7095rj6i3flgmymirnxh"; depends=[doParallel fields foreach ggplot2 Matrix rARPACK spdep vegan]; }; spnet = derive2 { name="spnet"; version="0.9.1-0"; sha256="1fy0fpgz2k985brfqyza1l49y0w2j9z308n542pgmkzqsnsdscpw"; depends=[shape sp]; }; spnn = derive2 { name="spnn"; version="1.1"; sha256="0i77lpxrfa1jxi9znlmn5knmcjpf17q4hf8999b1x8lhqlhiizc1"; depends=[MASS]; }; spocc = derive2 { name="spocc"; version="0.9.0"; sha256="1azid8girmj4f0j4x9irljpxbsdpsxz572grb4fdjdxmlzpls7sy"; depends=[crul data_table jsonlite lubridate rbison rebird rgbif ridigbio rvertnet tibble whisker wicket]; }; @@ -13159,7 +13356,7 @@ in with self; { sporm = derive2 { name="sporm"; version="1.1"; sha256="07sxz62h4jb7xlqg08sj4wpx121n9jfk65196mnxdvb36lqmb4hp"; depends=[]; }; sport = derive2 { name="sport"; version="0.1.2"; sha256="1d5j42a6gx64pxh8bifrzc08z382sz55339f9237s6zq751pjjjy"; depends=[data_table ggplot2 Rcpp]; }; spotGUI = derive2 { name="spotGUI"; version="0.2.1"; sha256="1z664ricdsn8c29ks6hslm89f0qq6ls94pz4k256427cs95pk3ay"; depends=[gridExtra httpuv plotly rclipboard rhandsontable shiny shinyBS shinydashboard shinyjs smoof SPOT XML]; }; - spotifyr = derive2 { name="spotifyr"; version="2.1.0"; sha256="1ziag07x7ibf405z7i9dji8g2ign2c9dmzx794svf2qzzahrds8q"; depends=[dplyr genius httr jsonlite lubridate purrr readr rvest stringr tibble tidyr]; }; + spotifyr = derive2 { name="spotifyr"; version="2.1.1"; sha256="0d3n75gyyqi5vgp3z4v3g9l7963xgadi98p1b5iag78zzz1zkcz8"; depends=[dplyr genius httr jsonlite lubridate purrr readr rvest stringr tibble tidyr]; }; spp = derive2 { name="spp"; version="1.16.0"; sha256="08zxxgyp0h6733b08jmml7k4rhfd3mi5dda3jrzid0s184y0z29w"; depends=[BH caTools Rcpp Rsamtools]; }; sppmix = derive2 { name="sppmix"; version="1.0.2"; sha256="1924lrxjlijlbvjbkkwb3pfa4klg49ph6hz66b7kyy1371wa2b9y"; depends=[fields ggplot2 mvtnorm Rcpp RcppArmadillo rgl spatstat]; }; spray = derive2 { name="spray"; version="1.0-6"; sha256="19j3fmgxwvni73xmldwaf6n8czxrwlhb9psl7iry0skw8vmdp4jy"; depends=[magic partitions Rcpp]; }; @@ -13175,7 +13372,7 @@ in with self; { spsur = derive2 { name="spsur"; version="1.0.0.3"; sha256="101k39g0psvvrf8qkic9ijh2sps444i5bl1z3fr9c4i29yfgzvnm"; depends=[Formula MASS Matrix minqa numDeriv sparseMVN spdep]; }; spsurvey = derive2 { name="spsurvey"; version="4.0.0"; sha256="0bx3x4cddsr5r402cxi0321628ab7hjajgcv937ah4km3g2z9ihs"; depends=[crossdes deldir foreign Hmisc MASS rgeos sp]; }; spt = derive2 { name="spt"; version="2.5.1"; sha256="04j38d2b35p4798znnc49vqrg8r8bygwi07vybfj3nzimlp2mkrn"; depends=[]; }; - sptemExp = derive2 { name="sptemExp"; version="0.1.3"; sha256="1j5c63mywv92c2zyqaa1rp22s5dmsj0as1f3q93455wjvvr42sz6"; depends=[automap BayesX BayesXsrc bcv deldir doParallel foreach limSolve ncdf4 plyr R2BayesX raster Rcpp RcppEigen rgdal rgeos sp SpatioTemporal]; }; + sptemExp = derive2 { name="sptemExp"; version="0.1.4"; sha256="16rp20l65id6jiqify7hii0xpgkiyhgp9xg89b002n0jsy10pgph"; depends=[automap BayesX BayesXsrc bcv deldir doParallel foreach limSolve ncdf4 plyr R2BayesX raster Rcpp RcppEigen rgdal rgeos sp SpatioTemporal]; }; sptm = derive2 { name="sptm"; version="17.12-7"; sha256="1l5in0jkqg44rr2id3h25jrfbn7x855p31z338hnmdpfwkpm2b1a"; depends=[kyotil survey survival]; }; spuRs = derive2 { name="spuRs"; version="2.0.2"; sha256="00c0hnyrcbkbj269czxbfgmgi88y0vxzm79sxclllkzr9rdd1p53"; depends=[lattice MASS]; }; spup = derive2 { name="spup"; version="1.3-1"; sha256="0xq9z9iy3bwqhzq783qydgmczxvh7knkk9vdvwnbpbk0rbjgq3kn"; depends=[gstat magrittr mvtnorm purrr raster whisker]; }; @@ -13188,7 +13385,7 @@ in with self; { sra = derive2 { name="sra"; version="0.1.1"; sha256="03nqjcydl58ld0wq1f9f5p666qnvdfxb5vhd584sdilw1b730ykd"; depends=[]; }; srm = derive2 { name="srm"; version="0.1-166"; sha256="1rqlvmynbcqp8j6jkyrimwkma0x1a4zw8vf0xx84q01qgqf0i8ar"; depends=[Rcpp RcppArmadillo]; }; srp = derive2 { name="srp"; version="1.2.0"; sha256="0xdzfvi7z78xmyxwd8fha3lr86jwmgjba1w8hhn4sv3v5gc9vlkh"; depends=[fda mgcv]; }; - srvyr = derive2 { name="srvyr"; version="0.3.4"; sha256="0xv7ix3a8jd28rrpyv1f54s6yf5avji0wbf598b4b3kvbp081mfp"; depends=[dplyr magrittr rlang survey tibble]; }; + srvyr = derive2 { name="srvyr"; version="0.3.5"; sha256="0yy18jaja7w7q6lbc2ky2lranjr6j23s88nplrvvn5a28n72mkdp"; depends=[dplyr magrittr rlang survey tibble tidyselect]; }; ss3sim = derive2 { name="ss3sim"; version="0.9.5"; sha256="0rdb49bfxvyh0jrqycrv1hxvh7y4kvw81jccjg5ma734x44q0vm5"; depends=[bbmle dplyr foreach ggplot2 gtools lubridate magrittr plyr r4ss]; }; ssMousetrack = derive2 { name="ssMousetrack"; version="1.1.5"; sha256="069jsp2l63jp4fv2hwadqxpkp89aqmbh439zy66rx55kws75b556"; depends=[BH CircStats cowplot dtw ggplot2 Rcpp RcppEigen rstan rstantools StanHeaders]; }; ssa = derive2 { name="ssa"; version="1.3.0"; sha256="0lbwvw8f88wvlhzd469fww0av0nbi6l76vmmxbps0ifw2q87l00d"; depends=[iterators]; }; @@ -13206,7 +13403,7 @@ in with self; { ssize_fdr = derive2 { name="ssize.fdr"; version="1.2"; sha256="0y723lwsnmk3rxbhlsrny9hiy07a5p255ygy9qkj6mri64gk1hby"; depends=[]; }; ssizeRNA = derive2 { name="ssizeRNA"; version="1.3.1"; sha256="08gkmmn71qra34x00r1vl6zyfwz7bwkbsax09vkqi7a15k1c3dph"; depends=[Biobase edgeR limma MASS qvalue ssize_fdr]; }; ssmn = derive2 { name="ssmn"; version="1.1"; sha256="1rab9yjb05g5rphqlhwvdwmsyqlv1f4m0rqxfv8c5pbh170nbwbc"; depends=[mnormt moments sn truncdist]; }; - ssmrob = derive2 { name="ssmrob"; version="0.6"; sha256="0a6rwgc5qzfb6z4di5scaq3mlilgv2qrmkl38fkjvf4vrnmmja5k"; depends=[MASS robustbase sampleSelection]; }; + ssmrob = derive2 { name="ssmrob"; version="0.7"; sha256="0asf0r83rzar96lcjm38i85qscbs9gbsrwbd1nfwzz9yl08mh07k"; depends=[MASS robustbase sampleSelection]; }; ssmsn = derive2 { name="ssmsn"; version="0.2.0"; sha256="0fzqdkqhj5hh8pzcwh7i0rglgdq22a5mriyis8r1vhlkdc7n5m39"; depends=[MCMCpack]; }; sspline = derive2 { name="sspline"; version="0.1-6"; sha256="0d6ms8szyn39c7v0397d5ar2hrl8v1l2b7m8hlj37hgp70b9s55h"; depends=[]; }; sspse = derive2 { name="sspse"; version="0.6"; sha256="1296893wgg0s6z5bv9a3k39gbxazvljl4dxiv4ma1s73nhz0xan9"; depends=[coda RDS scam]; }; @@ -13247,7 +13444,7 @@ in with self; { startupmsg = derive2 { name="startupmsg"; version="0.9.6"; sha256="0vkqxir4ady4dn9s70dfg1fxck2xg8vnmrmxjzvk01i6pc9zyq0x"; depends=[]; }; statGraph = derive2 { name="statGraph"; version="0.2.0"; sha256="03cxm3kvs88q7p8v859xzma97vlklx50yh3kgmmfzf4axdm6dcgm"; depends=[igraph MASS]; }; statVisual = derive2 { name="statVisual"; version="1.1.8"; sha256="06l6f9zbycwrm47hi564v1lnxx8xjmrn79kva84n0gliblci8nx8"; depends=[Biobase dplyr factoextra forestplot gbm GGally ggdendro ggfortify ggplot2 ggrepel glmnet gplots gridExtra knitr limma magrittr multigroup pheatmap pROC pvca randomForest RColorBrewer reshape2 rmarkdown rpart_plot tibble tidyverse]; }; - statar = derive2 { name="statar"; version="0.7.0"; sha256="0jp2547gvm1na4bnnvzw3j3jya5db2k6xnbnmbwv9cmw1bwfbazk"; depends=[data_table dplyr ggplot2 lazyeval matrixStats rlang stringr tidyr]; }; + statar = derive2 { name="statar"; version="0.7.1"; sha256="0gxchf3mnjvxcp7dg8f1dxbm16hx4ks92z0h0ig7m9l6k6f8adkv"; depends=[data_table dplyr ggplot2 lazyeval matrixStats rlang stringr tidyr tidyselect]; }; statcheck = derive2 { name="statcheck"; version="1.3.0"; sha256="0ivybdcrymlsfv6pg6p5bv70qdvgxf2vgp0kf4r0pf2fcvav1mcp"; depends=[ggplot2 plyr rmarkdown]; }; statebins = derive2 { name="statebins"; version="1.2.2"; sha256="0qfs796dk5x983qah32w3npv9mxzljp3g7kffdd0ansn3z7i1zbb"; depends=[ggplot2 gridExtra RColorBrewer scales]; }; states = derive2 { name="states"; version="0.2.2"; sha256="1lw1gljmkn8i8fd4ng5c3jpqrwr0gkiyazppy19dp8xl94m1xa4b"; depends=[dplyr]; }; @@ -13259,7 +13456,7 @@ in with self; { statnetWeb = derive2 { name="statnetWeb"; version="0.5.5"; sha256="1v2zgbfl975gqhkhxvgdfhgbw7yf9y3p6kqqxldr9zskhmrn7p1x"; depends=[ergm lattice latticeExtra network RColorBrewer shiny sna]; }; statprograms = derive2 { name="statprograms"; version="0.2.0"; sha256="0m7px7fmpz2zzlfdi7rbllcjvcjp8iy94f6fa1w4xinh7vz3y6vq"; depends=[]; }; statquotes = derive2 { name="statquotes"; version="0.2.2"; sha256="1xzc3ndddjrlyld0p4zcwwxkj7i3m3adj7c78x9l4lhlw9mxbbqg"; depends=[stringr tidytext wordcloud]; }; - stats19 = derive2 { name="stats19"; version="0.2.1"; sha256="0s3zzkb34jygb4ph2j0q488qasvg1xgsabgnnisc9fqwalxd096l"; depends=[readr sf]; }; + stats19 = derive2 { name="stats19"; version="1.0.0"; sha256="1lm2qif0g710n5i7gzqhbwhxm76cabs5zm6504wja343fk3vzb54"; depends=[readr sf]; }; statsDK = derive2 { name="statsDK"; version="0.1.1"; sha256="0insx4sivac0nfxaa11iz9dd7374g51fcndsgljj3f14zw1xyq66"; depends=[dplyr ggplot2 httr jsonlite lubridate readr stringr tibble tidyr]; }; statsguRu = derive2 { name="statsguRu"; version="0.1.0"; sha256="0pqz0la86mk6zp65zzbfwhxyrqqx040p8mrm2j9wqb53r8fbnmqc"; depends=[devtools htmltab plotrix]; }; statsr = derive2 { name="statsr"; version="0.1-0"; sha256="1z0wfj1jxz02x7vl6sr651v85k88wg8rx0k2kkrwzc4ynim8shms"; depends=[BayesFactor broom cubature dplyr ggplot2 gridExtra knitr rmarkdown shiny tidyr]; }; @@ -13289,26 +13486,26 @@ in with self; { stlplus = derive2 { name="stlplus"; version="0.5.1"; sha256="14728xsm982z9sg4rbqg307pbwqlsiyzj8z3sr9wr6fi0dayf6z5"; depends=[lattice Rcpp yaImpute]; }; stm = derive2 { name="stm"; version="1.3.3"; sha256="1b1i4r161i92f5q63zjfghzg39bw9d2rqdxx0y6zjd8n2p0ni3wv"; depends=[data_table glmnet lda Matrix matrixStats quadprog quanteda Rcpp RcppArmadillo slam stringr]; }; stmCorrViz = derive2 { name="stmCorrViz"; version="1.3"; sha256="1a4pckrbzsihyf1bqvw3cl0hxrc4yq1pnkgxgf4b8jday6zkxwcv"; depends=[jsonlite SnowballC stm tm]; }; - stmgp = derive2 { name="stmgp"; version="1.0"; sha256="1v6ahg4icyrz8p0lfiyi2x90allhjvcq8rycinas5mffg7xgpv7d"; depends=[MASS]; }; + stmgp = derive2 { name="stmgp"; version="1.0.1"; sha256="0rbskcggshn880d1pcl95ixbg16pzyhy14j1x44ipby5md737w89"; depends=[MASS]; }; stmgui = derive2 { name="stmgui"; version="0.1.6"; sha256="1fn2m5l7y3p1riw39g6r3hpjxdccygih7yipp7dvc4msl9fm4h5c"; depends=[markdown shiny shinyBS shinyjs shinythemes stm tm]; }; stminsights = derive2 { name="stminsights"; version="0.3.0"; sha256="11lhsk7l11bcxsmc7hm8pnwj75634m5gkigr714i16ai2dkvzqpq"; depends=[dplyr ggplot2 ggraph ggrepel huge igraph purrr readr scales shiny shinyBS shinydashboard shinyjs stm stringr tibble tidygraph]; }; - stoRy = derive2 { name="stoRy"; version="0.1.2"; sha256="1n2ivdv6fa3qkk2xhgcy8cixpbw6mijr4p8q34q8d9fvh9qs9g11"; depends=[data_tree R6]; }; + stoRy = derive2 { name="stoRy"; version="0.1.3"; sha256="146xs8as5f8ig2xpj9k2san4bllqxddsnlflnhl0sy6132vshyr1"; depends=[data_tree R6]; }; 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="2.0.4"; sha256="1hb2fgnyn8zxq1j74x00msq3j807y70yxx2s3fq4csrb1935vr85"; depends=[coda Rcpp RcppArmadillo]; }; stockR = derive2 { name="stockR"; version="1.0.68"; sha256="0pgyxh19csv21vgji1sjpqaaqb1wwz62mnsf85a97ba9aph9lxwb"; depends=[gtools]; }; stocks = derive2 { name="stocks"; version="1.1.4"; sha256="0b6rl7pfkgzbpwnv7zzkr36hs5f1zb60d16ijslf7g9m25vvcyg6"; depends=[dvmisc Hmisc lubridate quantmod rbenchmark RColorBrewer Rcpp TTR zoo]; }; stoichcalc = derive2 { name="stoichcalc"; version="1.1-3"; sha256="0z9fnapibfp070jxg27k74fdxpgszl07xiqfj448dkydpg8ydkrb"; depends=[]; }; - stopwords = derive2 { name="stopwords"; version="0.9.0"; sha256="050v3hq1wd3w83zrp76nv6n67qsf5fss2cbihb6waijancm7zfzh"; depends=[ISOcodes]; }; + stopwords = derive2 { name="stopwords"; version="1.0"; sha256="1nmi0bpd0c238g5b8ch1v034m5ng9llhs519cgxdrj3sh9fplwlv"; depends=[ISOcodes]; }; stormwindmodel = derive2 { name="stormwindmodel"; version="0.1.1"; sha256="16w6si2icpsyhkn0d3l6sh64nj6ynyymp7jxfwa792ds2wrz2mkm"; depends=[dplyr ggplot2 lubridate maps plyr stringr tidyr weathermetrics]; }; storr = derive2 { name="storr"; version="1.2.1"; sha256="0409gb6wji3cjxkdcd0wc3jvsx61h3rxd8a3nr018y8rh1rpsaj6"; depends=[digest R6]; }; stosim = derive2 { name="stosim"; version="0.0.14"; sha256="10k8j7manskjsrjc1l44yhy682b1qh0k2jx3cs5k69j2z42mnhmk"; depends=[Rcpp]; }; - stplanr = derive2 { name="stplanr"; version="0.2.10"; sha256="1ignfgin0i2s40dh2m55dpwaxzyvc9c65q3q5q0j04byrfqg0ncw"; depends=[curl dplyr geosphere httr igraph jsonlite lubridate lwgeom magrittr maptools nabor openxlsx R_utils raster Rcpp RcppArmadillo readr rgeos rlang sf sp stringi stringr]; }; + stplanr = derive2 { name="stplanr"; version="0.3.0"; sha256="0jzwpr4gbif44j8c2s0gjfx21lnskwj2vpqi8hx2m9n6lgr2348p"; depends=[curl dplyr geosphere httr igraph jsonlite lubridate lwgeom magrittr maptools nabor openxlsx R_utils raster Rcpp RcppArmadillo readr rgeos rlang sf sp stringi stringr]; }; stpm = derive2 { name="stpm"; version="1.7.7"; sha256="1l40zb9qwshg7saqmgi7c49a3jd93ycrbvmysgzs0q8pl94vgcfs"; depends=[knitcitations MASS nloptr Rcpp RcppArmadillo sas7bdat survival]; }; stpp = derive2 { name="stpp"; version="2.0-3"; sha256="18icnfrlrcibrpw7vqkrhzfx880ak24xk6llwgiqw18r929mq1hw"; depends=[ggplot2 gridExtra KernSmooth plot3D rgl rpanel spatstat splancs]; }; strandCet = derive2 { name="strandCet"; version="1.0"; sha256="019cacj0g9f6i8v03rq7qyph7f14d8n0qw0axvczijvnk99q602a"; depends=[boot corpcor MASS minpack_lm mvtnorm numDeriv]; }; strap = derive2 { name="strap"; version="1.4"; sha256="0gdvx02w0dv1cq9bb2yvap00lsssklfnqw0mwsgblcy2j6fln7b0"; depends=[ape geoscale]; }; - strapgod = derive2 { name="strapgod"; version="0.0.2"; sha256="1lw201hnrfb0rnlf5p92liinkjg8j0947vcnn2d2z878lfvy0s11"; depends=[dplyr rlang tibble tidyr]; }; + strapgod = derive2 { name="strapgod"; version="0.0.3"; sha256="1sh716zqh6cc2qddn8v9pwdyf4xq9a59k7h797swzlk0r50y83h9"; depends=[dplyr rlang tibble tidyr]; }; strat = derive2 { name="strat"; version="0.1"; sha256="1axxrp750kjzcgxjdqfscjmryv1mkv4l23zk8k23z8l4ymhd2f5w"; depends=[Hmisc Rcpp RcppArmadillo]; }; stratEst = derive2 { name="stratEst"; version="0.1.2"; sha256="045wmvkv9jxmazvy0p2dkf3200vy5gf124cv78132ysrnh2vcd4v"; depends=[Rcpp RcppArmadillo]; }; strataG = derive2 { name="strataG"; version="2.0.2"; sha256="1rf1xf07yb0dzasgig9sfm4i9ggdkjgy5iiysqgdapk3sxs26c8r"; depends=[adegenet ape apex copula data_table DT ggplot2 gridExtra Hmisc pegas phangorn RColorBrewer Rcpp shiny shinyFiles survival swfscMisc]; }; @@ -13388,7 +13585,7 @@ in with self; { superpc = derive2 { name="superpc"; version="1.09"; sha256="1p3xlg2n7p57n54g2w4frfrng5vjh97kp6ax4mrgvj3pqmd1m69z"; depends=[survival]; }; supervisedPRIM = derive2 { name="supervisedPRIM"; version="2.0.0"; sha256="1j5gsy119pvrhkkg048lyk6hjvn9x1bhmfy5g824gj3k1w5slrib"; depends=[prim]; }; suppdata = derive2 { name="suppdata"; version="1.1-1"; sha256="1sysd5w59y9hkm1ab8m9i1d976dv6cxchssc86s27bsibhsj2blc"; depends=[httr jsonlite rcrossref xml2]; }; - support = derive2 { name="support"; version="0.1.3"; sha256="0gwvqwg2xmcki9kh3pmzpw99z8zfhbqynjgw2j9k75msbidsxs26"; depends=[BH doParallel matrixStats MHadaptive nloptr randtoolbox Rcpp RcppArmadillo]; }; + support = derive2 { name="support"; version="0.1.4"; sha256="1yahhb9l2f3129av4cj4q77q1s0nfszzd6z7dqkfpnjvvk8gzdq7"; depends=[BH MHadaptive randtoolbox Rcpp RcppArmadillo]; }; support_BWS = derive2 { name="support.BWS"; version="0.2-0"; sha256="1yfjpr9v9zsbkysm3r6zk9r0a072g038lmj9wk4014a3rk9kmm80"; depends=[]; }; support_BWS2 = derive2 { name="support.BWS2"; version="0.2-2"; sha256="1pykq297gz42n6scl5s6zjy33wjvcb5590vcrgysdigf3hqb22ra"; depends=[]; }; support_CEs = derive2 { name="support.CEs"; version="0.4-1"; sha256="1rbyl7v6m07dsp08kkk9020bh39rhx89q7d05rc5kxb6f7y66jyz"; depends=[DoE_base MASS RCurl simex XML]; }; @@ -13422,7 +13619,7 @@ in with self; { surveyeditor = derive2 { name="surveyeditor"; version="1.0"; sha256="073219bcn1hlxl9ql6gncfvgn0m37pz5sb7h94nq6lf35dymq5zq"; depends=[]; }; surveyoutliers = derive2 { name="surveyoutliers"; version="0.1"; sha256="03nqw0zir3x57gg23hgsr2s99pv958kfsygqfwly96rvfdhr5p3v"; depends=[]; }; surveyplanning = derive2 { name="surveyplanning"; version="3.0"; sha256="1wnjizd5n5lyp8nw6srplrw7swrrivmbcphdvgaa9q1y8lkpq5w0"; depends=[data_table laeken]; }; - surveysd = derive2 { name="surveysd"; version="1.0.0"; sha256="155917rfyaijpiiiqgggnyisknikx3xid4kjqvh9299bs769a169"; depends=[data_table dplyr ggplot2 laeken matrixStats Rcpp]; }; + surveysd = derive2 { name="surveysd"; version="1.1.0"; sha256="0ab1f3z86idv3cy9nycqh4nnkcwachlm27pynlrn6g4jmcvcbj9b"; depends=[data_table dplyr ggplot2 laeken matrixStats Rcpp]; }; survidm = derive2 { name="survidm"; version="1.2.0"; sha256="0dgcxhf8x1aavr4n4aqanfc23zd62dyk3h05sa04611h6n9l8j9c"; depends=[doParallel doRNG foreach KernSmooth np survival TPmsm]; }; survivALL = derive2 { name="survivALL"; version="0.9.3"; sha256="0lnvs7b097sl21gvnfafdprzvh197p1q4nzzagkdf4xm1xw8pj0h"; depends=[cowplot desiR ggplot2 ggthemes survcomp survival viridis]; }; survival = derive2 { name="survival"; version="2.44-1.1"; sha256="1faiwyg7x8y2kfzb66l4yc8br0mdlz4k20znmjrwq96dbzhm3cam"; depends=[Matrix]; }; @@ -13430,7 +13627,7 @@ in with self; { survivalMPL = derive2 { name="survivalMPL"; version="0.2"; sha256="05bfa9fx841kh9g2jcs1dimsxkjnf4bxgamcnjpisx3a644c1gkn"; depends=[MASS survival]; }; survivalROC = derive2 { name="survivalROC"; version="1.0.3"; sha256="0wnd65ff5w679hxa1zrpfrx9qg47q21pjxppsga6m3h4iq1yfj8l"; depends=[]; }; survivalsvm = derive2 { name="survivalsvm"; version="0.0.5"; sha256="1b4hrdrqq1z0kfn8vpdwg54388m25df2s6w9i574x3mkxkmkjkga"; depends=[Hmisc kernlab Matrix pracma quadprog survival]; }; - survminer = derive2 { name="survminer"; version="0.4.4"; sha256="1gczf52wxw5jlncmfk4xqfjxf83nn3kd4ha3mij8yd4f110q9i5q"; depends=[broom cmprsk dplyr ggplot2 ggpubr gridExtra magrittr maxstat purrr scales survival survMisc tibble tidyr]; }; + survminer = derive2 { name="survminer"; version="0.4.5"; sha256="03dx3wb2s5yl617sgxb7x002wf0mgdz29c4jhgp260wvibh0b3rm"; depends=[broom dplyr ggplot2 ggpubr gridExtra magrittr maxstat purrr scales survival survMisc tibble tidyr]; }; survsim = derive2 { name="survsim"; version="1.1.5"; sha256="0194w1h3v4p546wibp3xyhy2r84w3p9r6ggzhlf11v8467mjy0l9"; depends=[eha statmod]; }; survsup = derive2 { name="survsup"; version="0.0.2"; sha256="0q41hn8iqib2w6gkz2mll4h46vr9ca25jrg0g5jr9wgrzsnf5jci"; depends=[broom colorspace dplyr ggplot2 gridExtra survival]; }; survtmle = derive2 { name="survtmle"; version="1.1.1"; sha256="1l13rvwq4915ij2a55fxdj3b3wkgjca1fbqzcgkjlpzkcn97k1nj"; depends=[dplyr ggplot2 ggsci Matrix plyr speedglm stringr SuperLearner tidyr]; }; @@ -13450,13 +13647,13 @@ in with self; { svUnit = derive2 { name="svUnit"; version="0.7-12"; sha256="16iiryj3v34zbnk1x05g30paza7al1frqx52fkw8ka61icizsrf5"; depends=[]; }; svWidgets = derive2 { name="svWidgets"; version="0.9-45"; sha256="08cpsy4abypjnv33arsgxk5i0gpdvdzj60wa1b22ca1n7d35mc80"; depends=[svMisc]; }; svapls = derive2 { name="svapls"; version="1.4"; sha256="12gk8wrgp556phdv89jqza22zmsnachsydr5vlz38s664d2lplbg"; depends=[class pls]; }; - svars = derive2 { name="svars"; version="1.3.0"; sha256="109h8k9xkiqcqib9x0f78acq2ag854v1pgrhx5hfxprdj863mhss"; depends=[clue copula DEoptim expm ggplot2 pbapply Rcpp RcppArmadillo reshape2 steadyICA strucchange tsDyn vars zoo]; }; + svars = derive2 { name="svars"; version="1.3.1"; sha256="15lmgf1q6cd987f56nf3r8z4mmwjyfs5s9avav8jl7d1l73rzhiw"; depends=[clue copula DEoptim expm ggplot2 pbapply Rcpp RcppArmadillo reshape2 steadyICA strucchange tsDyn vars zoo]; }; svcm = derive2 { name="svcm"; version="0.1.2"; sha256="1lkik65md8xdxzkmi990dvmbkc6zwkyxv8maypv2vbi2x534jkhl"; depends=[Matrix]; }; svd = derive2 { name="svd"; version="0.4.3"; sha256="0wlvzqak6fng6v5473hyphrfxrfc2apw5f3fgvg7bz2fj6nzcry4"; depends=[]; }; svdvisual = derive2 { name="svdvisual"; version="1.1"; sha256="02mzh2cy4jzb62fd4m1iyq499fzwar99p12pyanbdnmqlx206mc2"; depends=[lattice]; }; svenssonm = derive2 { name="svenssonm"; version="0.1.0"; sha256="0pvay9vfrcafaq270pq6glp2b74zdfgldksl13cwdb0wk7qx7731"; depends=[]; }; svgPanZoom = derive2 { name="svgPanZoom"; version="0.3.3"; sha256="09gfa2943bvmjpnhnc2nr85wddkv662k30pxsqvvvq1va64rzpkc"; depends=[htmlwidgets]; }; - svgViewR = derive2 { name="svgViewR"; version="1.3"; sha256="0771k1v0aqlq8q9rvynb5dkwq0kmlsn8nh251lka98jwh36vhld0"; depends=[rjson Rook]; }; + svgViewR = derive2 { name="svgViewR"; version="1.4"; sha256="00nm2sdgil2kw6f19sy03m8452zia47bv1bkynxw3q7vck3vb3vx"; depends=[Rcpp rjson Rook]; }; svglite = derive2 { name="svglite"; version="1.2.2"; sha256="1gwv51wqp6pgm2f9gavsiq65njs77fr49n8y6y9ax60k3a4vvg14"; depends=[BH gdtools Rcpp]; }; svmadmm = derive2 { name="svmadmm"; version="0.3"; sha256="15ccda1r9cc6v30j37i052rdwxgw0wg37hwyn2vp8c7bkr0ybgkm"; depends=[kernlab]; }; svmpath = derive2 { name="svmpath"; version="0.955"; sha256="02j5xs4gg8k16imnwk6aram168cv1dqdrky3bszyc98l7xd0nlrj"; depends=[]; }; @@ -13474,13 +13671,12 @@ in with self; { swdft = derive2 { name="swdft"; version="1.0.0"; sha256="0529rw8nsl48hwiy741alvrzg5d5q1nhnjshrsfwchm5kdv0igva"; depends=[]; }; sweep = derive2 { name="sweep"; version="0.2.1.1"; sha256="0hfvgvzr5mh9niwpsr9jcly426dz457afrg4q5w13ahsasx7c9jg"; depends=[broom devtools dplyr forecast lazyeval lubridate tibble tidyr timetk]; }; sweidnumbr = derive2 { name="sweidnumbr"; version="1.4.1"; sha256="014zbp6a66gv7b0f2gmzvifllz266zrc14ihawksvyp1mcxz2ipg"; depends=[lubridate stringr]; }; - swephR = derive2 { name="swephR"; version="0.1.5"; sha256="139xp7lwzqspckf04fnfcwrpi4zhi01k94fhhka92sk2647yvd4z"; depends=[Rcpp]; }; + swephR = derive2 { name="swephR"; version="0.2.1"; sha256="0vrhgkz3bafkb6a46g5dx5qyh52ind5fwch0lbn7dnhwibdy209a"; depends=[Rcpp]; }; swfscMisc = derive2 { name="swfscMisc"; version="1.2"; sha256="08p2crsx8zi6qprs14mhdyq9x5sjlp3a46c1zzvp6741an4fy640"; depends=[ggplot2 mapdata maps reshape2 spatstat]; }; swgee = derive2 { name="swgee"; version="1.4"; sha256="1a6zr4nkpj52b0rk01qbwzi8y0c798wlxzw69wyyv576k148rgfq"; depends=[gee geepack mvtnorm]; }; swirl = derive2 { name="swirl"; version="2.4.4"; sha256="1pw0p72gkrv1cy4ck3jfv2j00qzlm44gk61vxl7zn0jb2yrd913r"; depends=[digest httr RCurl stringr testthat yaml]; }; swirlify = derive2 { name="swirlify"; version="0.5.3"; sha256="1bpg6yz2adgspjlwsf2q83j1bq0iyvp9938smgc41861nsclngwr"; depends=[base64enc readr rmarkdown shiny shinyAce stringr swirl whisker yaml]; }; swissMrP = derive2 { name="swissMrP"; version="0.62"; sha256="1vy6h6c4v49zlsli77ilj4df8cfh67rqmki71v6j1aqw6kf3b649"; depends=[arm blme lme4 maptools sp]; }; - swissdd = derive2 { name="swissdd"; version="1.0.0"; sha256="1q3f4v4xi7h93bm9jhsmd9qz01p7zmp3mcf5rh2jr8vabzzbfljj"; depends=[curl dplyr jsonlite magrittr purrr tibble tidyr]; }; switchnpreg = derive2 { name="switchnpreg"; version="0.8-0"; sha256="1vaanz01vd62ds2g2xv4kjlnvp13h59n8yqikwx07293ixd4qhpw"; depends=[expm fda HiddenMarkov MASS]; }; switchr = derive2 { name="switchr"; version="0.13.5"; sha256="11y9f8h5qkaykkdk5ya1z8dyw98z5svny56hx0q2b1z2f0iszwc3"; depends=[RCurl RJSONIO]; }; switchrGist = derive2 { name="switchrGist"; version="0.2.4"; sha256="137kz944qqqrislbm6anknw6n303j441mfhfcrzh33xcb19z320v"; depends=[gistr httpuv RJSONIO switchr]; }; @@ -13506,13 +13702,13 @@ in with self; { synlik = derive2 { name="synlik"; version="0.1.2"; sha256="1pscfqg5x7wpq3vp1i7fy29dwa7cw5g3kzxinanwrwbcznv9nyms"; depends=[Matrix Rcpp RcppArmadillo]; }; synoptReg = derive2 { name="synoptReg"; version="0.2.2"; sha256="0s3m7basw71gliy22c599ysj5s068ki20i8031yrrbdhif8zhbqg"; depends=[ncdf4 raster zoo]; }; syntaxr = derive2 { name="syntaxr"; version="0.8.0"; sha256="1iik9b3x9jx7w31j7hyi3sixg30l5a6w40svhqj1xlchsk60yykn"; depends=[magrittr]; }; - synthACS = derive2 { name="synthACS"; version="1.4.5"; sha256="04vw2xbg055anwiawkddnik4q67vvbvx9firm85hs7cj73mv07q4"; depends=[acs data_table Rcpp]; }; + synthACS = derive2 { name="synthACS"; version="1.5.2"; sha256="1y9kvp4fq1602c9876jc8102iidxzqkqsh89ix3m5qf63ldx071f"; depends=[acs data_table Rcpp]; }; synthpop = derive2 { name="synthpop"; version="1.5-1"; sha256="0cd9g0aa4598l3gyqpywalmkmvibhqkxhkm2qkln11rkwv12lcyv"; depends=[classInt foreign ggplot2 lattice MASS mipfp nnet party plyr polspline proto randomForest rpart]; }; sys = derive2 { name="sys"; version="3.2"; sha256="1k5vk5q9wa5sin0n226i05nymg469s24f6lx64yyhb7yc624j698"; depends=[]; }; sysfonts = derive2 { name="sysfonts"; version="0.8"; sha256="0wng902plryf2d8fc7k7m3jx11acz51kb2d91cqbyhq7xpk06z43"; depends=[]; }; sysid = derive2 { name="sysid"; version="1.0.4"; sha256="0fr9gf5yjin3zvz850z4r4pqc1r4mwx8d46sl64i4csdm9qnqagy"; depends=[bitops ggplot2 polynom reshape2 signal tframe zoo]; }; systemfit = derive2 { name="systemfit"; version="1.1-22"; sha256="19nmhidnzyk2wcwi5v28n9lkvylfw4in63vg5naqlk3w4fbwm2wb"; depends=[car lmtest MASS Matrix sandwich]; }; - systemfonts = derive2 { name="systemfonts"; version="0.1.0"; sha256="0bxaabsa4qzmv6k3yywgn9y54xwnjzkwkmcmvph8lk20r6zkj3v5"; depends=[]; }; + systemfonts = derive2 { name="systemfonts"; version="0.1.1"; sha256="0m0ljid683xcam2f14x7k2zv1yx4npac38a3gfv11vhxfbnpgp0z"; depends=[]; }; systemicrisk = derive2 { name="systemicrisk"; version="0.4.2"; sha256="021ypw9fag5kmk2q041pj2jfzgfg640yda7wvh0yzdmg73p6fvsw"; depends=[lpSolve Rcpp]; }; syt = derive2 { name="syt"; version="0.1.0"; sha256="1qagd67wznyc6sfvs22lw2lwnwap1hlpf92i0ck5aif514ysi886"; depends=[Matrix partitions]; }; syuzhet = derive2 { name="syuzhet"; version="1.0.4"; sha256="0wf4rls7v7h7zkq2k550d16aqvaij27iim85cwif7dkbinajfngi"; depends=[dplyr dtt NLP textshape tidyr zoo]; }; @@ -13521,7 +13717,7 @@ in with self; { tab = derive2 { name="tab"; version="4.1.1"; sha256="0ds8n6gncidb66in7hlqkcmil5yfsf7ihqvmls789hrm2iz9xlfm"; depends=[dplyr gee knitr MASS survey survival xtable]; }; taber = derive2 { name="taber"; version="0.1.0"; sha256="07a18kn65b4cxxf1z568n7adp6y3qx96nrff3a3714x241sd5p6i"; depends=[dplyr magrittr]; }; tablaxlsx = derive2 { name="tablaxlsx"; version="1.2.2"; sha256="1q7ap1dmymf3aj5g860794jfn9zrn3qiwwcdzl95lsbpkhgyspmz"; depends=[openxlsx]; }; - table_express = derive2 { name="table.express"; version="0.1.1"; sha256="0wmggi88g2fb242pwsj2apf0j3cygzx679xz41xyv00bba2ghs26"; depends=[data_table dplyr magrittr R6 rlang tidyselect]; }; + table_express = derive2 { name="table.express"; version="0.3.0"; sha256="0yrvq0psf6j11cbyhbk3aqskxqm3v9a9dkakmknmynzx4zp6p9fv"; depends=[data_table dplyr magrittr R6 rlang tidyselect]; }; table1 = derive2 { name="table1"; version="1.1"; sha256="01r6zlhv3d0ggniv6aaszmzqbappy9zycayiwwlknbwrgiwkp58z"; depends=[Formula htmltools knitr]; }; table1xls = derive2 { name="table1xls"; version="0.4.0"; sha256="0ixbshbp9hkcg12hj32vgb5bp0pj4rbc3i6g1xdg2zhqp7zanics"; depends=[XLConnect]; }; tableHTML = derive2 { name="tableHTML"; version="2.0.0"; sha256="19sa5sda4v5dr449ip9z9ah5hdph9q6vb6zbs93jn4rpkvyijny3"; depends=[htmltools jpeg magrittr png shiny webshot]; }; @@ -13561,26 +13757,28 @@ in with self; { taxizedb = derive2 { name="taxizedb"; version="0.1.4"; sha256="15gj9i18ysd83v9fidrrvw938dah04i10ahi3wh5dgjs5fd5ch2s"; depends=[curl DBI dbplyr dplyr hoardr magrittr RMySQL RPostgreSQL RSQLite]; }; taxlist = derive2 { name="taxlist"; version="0.1.6"; sha256="0p68izdhqggra14g6n93124qnwrxmdy5f9x0617fmix5yc23rww3"; depends=[foreign stringdist taxize vegdata]; }; taxonomizr = derive2 { name="taxonomizr"; version="0.5.3"; sha256="0hxvcbyr5b3sxqy5kw1q17qx7c2q90a6x79r9bmjn6c2lnrqn83i"; depends=[data_table R_utils RSQLite]; }; - taxotools = derive2 { name="taxotools"; version="0.0.30"; sha256="0xfjlfw3g2scqklh4lily30mpgc92pjjcfn41ygpfxc5adicrd71"; depends=[plyr sqldf taxize wikitaxa]; }; + taxotools = derive2 { name="taxotools"; version="0.0.35"; sha256="10rf071sarr94q5g174y97sl9qjlla7jgn4hplllv6s1wh10ag7c"; depends=[plyr sqldf taxize wikitaxa]; }; tbart = derive2 { name="tbart"; version="1.0"; sha256="0m8l9ic7na70il6r9ha0pyrjwznbgjq7gk5xwa5k9px4ysws29k5"; depends=[Rcpp sp]; }; tbd = derive2 { name="tbd"; version="0.1.0"; sha256="1wmfy3p82gckhfsslxzapryfygmircii7x24j6ysfyx52gy8iwf5"; depends=[numDeriv]; }; tbdiag = derive2 { name="tbdiag"; version="0.1"; sha256="1wr2whgdk84426hb2pf8iiyradh9c61gyazvcrnbkgx2injkz65q"; depends=[]; }; - tbl2xts = derive2 { name="tbl2xts"; version="0.1.2"; sha256="1zz310253s6gz0hzzldil5r03mm7ngvvnba7hxm8fm9dhfmvkbj6"; depends=[dplyr lazyeval PerformanceAnalytics xts zoo]; }; + tbl2xts = derive2 { name="tbl2xts"; version="0.1.3"; sha256="0yy0cpsflwx7fbql3vh0l87cvqgn0ghdqal4m7l9aplqhzdwxs3r"; depends=[dplyr lazyeval PerformanceAnalytics xts zoo]; }; tbm = derive2 { name="tbm"; version="0.3-0"; sha256="03bh98jn5rm3c159sbyx830cjf8yhpbn8jdgrmnqrwgr1fp5hdqf"; depends=[basefun coneproj mboost mlt sandwich variables]; }; tbrf = derive2 { name="tbrf"; version="0.1.2"; sha256="03n9s2n5y9d669l78v6s2dbk3sz51g5v28301ng2w082njrsvxhv"; depends=[boot dplyr lubridate purrr rlang tibble tidyr]; }; tcR = derive2 { name="tcR"; version="2.2.4"; sha256="17g26cq6zpcmg9kv32v0rvyqmml5wkbwra7p8f1cdzyc0zajbvn2"; depends=[data_table dplyr ggplot2 gridExtra gtable igraph Rcpp reshape2 scales stringdist]; }; tcgsaseq = derive2 { name="tcgsaseq"; version="1.8.1"; sha256="1v5b3qghygb81lqc2h1fijgw856b1778xndppq7r4b0zhhvb81ac"; depends=[CompQuadForm ggplot2 GSA KernSmooth statmod]; }; tcltk2 = derive2 { name="tcltk2"; version="1.2-11"; sha256="1ibxld379600xx7kiqq3fck083s8psry12859980218rnzikl65d"; depends=[]; }; tclust = derive2 { name="tclust"; version="1.4-1"; sha256="17md6l9v9dl9b72l84df01b52h2xiynbcjm437mv9mzcr09fc2sb"; depends=[]; }; - tcpl = derive2 { name="tcpl"; version="2.0.1"; sha256="16a245wvyckkc2hxq57gcwd4d29ri3c9nn44amwiy779gc2rb0sm"; depends=[data_table DBI numDeriv RColorBrewer RMySQL sqldf]; }; + tcpl = derive2 { name="tcpl"; version="2.0.2"; sha256="0xic4jy8ldawmkvvwckiyy57ai5wif9yn7hyfndbxr6mvjl3rbbc"; depends=[data_table DBI numDeriv RColorBrewer RMySQL sqldf]; }; tdROC = derive2 { name="tdROC"; version="1.0"; sha256="137j1m9pysjcz1gsfcym0438by3c7na21ccjlqf7xfccr1y8k2k6"; depends=[survival]; }; + tdigest = derive2 { name="tdigest"; version="0.3.0"; sha256="17axsir4xig3vm3sc2gziy9n0p80b14vg52nwys23bzkfp0n63bm"; depends=[magrittr]; }; tdr = derive2 { name="tdr"; version="0.13"; sha256="0i0hnb3fc4d1mbbxcpzmyfh1w2rahfjabg5iyxym3yjd6377al15"; depends=[ggplot2 lattice RColorBrewer]; }; tdsc = derive2 { name="tdsc"; version="1.0.0.1"; sha256="17nr5fa4f16ww8si8qikbqmixl38jxjy185b80ff2i5v4129mnwd"; depends=[data_table]; }; tdthap = derive2 { name="tdthap"; version="1.1-9"; sha256="0y01x0hcf0rw06cpn4pk17b0shf4v2c9was7vfs0zhsbq8qcwx7r"; depends=[]; }; tea = derive2 { name="tea"; version="1.0"; sha256="03wxhbgx17hl9bbzbfjmfa30q4fqszhs5y9imbp768fmzwbppn24"; depends=[eva]; }; teachingApps = derive2 { name="teachingApps"; version="1.0.4"; sha256="0wi25wdpkz7kh8r1s42wa9kiky8ilmcg8kgw0j1caygwg0bml2fa"; depends=[actuar BH d3heatmap data_table devtools diagram DiagrammeR dplyr DT dygraphs ggplot2 knitr leaflet magrittr markdown metricsgraphics miniUI networkD3 pacman plotly radarchart Rcpp RcppEigen RcppNumerical rprojroot scales shiny shinyAce shinydashboard shinythemes threejs tidyr visNetwork yaml]; }; tealeaves = derive2 { name="tealeaves"; version="1.0.0"; sha256="0hzih93h8c9gqvsmfaldq9jaw8hgvd4kmrlqlaqr6xhi6zhjqhf1"; depends=[crayon dplyr furrr future ggplot2 glue magrittr purrr rlang stringr tidyr units]; }; - teamcolors = derive2 { name="teamcolors"; version="0.0.1"; sha256="07mqsbhrsy23qc4j1w1wji36cbh6dijkp6p7g3598nlzhw7ln3aj"; depends=[]; }; + teamcolors = derive2 { name="teamcolors"; version="0.0.2"; sha256="1dns9z03n2bf8bda965wx243dacdm6ixp7zgzkvqr5mifcgmfafh"; depends=[dplyr ggplot2]; }; + teamr = derive2 { name="teamr"; version="0.0.1"; sha256="01gngws8lf093598wlzrv4ls74avsli6ij33v1plqgc0znyaw4s2"; depends=[httr jsonlite R6]; }; teda = derive2 { name="teda"; version="0.1.1"; sha256="0yx469jbkw9cgx73zi5mkykrdn16kn01zh524x9411314aa32avx"; depends=[]; }; teigen = derive2 { name="teigen"; version="2.2.2"; sha256="1k5k3lj6av5pyx130w1j7avd0jdmm12ryc71mi5mq49sp95ndl4v"; depends=[]; }; telefit = derive2 { name="telefit"; version="1.0.1"; sha256="05qnnp7bsv6q9230kikwk1r80f6v809cc2nv117w08nax4423vwx"; depends=[abind coda cowplot doRNG dplyr fields foreach ggplot2 gtable itertools mvtnorm raster Rcpp RcppArmadillo RcppEigen reshape2 scales scoringRules SDMTools sp stringr]; }; @@ -13597,18 +13795,19 @@ in with self; { tensorA = derive2 { name="tensorA"; version="0.36.1"; sha256="176hjy3bvg3in62r97wxbhq187sjz6c1gwy9x6spaxl6k4my3zy7"; depends=[]; }; tensorBF = derive2 { name="tensorBF"; version="1.0.2"; sha256="1dw1a6xqcsl4isbzbfiplgqq5nak5n9ffzm23mzzmkh1r1a8kl1y"; depends=[tensor]; }; tensorBSS = derive2 { name="tensorBSS"; version="0.3.5"; sha256="1m4g9jr2s37xys2q4gv6rqknrznd4nrppa7qrgygqywwlmnyid44"; depends=[ggplot2 ICtest JADE Rcpp RcppArmadillo tensor tsBSS]; }; - tensorflow = derive2 { name="tensorflow"; version="1.13.1"; sha256="0fv58ml67miq7cb0d66p880vs8c91v6gdz5xba9mxppbd63k5li8"; depends=[config jsonlite processx reticulate rstudioapi tfruns yaml]; }; + tensorflow = derive2 { name="tensorflow"; version="1.14.0"; sha256="0lw1k6s9x975w2nly32vp0157qc8jvmda2i6bpfmvf2xmadq0dr8"; depends=[config jsonlite processx reticulate rstudioapi tfruns yaml]; }; tensorr = derive2 { name="tensorr"; version="0.1.1"; sha256="18xdvp328h96jn8y1iayxh7cyz2s8j5nn43nq18pyaxq271hkfyh"; depends=[assertive_base assertive_properties assertive_types Matrix purrr]; }; tensr = derive2 { name="tensr"; version="1.0.1"; sha256="1z6b3ra7fgn88mxbhsq65x3frj5j7p17n119s9kbw7sg9y633vfx"; depends=[assertthat]; }; tergm = derive2 { name="tergm"; version="3.6.1"; sha256="03yd4l317airz84jfjyczjx43wi6sraid58lmxivm29xjk52xpi1"; depends=[coda ergm MASS network networkDynamic nlme robustbase statnet_common]; }; - tesseract = derive2 { name="tesseract"; version="4.0"; sha256="1dadr3q0g8vr44rc0xmhism8llq3awl4svvrcghlrv7m85zps9ih"; depends=[curl digest pdftools rappdirs Rcpp]; }; + ternvis = derive2 { name="ternvis"; version="1.2"; sha256="057i6i3ygxrin0npc18gsg3dpdldzafyb5sr6lix5mhy6b09lkxf"; depends=[dichromat maps quadprog]; }; + tesseract = derive2 { name="tesseract"; version="4.1"; sha256="1a7cf48n7hdd6inqz23ifqhq6kx6wxri34a79ns2vxaj6f4llxf0"; depends=[curl digest pdftools rappdirs Rcpp]; }; testDriveR = derive2 { name="testDriveR"; version="0.5.1"; sha256="0wjdqvsyv33fsg1lljp9m0bhz38mpfgpgickgj4zdspc9x6lbnv6"; depends=[]; }; testassay = derive2 { name="testassay"; version="0.1.0"; sha256="06gks3k04m45kn946i525261v33ymwxpvgdy84kc7sp01xxx4rfv"; depends=[]; }; tester = derive2 { name="tester"; version="0.1.7"; sha256="1x5m43abk3x3fvb2yrb1xwa7rb4jxl8wjrnkyd899ii1kh8lbimr"; depends=[]; }; testextra = derive2 { name="testextra"; version="0.1.0"; sha256="0n5d3a4fnqb9bc47sha5zyi18gd9k6hm1jkjlb7apk43zry6n0y8"; depends=[assertthat parsetools pkgcond postlogic purrr rlang stringi testthat]; }; testforDEP = derive2 { name="testforDEP"; version="0.2.0"; sha256="1mgzhj8b35r5cm4bl0nnyxj0h7rwd28d17qvgvaky2kvm2r83cf9"; depends=[Hmisc minerva Rcpp]; }; testit = derive2 { name="testit"; version="0.9"; sha256="0mayvbzfg7zkr9n38h0z9rkzxgpsck5vimfbgm70ww1ckggv7xlw"; depends=[]; }; - testthat = derive2 { name="testthat"; version="2.1.1"; sha256="03jgr0hlr77yp0aib4v30yjyjrjsa8dczr02yk21m93vl25vqvkp"; depends=[cli crayon digest magrittr praise R6 rlang withr]; }; + testthat = derive2 { name="testthat"; version="2.2.1"; sha256="0y0bvggm4pzkzp6xn7b8cf3ybqp9ijxkhhyp3z49a9iipc90bvk7"; depends=[cli crayon digest evaluate magrittr praise R6 rlang withr]; }; testthis = derive2 { name="testthis"; version="1.1.0"; sha256="1ci7q25f8lq7mvigdj48gvpi75j08s0kll72kwa88xyfx9q8m3yl"; depends=[assertthat devtools fs magrittr pkgload rprojroot stringi testthat usethis]; }; tetraclasse = derive2 { name="tetraclasse"; version="0.1.21"; sha256="1cl2cah0xi6x3rvvdy56iszai6rkbxc1w3x13v0l1z1nryff7c6a"; depends=[dplyr FactoMineR ggplot2 ggrepel magrittr reshape2 tibble tidyr]; }; texPreview = derive2 { name="texPreview"; version="1.3.2"; sha256="0gg46iy4s17gri28g0nvqibm8wy4c6mj1hc5iyj6dsn4jskvpfmy"; depends=[base64enc htmltools magick rematch2 rstudioapi svgPanZoom whisker xml2]; }; @@ -13619,7 +13818,7 @@ in with self; { textTinyR = derive2 { name="textTinyR"; version="1.1.3"; sha256="0z9k978yk54zxrrjajcb0nanfhfpxm2bq2vbmk6w5s194da6y3xl"; depends=[BH data_table Matrix R6 Rcpp RcppArmadillo]; }; textcat = derive2 { name="textcat"; version="1.0-6"; sha256="0639b1qbi8779lskk5ms0sbbnmy2s73b3w96abbr70mrh0s2f9rw"; depends=[slam tau]; }; textclean = derive2 { name="textclean"; version="0.9.3"; sha256="0kgjh6c4f14qkjc4fds7q7rpf4nkma3p0igm54fplmm3p853nvrz"; depends=[data_table english glue lexicon mgsub qdapRegex stringi textshape]; }; - textdata = derive2 { name="textdata"; version="0.1.0"; sha256="12w1xz6ll03zbzynbv1mnncmi92byiaybxf70j6nppm6bj2qf3dz"; depends=[fs rappdirs readr tibble]; }; + textdata = derive2 { name="textdata"; version="0.2.0"; sha256="1rksgkkwm4il3bw3vg19207r331rs0i3aqcn1x83y9cyvn15y8wm"; depends=[fs rappdirs readr tibble]; }; texteffect = derive2 { name="texteffect"; version="0.3"; sha256="1qcbr18h3vakh6ymw4axzqcqrpss6z68a592xl879b82l2nlq8a7"; depends=[boot ggplot2 MASS]; }; textfeatures = derive2 { name="textfeatures"; version="0.3.2"; sha256="0k0qcw1r76d3igmphw0kg1ncd26zfqz4hbrhf6s3r0j16i14jlx0"; depends=[dplyr purrr rlang text2vec tfse tibble tokenizers]; }; textgRid = derive2 { name="textgRid"; version="1.0.1"; sha256="1wi5vq5f7ixhz39l5hqi2jlmjjacx4lyrs4h8xfbd47pj6g16lc6"; depends=[]; }; @@ -13636,6 +13835,7 @@ in with self; { textshape = derive2 { name="textshape"; version="1.6.0"; sha256="1pl85wjq5rl25gdlh4cp0l14hn76rrmpl7l1fn7kq9lwj9yfpcs8"; depends=[data_table slam stringi]; }; textstem = derive2 { name="textstem"; version="0.1.4"; sha256="1pbhi5ia3w16vsix2x3if51zd2v9bcv0j4lj9hfikgq1yz9zxmw2"; depends=[dplyr hunspell koRpus koRpus_lang_en lexicon quanteda SnowballC stringi textclean textshape]; }; textutils = derive2 { name="textutils"; version="0.1-11"; sha256="12vx89k49js7k7h2ay1qx345infr5gns8bhvlm3jinrm9saj0f54"; depends=[]; }; + tfCox = derive2 { name="tfCox"; version="0.1.0"; sha256="06mbiz1jwp8mv5dbwyvdvy1wpp8s3xp9hhsm94vrbvjaxg680g28"; depends=[Rcpp survival]; }; tfdatasets = derive2 { name="tfdatasets"; version="1.13.1"; sha256="19szgpb040v33hicrqdigjpg3z6jph0fxx6rh8ln16hk4sb2rd2d"; depends=[magrittr reticulate rlang tensorflow tidyselect]; }; tfdeploy = derive2 { name="tfdeploy"; version="0.6.1"; sha256="1vbxyvmzaafbwp1pmvzn16zyl4nz85787m79gn7iazh9zw9f7j34"; depends=[httpuv httr jsonlite magrittr reticulate swagger tensorflow]; }; tfer = derive2 { name="tfer"; version="1.1"; sha256="19d31hkxs6dc4hvj5495a3kmydm29mhp9b2wp65mmig5c82cl9ck"; depends=[]; }; @@ -13673,7 +13873,7 @@ in with self; { tibbrConnector = derive2 { name="tibbrConnector"; version="1.5.1"; sha256="1r58myi7x4hqqvyrphxy4ppa1lnad6x2ginfq2j52ax53zr07ajp"; depends=[RCurl rjson]; }; tictactoe = derive2 { name="tictactoe"; version="0.2.2"; sha256="1fx8plj5zr04xwk5hfj3zqhcknidxlzya2q14cf0m3y33a86lx42"; depends=[hash]; }; tictoc = derive2 { name="tictoc"; version="1.0"; sha256="1zp2n8k2ax2jjw89dsri268asmm5ry3ijf32wbca5ji231y0knj7"; depends=[]; }; - tidyLPA = derive2 { name="tidyLPA"; version="1.0.2"; sha256="02alsv44v8yf23aibpchichwn6yrmwy2751a18kaj8azgz1x7i07"; depends=[dplyr ggplot2 mclust mix MplusAutomation tibble]; }; + tidyLPA = derive2 { name="tidyLPA"; version="1.0.3"; sha256="0vx2zzajisf2hcwbd1r6b0qmp330pp5x1w4sikm5zdbxrq0ws7y3"; depends=[dplyr ggplot2 mclust mix MplusAutomation tibble]; }; tidyRSS = derive2 { name="tidyRSS"; version="1.2.11"; sha256="0ikizs24frvv888zxris6j41lfcvy7hrp5z3h3mk5vxdlqi3rag7"; depends=[dplyr httr jsonlite lubridate magrittr purrr sf stringr testthat tibble xml2]; }; tidybayes = derive2 { name="tidybayes"; version="1.1.0"; sha256="1mq6gqr66pqrwdmnk3fmfi508ds086k7jnlazi5mczn4r6pdyzd7"; depends=[arrayhelpers coda dplyr forcats ggplot2 ggstance HDInterval magrittr plyr purrr rlang tibble tidyr tidyselect]; }; tidyboot = derive2 { name="tidyboot"; version="0.1.1"; sha256="0nss1ci763g9p5f33g163ppamx72axc8xhrils0cql3ka8439pmn"; depends=[dplyr modelr purrr rlang tidyr]; }; @@ -13684,11 +13884,13 @@ in with self; { tidyhydat = derive2 { name="tidyhydat"; version="0.4.0"; sha256="0k239xixq6x9xb51ipmxn7ph72ibqa9s9sp79gkabgawc0lij6q0"; depends=[cli crayon DBI dbplyr dplyr httr lubridate rappdirs readr rlang RSQLite tidyr]; }; tidyimpute = derive2 { name="tidyimpute"; version="0.1.0"; sha256="03b475nn206hxq3i0n7j1qws82rwwk5vqivmdg5mff44dvz4gl5s"; depends=[dplyr na_tools rlang]; }; tidylog = derive2 { name="tidylog"; version="0.1.0"; sha256="0mwd9crb0a0c8gpchsdjcap56fc602h1x7bk5f0rvvmw41xz06kn"; depends=[dplyr glue]; }; + tidymargins = derive2 { name="tidymargins"; version="0.1.0"; sha256="1r782h6a5fhk9yb9ixjbpq3a9g56j3xz1871fsndkfigbzz39w51"; depends=[assertthat dplyr forcats magrittr pkgcond purrr rlang tidyr tidyselect]; }; tidymodels = derive2 { name="tidymodels"; version="0.0.2"; sha256="1hidjrayqxz1g7bn20pqs1bwyx4cxxqx9dq5lwqyfsij0ir0lia9"; depends=[broom cli crayon dials dplyr ggplot2 infer magrittr parsnip pillar purrr recipes rlang rsample rstudioapi tibble tidyposterior tidypredict tidytext yardstick]; }; tidymv = derive2 { name="tidymv"; version="2.2.0"; sha256="0g550b0frgk4wy3sicsqqinffrlbqzghhcnvh3snci6xd7j37hmm"; depends=[dplyr ggplot2 itsadug magrittr mgcv rlang tibble tidyr]; }; tidync = derive2 { name="tidync"; version="0.2.1"; sha256="1w6ciyk4024aad6japfar1pq4q9bygcgl5avzg2l8c7mcqd58rvl"; depends=[dplyr forcats magrittr ncdf4 ncmeta purrr rlang RNetCDF tibble tidyr]; }; + tidypmc = derive2 { name="tidypmc"; version="1.7"; sha256="1fijlvdiw4vwm34wizm4xlm0x10vvpkldzk7rrla44apq7y2w3yq"; depends=[dplyr readr stringr tibble tokenizers xml2]; }; tidyposterior = derive2 { name="tidyposterior"; version="0.0.2"; sha256="1sdbar3ycnjqyjy664zyhr9xks48l6g6mw8p5scp31x3gdh352rs"; depends=[dplyr generics ggplot2 purrr rlang rsample rstanarm tibble tidyr]; }; - tidypredict = derive2 { name="tidypredict"; version="0.3.0"; sha256="1c0j69b976s6gz6vm8ql2mjnl8awzs25vpjkjfsvclpzalldcq06"; depends=[dplyr knitr purrr rlang]; }; + tidypredict = derive2 { name="tidypredict"; version="0.4.2"; sha256="16lrn7gj9vrshhk3kfk57m7pllicmy7f98fm05y12ir5a8mbz9d1"; depends=[dplyr generics knitr purrr rlang tibble]; }; tidyquant = derive2 { name="tidyquant"; version="0.5.6"; sha256="0mnhn00fw3xl2k11m4c1ngfh0p6fz2am0dv1pv8hnfp1mp31bxrv"; depends=[dplyr ggplot2 httr lazyeval lubridate magrittr PerformanceAnalytics purrr Quandl quantmod rlang stringr tibble tidyr tidyverse timetk TTR xml2 xts]; }; tidyqwi = derive2 { name="tidyqwi"; version="0.1.1"; sha256="0qrwclaz6cf2wg3rkg2nqjygflj0a1mx4cfbv5lx4r194km2dmr9"; depends=[dplyr furrr future httr jsonlite labelled magrittr purrr stringr tidyr xml2]; }; tidyr = derive2 { name="tidyr"; version="0.8.3"; sha256="0dyc4b03wi65bk7j0ma0y188syh37h57wgxji82i0h8j6pn593x1"; depends=[dplyr glue magrittr purrr Rcpp rlang stringi tibble tidyselect]; }; @@ -13697,17 +13899,17 @@ in with self; { tidystats = derive2 { name="tidystats"; version="0.3"; sha256="11bl4m14n29fcy9g3b0sx10fx2kl6949fczzdzw2cllqn2krfx45"; depends=[dplyr kableExtra knitr magrittr miniUI purrr readr rlang shiny stringr tibble tidyr]; }; tidystopwords = derive2 { name="tidystopwords"; version="0.9.0"; sha256="1zw6rz8fs8mynaqhrxidrar8vyiq73i8hl4h2lrfz83rxrihbq39"; depends=[dplyr stringr]; }; tidystringdist = derive2 { name="tidystringdist"; version="0.1.4"; sha256="1srxh5gyspcghzvnmpyq36ky608ipf71vv0s1jg01mgf2i5pdkf4"; depends=[attempt rlang stringdist tibble]; }; - tidytext = derive2 { name="tidytext"; version="0.2.1"; sha256="110xwmdv4yxgyfw51zb1x9hwi4xdx3wqxpg1xq2vgkvcy6acnb7v"; depends=[dplyr generics hunspell janeaustenr Matrix purrr rlang stopwords stringr tokenizers]; }; - tidytidbits = derive2 { name="tidytidbits"; version="0.2.0"; sha256="194b5j1f8ap0rl6v227wpz4vbps3iw60k4wryk12yw4z4xp0l9xw"; depends=[dplyr extrafont forcats magrittr purrr rlang stringr tibble tidyr tidyselect]; }; + tidytext = derive2 { name="tidytext"; version="0.2.2"; sha256="1h1fpy86fha3jidb1xz0n3mfn7110mmf3dz9hpyfczqpyd62k3qq"; depends=[dplyr generics hunspell janeaustenr Matrix purrr rlang stopwords stringr tokenizers]; }; + tidytidbits = derive2 { name="tidytidbits"; version="0.2.1"; sha256="1hyqk8p4w1mjk9f497f2lh8hlic6fs37jnawqpfmrl39ylx4z6r7"; depends=[dplyr extrafont forcats magrittr purrr rlang stringr tibble tidyr tidyselect]; }; tidytransit = derive2 { name="tidytransit"; version="0.5.1"; sha256="1vbcaqjr020qxgx4fpca2hhgjcq2j86rzyhxmsizjj68fr9963p9"; depends=[assertthat data_table digest dplyr here hms htmltools httr lubridate magrittr readr rlang scales sf stringr tibble tidyr zip]; }; - tidytree = derive2 { name="tidytree"; version="0.2.4"; sha256="04bznlfs617plv258nmsyq2pywnijcnzy2pbn5b2fgjk2xqkp29w"; depends=[ape dplyr lazyeval magrittr rlang tibble]; }; + tidytree = derive2 { name="tidytree"; version="0.2.5"; sha256="0vfjv33352dmk9cr2qn0knzg761068rdk6jg32csd9vpmcma8awp"; depends=[ape dplyr lazyeval magrittr rlang tibble]; }; tidyverse = derive2 { name="tidyverse"; version="1.2.1"; sha256="0yy3fkjksgcn6wkbgsb0pbnmsyqs4m01mziqafhig578nixs4rxd"; depends=[broom cli crayon dbplyr dplyr forcats ggplot2 haven hms httr jsonlite lubridate magrittr modelr purrr readr readxl reprex rlang rstudioapi rvest stringr tibble tidyr xml2]; }; tidyxl = derive2 { name="tidyxl"; version="1.0.4"; sha256="19kcm9lfbkf61z0whfkn69b8m36qd1rvyhyk5y0cqbzkxvq8f70i"; depends=[piton Rcpp]; }; 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]; }; tigerhitteR = derive2 { name="tigerhitteR"; version="1.1.0"; sha256="0inyi12lf8bn7nbklf2rjixk6wrgrjcp8njv7knai4dgvv7v0rfa"; depends=[Hmisc magrittr openxlsx zoo]; }; tigerstats = derive2 { name="tigerstats"; version="0.3"; sha256="12wrghipgypkhwwkmaxb6n0qx9fgxk82dc6wlh56rblsvciv2hj0"; depends=[abd ggplot2 lattice manipulate MASS mosaic mosaicData]; }; - tigger = derive2 { name="tigger"; version="0.3.1"; sha256="1ay8al764adpzabwsinxg97y2mz28k6y1m8ckfxhi9h11az23hid"; depends=[alakazam doParallel dplyr foreach ggplot2 gridExtra gtools iterators lazyeval rlang shazam stringi tidyr]; }; + tigger = derive2 { name="tigger"; version="0.4.0"; sha256="1ns4shv4aaxlgahy9vy3wxxrnrz4zb0w40fcsldmh5jrvbxhhsb6"; depends=[alakazam doParallel dplyr foreach ggplot2 gridExtra gtools iterators lazyeval rlang shazam stringi tidyr]; }; tightClust = derive2 { name="tightClust"; version="1.1"; sha256="0vqkp2g6z8y3b6dhzglmacjhf2qi1sg80kb941mwfafin2k40zbm"; depends=[]; }; tigreBrowserWriter = derive2 { name="tigreBrowserWriter"; version="0.1.5"; sha256="0izgx1khci6qc6pz85dxj75kzxvpr30l0vhcv9476jrcbwqs4k8m"; depends=[DBI RSQLite]; }; tigris = derive2 { name="tigris"; version="0.8.2"; sha256="03hlwykm14j8il53yslii8npfr42plj87maq120crhijafr6m3gd"; depends=[dplyr httr magrittr maptools rappdirs rgdal sf sp stringr uuid]; }; @@ -13727,7 +13929,7 @@ in with self; { timelineR = derive2 { name="timelineR"; version="0.1.0"; sha256="1a2pdy5b9nca66khydrb50yzjglr78lxrgzisw6bp2simk5cix51"; depends=[dplyr futile_logger ggplot2 gtable lubridate mtconnectR stringr]; }; timelineS = derive2 { name="timelineS"; version="0.1.1"; sha256="076w8ckzzl59bc1gnwjgdwynnz86320hyfmzb0k26hl3k13jlmxs"; depends=[dplyr ggplot2 lubridate magrittr]; }; timeordered = derive2 { name="timeordered"; version="0.9.9"; sha256="0rfga5i6kckmlz2dzqb1pp634dl93wxp7v3kisxlbjl7mgnbck3k"; depends=[igraph plyr]; }; - timereg = derive2 { name="timereg"; version="1.9.3"; sha256="1hlj9qhzfyz3lqnlpn9r0madmik592zsgaxlnggf3r437nkbynwc"; depends=[lava numDeriv survival]; }; + timereg = derive2 { name="timereg"; version="1.9.4"; sha256="0jxm3h2sjc83klxdry5r1wgliadk6967cmiifycfpz282vpfxx7v"; depends=[lava numDeriv survival]; }; timesboot = derive2 { name="timesboot"; version="1.0"; sha256="1ixmcigi1bf42np93md8d3w464papg9hp85v0c3hg3vl4nsm2bji"; depends=[boot]; }; timeseriesdb = derive2 { name="timeseriesdb"; version="0.4.1"; sha256="1ghb3lg63fs9zx34l5qczv39mdccnmqzlc74l1zhb8qmsg8sm1g2"; depends=[data_table DBI jsonlite openxlsx RPostgreSQL shiny xtable xts zoo]; }; timetk = derive2 { name="timetk"; version="0.1.1.1"; sha256="0ca6xnsidc98yjb52gbafvfgxzdgszj8l9hvc77mwgc33g0ydvs1"; depends=[devtools dplyr forecast lazyeval lubridate padr purrr readr stringi tibble tidyr xts zoo]; }; @@ -13767,8 +13969,8 @@ in with self; { tm_plugin_mail = derive2 { name="tm.plugin.mail"; version="0.2-1"; sha256="0rn8jqv622qmc0zkz534ka5qnbca2rlabxm3vjbqplr6fh1ahwb1"; depends=[NLP tm]; }; tm_plugin_webmining = derive2 { name="tm.plugin.webmining"; version="1.3"; sha256="1694jidf01ilyk286q43bjchh1gg2fk33a2cwsf5jxv7jky3gl7h"; depends=[boilerpipeR NLP RCurl RJSONIO tm XML]; }; tm1r = derive2 { name="tm1r"; version="1.1.2"; sha256="0ssxp1qfc4fa98l8qy2wnsfqg0hhmq0qs7rhsjp4jgrw1wdff4jk"; depends=[httr jsonlite]; }; - tmap = derive2 { name="tmap"; version="2.2"; sha256="0dvplmwmin4zpz5n46f2yr2zibfmfs6gc6byb68c508k6m08b6vx"; depends=[classInt htmltools htmlwidgets leaflet mapview raster RColorBrewer sf tmaptools units viridisLite]; }; - tmaptools = derive2 { name="tmaptools"; version="2.0-1"; sha256="0zfj2q3p4xmb7xzpiidfn20g569fscyhryzcpmvwkp98a7fg9swz"; depends=[classInt dichromat KernSmooth lwgeom magrittr raster RColorBrewer rgdal rgeos sf sp units viridisLite XML]; }; + tmap = derive2 { name="tmap"; version="2.3"; sha256="1vkh2dkyp96d0wpvwkflmhjsi8vhycdchxd0imixpqi4hg5037v2"; depends=[classInt htmltools htmlwidgets leaflet leafsync raster RColorBrewer sf tmaptools units viridisLite]; }; + tmaptools = derive2 { name="tmaptools"; version="2.0-2"; sha256="1n8m4c3q7i60p8r2xfhw8rfqmflyaicf8y1bkfkmx74afz6hv184"; depends=[classInt dichromat KernSmooth lwgeom magrittr raster RColorBrewer rgdal rgeos sf sp units viridisLite XML]; }; tmbstan = derive2 { name="tmbstan"; version="1.0.2"; sha256="1g4b415k36wij028xz15kwpv8hmx92kznsp231bnrprzw2vrninr"; depends=[BH Rcpp RcppEigen rstan StanHeaders TMB]; }; tmcn = derive2 { name="tmcn"; version="0.2-12"; sha256="1gqmq3f0plgd44056905l5jd7x9k4ls06hcp006w8skxj1rnwzb9"; depends=[]; }; tmg = derive2 { name="tmg"; version="0.3"; sha256="0yqavibinzsdh85izzsx8b3bb9l36vzkp5a3bdwdbh410s62j68a"; depends=[Rcpp RcppEigen]; }; @@ -13776,7 +13978,7 @@ in with self; { tmle_npvi = derive2 { name="tmle.npvi"; version="0.10.0"; sha256="00jav1ql3lv18wh9msxnjvz36z2ds44fdi6lrp1pfphh1in4vdcl"; depends=[geometry MASS Matrix R_methodsS3 R_oo R_utils]; }; tmod = derive2 { name="tmod"; version="0.40"; sha256="157m5jjkfd7g9aih5zylxzwkkdryj9l6yapgwjqydvwj6ab6k67l"; depends=[beeswarm plotwidgets tagcloud XML]; }; tmpm = derive2 { name="tmpm"; version="1.0.3"; sha256="1fqk39zyc07gh0ygi7pfljlnj6ih37jsb7bcxm05zcd4796wil8j"; depends=[reshape2]; }; - tmt = derive2 { name="tmt"; version="0.1.9-3"; sha256="0l4q21qq1srcfldwfwmc1w0wpi0zjpngpjrp6w287vgnqjc8y7kx"; depends=[ggplot2 Rcpp]; }; + tmt = derive2 { name="tmt"; version="0.2.1-0"; sha256="1drb0z9jk76ixn3qw7xb5rirfc9h0frkhl1krs681aiaspqkgswj"; depends=[ggplot2 Rcpp]; }; tmvmixnorm = derive2 { name="tmvmixnorm"; version="1.0.2"; sha256="04bjdlrz82v9skirap2fmngi2sv9xakkgmkgpwdv3qshszvx3wz4"; depends=[]; }; tmvnsim = derive2 { name="tmvnsim"; version="1.0-2"; sha256="03xsvsg9bqvgl98ywid3h91mmlhax5s6wvmypp3hq91vmc5kvxlp"; depends=[]; }; tmvtnorm = derive2 { name="tmvtnorm"; version="1.4-10"; sha256="1w3kmpx25l7rb80vpclqq4pbbv12qgysyqxjq3lp55l9nklkb7qs"; depends=[gmm Matrix mvtnorm]; }; @@ -13787,12 +13989,14 @@ in with self; { togglr = derive2 { name="togglr"; version="0.1.33"; sha256="105c9vxa67bqccj31ksk5myfd0v7v0wbz6qqjhxqndlg7v6ggfzc"; depends=[assertthat dplyr getPass glue httr jsonlite keyring lubridate magrittr parsedate prettyunits purrr rstudioapi]; }; tokenbrowser = derive2 { name="tokenbrowser"; version="0.1.0"; sha256="1kbw5bsghhpxd1742wgq2pw2y52s2vhbk0w8qiw6qagvx2dq5z52"; depends=[Rcpp stringi]; }; tokenizers = derive2 { name="tokenizers"; version="0.2.1"; sha256="006xf1vdrmp9skhpss9ldhmk4cwqk512cjp1pxm2gxfybpf7qq98"; depends=[Rcpp SnowballC stringi]; }; + tokenizers_bpe = derive2 { name="tokenizers.bpe"; version="0.1.0"; sha256="1pwgjrzdcsafpv9rlyly6fckcjiymz0xcjm9byavj069kc4c69mi"; depends=[Rcpp]; }; tolBasis = derive2 { name="tolBasis"; version="1.0"; sha256="0g4jdwklx92dffrz38kpm1sjzmvhdqzv6mj6hslsjii6sawiyibh"; depends=[lubridate polynom]; }; tolerance = derive2 { name="tolerance"; version="1.3.0"; sha256="17qh4ad1f3fbcpwlxxqh8qr9bnwjcl4yxk0l3fkbr6b2l4rc5p86"; depends=[rgl]; }; toolmaRk = derive2 { name="toolmaRk"; version="0.0.1"; sha256="0pdr8lq4c11ia03v68lbfq38p3qp770mbj0nsbjsgbqi0pv9i1vx"; depends=[dplyr ggplot2 plyr reshape2]; }; tools4uplift = derive2 { name="tools4uplift"; version="0.1-1"; sha256="0difrjqgj8amc49mwh059ca9mr0z1fzy0g43vk43alsyl8lvajc4"; depends=[dplyr glmnet]; }; topicmodels = derive2 { name="topicmodels"; version="0.2-8"; sha256="19msp5cz67ff4v1gfd8vhjnnsmwfkxiv08ym4k506j2mhaklipci"; depends=[modeltools slam tm]; }; topmodel = derive2 { name="topmodel"; version="0.7.3"; sha256="15w9id90d6l0i0ji3ln3sxnpispb6pgabk4waysqn0nh6y4lfdgb"; depends=[]; }; + topoDistance = derive2 { name="topoDistance"; version="1.0.1"; sha256="055z3gvqlb8nyy58ix89w7miav9gj3h43a4wcfc3kagd97xc3222"; depends=[gdistance igraph plotly raster RColorBrewer scales sp]; }; topologyGSA = derive2 { name="topologyGSA"; version="1.4.6"; sha256="0vas7qab5a86jb277ql63qjvfvx7iqqbcrwky7iyr0s8p8p794ia"; depends=[fields graph gRbase qpgraph]; }; topsis = derive2 { name="topsis"; version="1.0"; sha256="056cgi684qy2chh1rvhgkxwhfv9nnfd7dfzc05m24gy2wyypgxj3"; depends=[]; }; tor = derive2 { name="tor"; version="1.1.1"; sha256="0vibnjm0q8rn73c5xdbfw5z4pk4ja1m1mx9c6p423pz72znwrcpw"; depends=[fs readr rlang tibble]; }; @@ -13813,6 +14017,7 @@ in with self; { tracheideR = derive2 { name="tracheideR"; version="0.1.1"; sha256="1x1jwzgs2aqb3k17mm9mhfhnbwcmilhkjaz9rl40rcg84xjqdrpl"; depends=[tgram]; }; track = derive2 { name="track"; version="1.1.9"; sha256="1d0hab7xyayyhyyrbv8nvpka1kzry4yx10fg8aqwkca3nm7n2q3c"; depends=[]; }; trackdem = derive2 { name="trackdem"; version="0.4.3"; sha256="04gjvm4dxdy7nwaq6f0nbvqb2hbvmava5x6q5kvyy7snsr8mx25f"; depends=[MASS neuralnet png raster Rcpp RcppArmadillo SDMTools shiny]; }; + trackdf = derive2 { name="trackdf"; version="0.2.1"; sha256="18kiwbrfalj19gjp2v3yhxlmc6liw5scfnwx2svq5f5h3h54a7iz"; depends=[data_table lubridate rgdal sp tibble]; }; trackeR = derive2 { name="trackeR"; version="1.5.2"; sha256="1f3giz6naxxyicgy9v0391ang43srwhy9zbiv4zmlc8i9v05b57i"; depends=[fda foreach ggmap ggplot2 ggridges gridExtra gtable jsonlite leaflet raster RSQLite scam sp xml2 zoo]; }; trackeRapp = derive2 { name="trackeRapp"; version="1.0"; sha256="05r012kcf86j45q00y6ynz9srd0by45w41bpx9mf7q4h8m5nm0jn"; depends=[changepoint colorspace DT foreach mapdeck mgcv plotly sf shiny shinydashboard shinyjs shinyWidgets trackeR V8 zoo]; }; trackr = derive2 { name="trackr"; version="0.10.5"; sha256="0cngwszax3i9p0095kxrz7w4rnryc0lmylckixzrmhx80qkxcaw1"; depends=[CodeDepends fastdigest ggplot2 gridGraphics histry htmltools lattice miniUI RJSONIO rlang rmarkdown roprov rsolr shiny]; }; @@ -13820,6 +14025,7 @@ in with self; { trade = derive2 { name="trade"; version="0.5.4"; sha256="05skmm2j826wjhmxdvkln50y0mjy74qcl2hay2l1322qqs7phin6"; depends=[antitrust]; }; tradestatistics = derive2 { name="tradestatistics"; version="0.2"; sha256="0g2ag7ns1y1b76q6aygkr15dp7zd51fa01nm7q9fd7had07x3sgd"; depends=[crul dplyr jsonlite magrittr purrr rlang stringr]; }; trafo = derive2 { name="trafo"; version="1.0.1"; sha256="0gq3snjpkw0ncny7pkfi686qkgdhd8id73jxjk3chhqf5mzrrsbc"; depends=[FNN lmtest moments pryr]; }; + traipse = derive2 { name="traipse"; version="0.1.0"; sha256="0174rxc3p3s848s9ynkkw32f33dq9gnq7zd14i3b9xnp8zr9jnph"; depends=[geodist geosphere magrittr]; }; traitdataform = derive2 { name="traitdataform"; version="0.5.5"; sha256="1gf03gyva4f00bhzcb1x1hsghra15yrhfrr9cprmvax6bgrq64bp"; depends=[data_table getPass plyr RCurl reshape2 taxize units XML]; }; traitr = derive2 { name="traitr"; version="0.14"; sha256="1pkc8wcq55229wkwb54hg9ndbhlxziv51n8880z6yq73zac1hbmf"; depends=[digest gWidgets proto]; }; traits = derive2 { name="traits"; version="0.4.2"; sha256="1aiy7mdwji72rrmf8gwmnpkhfbqbqbblffxghniw5pfpv55j6mib"; depends=[crul data_table hoardr httr jsonlite readr rvest taxize tibble xml2]; }; @@ -13833,7 +14039,7 @@ in with self; { translate = derive2 { name="translate"; version="0.1.2"; sha256="1w0xrg1xxwfdanlammmixf06hwq700ssbjlc3cfigl50p87dbc5x"; depends=[functional lisp RCurl RJSONIO]; }; translateR = derive2 { name="translateR"; version="1.0"; sha256="11kh9hjpsj5rfmzybnh345n1gzb0pdksrjp04nzlv948yc0mg5gm"; depends=[httr RCurl RJSONIO textcat]; }; translation_ko = derive2 { name="translation.ko"; version="0.0.1.5.2"; sha256="1w5xibg4znhd39f3i0vsqckp6iia43nblqxnzgj0ny6s7zmdq1wd"; depends=[]; }; - transport = derive2 { name="transport"; version="0.11-1"; sha256="1hg4mhmjsvr2cqj0d21qwyrachlha9q119p8zjhly4zcyp4yz7wp"; depends=[Rcpp]; }; + transport = derive2 { name="transport"; version="0.11-2"; sha256="1lpzivhv0fbcas6yhri064z2hian8flslz2zq3m33fh43jqqs1qg"; depends=[Rcpp]; }; trapezoid = derive2 { name="trapezoid"; version="2.0-0"; sha256="0f6rwmnn61bj97xxdgbydi94jizv1dbq0qycl60jb4dsxvif8l3n"; depends=[]; }; trawl = derive2 { name="trawl"; version="0.2.1"; sha256="1ns4nk8zdnl2z9clc2q38sbb1ijkj86lcifxq7d111mcwsmpb6fi"; depends=[DEoptim MASS rootSolve Runuran squash TSA]; }; tree = derive2 { name="tree"; version="1.0-40"; sha256="1rr6ws62j9h36f3nl713f8h3ndkh95mv46l055jvgmby5lw1dazz"; depends=[]; }; @@ -13849,7 +14055,7 @@ in with self; { treemap = derive2 { name="treemap"; version="2.4-2"; sha256="15bdgkdwryb55v82b3hpcx4ykfg5z7zf10h0wwknf6kl1kn34v90"; depends=[colorspace data_table ggplot2 gridBase igraph RColorBrewer shiny]; }; treemapify = derive2 { name="treemapify"; version="2.5.3"; sha256="1y6fyzxk542fp4h975xfgajz7cjym3rjs6asal9arv94a9cqra33"; depends=[ggfittext ggplot2]; }; treeperm = derive2 { name="treeperm"; version="1.6"; sha256="0mz7p9khrsq4dbkijymfvlwr01y4fvs0x6si4x5xid16s2zsnmm4"; depends=[]; }; - treeplyr = derive2 { name="treeplyr"; version="0.1.6"; sha256="0ds3188ijhbffbxpgnr6pv14payh8is6pcxk2h331iqkra71n74j"; depends=[ape dplyr geiger lazyeval phytools Rcpp]; }; + treeplyr = derive2 { name="treeplyr"; version="0.1.7"; sha256="11y15dslalwifarz79zyc5vxszyajkjyzm98p0w1n8gfr6lrq9yy"; depends=[ape dplyr geiger lazyeval phytools Rcpp]; }; treespace = derive2 { name="treespace"; version="1.1.3.1"; sha256="0wnzc4fw23yi28a5hdl381kbkqxsqwyq3b3ljw1hfy89rpyy2v8c"; depends=[ade4 adegenet adegraphics adephylo ape combinat distory fields htmlwidgets MASS phangorn phytools Rcpp rgl RLumShiny scatterD3 shiny shinyBS]; }; treestartr = derive2 { name="treestartr"; version="0.1.0"; sha256="05rxy9lmb77ng4266871sd881mlp4rd5qalvsd7ps2x2j4plaqf4"; depends=[ape phytools]; }; treethresh = derive2 { name="treethresh"; version="0.1-11"; sha256="1fksyn9mycr6dpw1yh5b3fa7fk7ndz7q39174daplm55jbrz1dr5"; depends=[EbayesThresh wavethresh]; }; @@ -13864,7 +14070,7 @@ in with self; { triangle = derive2 { name="triangle"; version="0.12"; sha256="1cv3l97myhkyl0c4xjympqghlk0av8xfk00av8kj93ndgkv5bfj7"; depends=[]; }; triangulation = derive2 { name="triangulation"; version="0.5.0"; sha256="1zp09g0s0qpqgz2k6jx32pswh2zqyyd0b62lf1dx1p46m28dafkn"; depends=[]; }; tribe = derive2 { name="tribe"; version="0.1.7"; sha256="1k12yzicf3p5wpgzpsv4kk5xzrdfx712z67kj9xmcr1mbs8l5skb"; depends=[bazar dplyr lazyeval magrittr rlist rstudioapi]; }; - tricolore = derive2 { name="tricolore"; version="1.2.0"; sha256="0mv72lh5z8drdn96nb39dz9gnzia6vm6vbl8z6ldmd952x727y0a"; depends=[assertthat dplyr ggplot2 ggtern shiny]; }; + tricolore = derive2 { name="tricolore"; version="1.2.1"; sha256="04ihsgy6l8nlfp1q8c14g56v2inpw48mlhni4xqfqb7mzvalvhf8"; depends=[assertthat ggplot2 ggtern shiny]; }; triebeard = derive2 { name="triebeard"; version="0.3.0"; sha256="1hqyz57gph02c9fdc07lxz113bbklif3g18sw8jan6pakhhdc7dz"; depends=[Rcpp]; }; trigpoints = derive2 { name="trigpoints"; version="1.0.0"; sha256="1hckjh2gb0fvd2c8x6mj0idpk3im7b831y7mbli1hqhry6qqdw15"; depends=[sf tibble]; }; trimTrees = derive2 { name="trimTrees"; version="1.2"; sha256="0v75xf5186dy76332x4w7vdwcz7zpqga8mxrb5all2miq2v45fi8"; depends=[mlbench randomForest]; }; @@ -13890,6 +14096,7 @@ in with self; { truncreg = derive2 { name="truncreg"; version="0.2-5"; sha256="1scbjh5k1b8cjjavax08grlxdfs75s63dss0ifpz4d0axc4nm3iy"; depends=[maxLik]; }; trust = derive2 { name="trust"; version="0.1-7"; sha256="013gmiqb6frzsl6fsb5pqfdapwdxas0llg954hlcvgki9al5mlg3"; depends=[]; }; trustOptim = derive2 { name="trustOptim"; version="0.8.6.2"; sha256="1nsl8jd6cna52b5dd92jw3sh84jqpg7gazskn7166bcjbph19bf7"; depends=[Matrix Rcpp RcppEigen]; }; + trustedtimestamping = derive2 { name="trustedtimestamping"; version="0.2.6"; sha256="1rx7ypy331mq5ni5hxhqcfnicvwdgg9j2pm3aj097a5hhigibdrq"; depends=[digest httr jsonlite]; }; tryCatchLog = derive2 { name="tryCatchLog"; version="1.1.4"; sha256="0iahbm1zjgrb5x5awlvy1jgylw47p7qa1cxhrzg2mjknwpsd4vwm"; depends=[]; }; tsBSS = derive2 { name="tsBSS"; version="0.5.2"; sha256="00brzy0dkvdwrsf5jlpyp6ggwc2wkmdkb3l6h8fx1i3lmhnaqhkg"; depends=[boot forecast ICtest JADE Rcpp RcppArmadillo]; }; tsDyn = derive2 { name="tsDyn"; version="0.9-48.1"; sha256="0r8xxzr2z7r7xzpvi3sani169j3irw866gdmml0798czbdarq1qd"; depends=[foreach forecast MASS Matrix mgcv mnormt nnet tseries tseriesChaos urca vars]; }; @@ -13904,6 +14111,7 @@ in with self; { tsdecomp = derive2 { name="tsdecomp"; version="0.2"; sha256="1wy37gjp49dr60s4zhwv19iv3mzr1fjz5yilqmqgy78j5d45ns15"; depends=[]; }; tsdf = derive2 { name="tsdf"; version="1.1-7"; sha256="1c6fmvbpwvzy654c7hs56nxdp27wy9vyb521rdw33mgxvnyjbjqn"; depends=[]; }; tsdisagg2 = derive2 { name="tsdisagg2"; version="0.1.0"; sha256="1vjypf9d4rdprpgxfsgpccn412kvar59v341ridq2hcdp7hfb70s"; depends=[]; }; + tsensembler = derive2 { name="tsensembler"; version="0.0.5"; sha256="0jld5yj9j7wwp0p1j89mh1w82s813yix82r6fd9zqcr40nx5qcq7"; depends=[Cubist doParallel earth foreach forecast gbm glmnet kernlab nnet opera pls ranger RcppRoll softImpute xgboost xts zoo]; }; tseries = derive2 { name="tseries"; version="0.10-47"; sha256="0yzvc9djp3angvxdxqi60wi726y76ablsb71q88ycvw0avgpf8r0"; depends=[quadprog quantmod zoo]; }; tseriesChaos = derive2 { name="tseriesChaos"; version="0.1-13.1"; sha256="0qfrrzd0h8n9zp7wj5fl88wkiv22fs5zy8x509g316j0avm5zjr3"; depends=[deSolve]; }; tseriesEntropy = derive2 { name="tseriesEntropy"; version="0.6-0"; sha256="04clfkpkiy5p5nxcq59c7f4v1llj1d95lvck23h1px50lvb993fv"; depends=[cubature ks]; }; @@ -13911,8 +14119,8 @@ in with self; { tsfeatures = derive2 { name="tsfeatures"; version="1.0.1"; sha256="11ysmi9jd3x92fcylw6jbg62fdmdbi58nnasz0pm3ji46knwnd5n"; depends=[ForeCA forecast fracdiff furrr future purrr RcppRoll tibble tseries urca]; }; tsfknn = derive2 { name="tsfknn"; version="0.3.0"; sha256="0h44s8bvnd68nhl0rbwvs0sycsjlmpnni0nr2169429a9y3f91f1"; depends=[ggplot2]; }; tsgui = derive2 { name="tsgui"; version="0.0.3"; sha256="16cx68gq2f63wx7mhbv0aq6pr71wfbc035kjbjjsfrbagaq4ib13"; depends=[RandomFieldsUtils tcltk2 tkrplot]; }; - tsiR = derive2 { name="tsiR"; version="0.4.1"; sha256="1l6dvw4j4ish3ya51x5pw1580iibf2ywiyrx17c913sihvww43fr"; depends=[ggplot2 kernlab reshape2]; }; - tsibble = derive2 { name="tsibble"; version="0.8.2"; sha256="1dijimif048zc7hafdc5f01vl1gjyjdmziv505l1fsh94jkxs453"; depends=[anytime dplyr lubridate purrr Rcpp rlang tibble tidyr tidyselect]; }; + tsiR = derive2 { name="tsiR"; version="0.4.2"; sha256="1yc9kcyj8yg7zsdkqsxkr7czv3i5gf2146z5h89qfqifrrzmjifa"; depends=[ggplot2 kernlab reshape2]; }; + tsibble = derive2 { name="tsibble"; version="0.8.3"; sha256="1gvnbnl818jh7vxwdssghsnqh3xwg5rhj6gg7jb8r6zzqjq56l57"; depends=[anytime dplyr lubridate purrr rlang tibble tidyr tidyselect]; }; tsibbledata = derive2 { name="tsibbledata"; version="0.1.0"; sha256="17qvjfkppg1z4pxgax37ikx2x28ib39syps5vhppc1y3yn8441vq"; depends=[tsibble]; }; tsintermittent = derive2 { name="tsintermittent"; version="1.9"; sha256="1mrb6yrsjwj6j40n97sgg42ddvwhjnaiq9k7ka249bbq01gf2975"; depends=[MAPA]; }; tsmp = derive2 { name="tsmp"; version="0.3.5"; sha256="1gilzxxgaa1qqsk56s7ynlqhz6bssxrpc1h7fxkjp0z9amajvb5h"; depends=[audio doSNOW foreach magrittr progress]; }; @@ -13923,6 +14131,7 @@ in with self; { tsqn = derive2 { name="tsqn"; version="1.0.0"; sha256="1iv1wwa6a9824dbgfk5a609szppc3a8j250z74hb8csjvwwx9qq9"; depends=[fracdiff MASS robustbase]; }; tstools = derive2 { name="tstools"; version="0.3.8"; sha256="0daxrp91hxc367hlzla0s7x5dddnx462239jcq0ickx6awkk753g"; depends=[data_table jsonlite xts zoo]; }; tsutils = derive2 { name="tsutils"; version="0.9.0"; sha256="09xv5iv6icjbj5rhcsspbs8n2rl9k9gml0iizq8rd5a01153zlsm"; depends=[forecast MAPA RColorBrewer]; }; + tsviz = derive2 { name="tsviz"; version="0.1.0"; sha256="099ga750kr9hrkd8vaxhz6h4gha6zfr9jzqwrmgms2h2h1a7jxr7"; depends=[dplyr forecast ggplot2 lubridate magrittr miniUI plotly shiny shinyhelper]; }; tsvr = derive2 { name="tsvr"; version="1.0.0"; sha256="07ifcnij78lw29h1yxjyws3z5mxvk4lz33vgs2dr8ka5mwafbbc0"; depends=[]; }; tswge = derive2 { name="tswge"; version="1.0.0"; sha256="0wj0kyb1dcwfn8wjp7skgcflc48cr4va0i0jg8x970658if7z6fz"; depends=[astsa MASS PolynomF signal waveslim]; }; tsxtreme = derive2 { name="tsxtreme"; version="0.3.2"; sha256="1lmvwk83186qb59k3i4ppv85dvz7fww8wr97mvkl8457mf4n6kg0"; depends=[evd MASS mvtnorm]; }; @@ -13962,12 +14171,13 @@ in with self; { twiddler = derive2 { name="twiddler"; version="0.5-0"; sha256="0r16nfk2afcw7w0j0n3g0sjs07dnafrp88abwcqg3jyvldp3kxnx"; depends=[]; }; twilio = derive2 { name="twilio"; version="0.1.0"; sha256="0b70vcc2bd5jpd2d82i2k828q90viah0b9abz2r627bbyxivpcnd"; depends=[httr jsonlite lubridate magrittr purrr]; }; twitteR = derive2 { name="twitteR"; version="1.1.9"; sha256="1hh055aqb8iddk9bdqw82r3df9rwjqsg5a0d2i0rs1bry8z4kzbr"; depends=[bit64 DBI httr rjson]; }; + twitterwidget = derive2 { name="twitterwidget"; version="0.1.1"; sha256="1dlhydhy69284gg3jsxwa6h8cp1rlkg1j8h8z1fjz4fyy1p5xrpv"; depends=[htmlwidgets]; }; twl = derive2 { name="twl"; version="1.0"; sha256="0n2r40ddsr5zpzi92k7f0lvq78k5cmfbqzjxvr78hwq6j13dhar3"; depends=[corrplot data_table MCMCpack Rfast]; }; twosamples = derive2 { name="twosamples"; version="1.0.0"; sha256="0i8k157ph2whll72a590rnafgjx767k8vxy5d8x9dq7s4baiw1cx"; depends=[Rcpp]; }; twostageTE = derive2 { name="twostageTE"; version="1.3"; sha256="0mkxs3lmzja51zdrf5himhwcdygpj6czhdd2bydakm26kvw7znwr"; depends=[isotone]; }; twoway = derive2 { name="twoway"; version="0.6.2"; sha256="0q053jvb2sa762bjnpzkxzdcq1wk82ynp4rjl4j6qncqccvqq0c3"; depends=[]; }; txtplot = derive2 { name="txtplot"; version="1.0-3"; sha256="1949ab1bzvysdb79g8x1gaknj0ih3d6g63pv9512h5m5l3a6c31h"; depends=[]; }; - txtq = derive2 { name="txtq"; version="0.1.3"; sha256="1ych9wqmd0bw2n0pv88q2irwzz99krylb8m08ii6ljql1bm8ix9w"; depends=[base64url filelock fs R6]; }; + txtq = derive2 { name="txtq"; version="0.1.4"; sha256="0qvxz3k7as70wvqnxm5myk8ppan6f3c2vnnk5hqvxa370r3b8a9x"; depends=[base64url filelock R6]; }; types = derive2 { name="types"; version="1.0.0"; sha256="01shcin8wjbhbmzl979fj3008xqxssw90g3bjg42cnjxkmnaql59"; depends=[]; }; uCAREChemSuiteCLI = derive2 { name="uCAREChemSuiteCLI"; version="0.2.0"; sha256="1nccgkxv57inhgvgmhwm4fr8cp28sj8n83za5gam9xx1f42mzsqk"; depends=[ChemmineR usethis]; }; uGMAR = derive2 { name="uGMAR"; version="3.1.0"; sha256="0dlks1mm5li72ir18nnd4s9ll20700plha0d82h9wxpkkhwzqzng"; depends=[Brobdingnag pbapply]; }; @@ -13979,15 +14189,16 @@ in with self; { uclust = derive2 { name="uclust"; version="0.1.0"; sha256="0b4cj1np4b7m3nfk3crisw9qznk86lbh7x9xb70lwjmcjjgxkw8q"; depends=[dendextend robcor]; }; ucminf = derive2 { name="ucminf"; version="1.1-4"; sha256="01vggwg1w71k98qs6fhb0x1843vi322mf4g3hbclks94kcpkisx2"; depends=[]; }; udapi = derive2 { name="udapi"; version="0.1.3"; sha256="0qyn6fdh8ia913hn2dl0x99xsm20ps8zm52snswlyb00prinm668"; depends=[curl httr]; }; - udpipe = derive2 { name="udpipe"; version="0.8.2"; sha256="032g3rr1w6kg5kmqhr2pcy2gb8341fvpljv5499azwbhv01ifdp0"; depends=[data_table Matrix Rcpp]; }; + udpipe = derive2 { name="udpipe"; version="0.8.3"; sha256="1ys4ss700h3xk4z72lsjavd6vic4ihm00b1mzidq41klrgpwzcb0"; depends=[data_table Matrix Rcpp]; }; udunits2 = derive2 { name="udunits2"; version="0.13"; sha256="0yav7rm2afcx67xqrknybxgz7x63w78zyxa0xifvc0k2gz0d6mfi"; depends=[]; }; - ufs = derive2 { name="ufs"; version="0.2.0"; sha256="1z7vwlk01nxz55zfs30scx7crldf9ic7rklpw8rh4vk7p755nzk2"; depends=[BiasedUrn dplyr ggplot2 ggridges gtable pander scales SuppDists viridis]; }; + ufs = derive2 { name="ufs"; version="0.3.0"; sha256="02w784fjkpx6jq9vbrkxvn7c6vjabna1f7gx9jcrgp77xr2b1d4q"; depends=[digest diptest dplyr GGally ggplot2 ggrepel ggridges gridExtra gtable knitr pander plyr scales SuppDists viridis]; }; ui = derive2 { name="ui"; version="0.1.0"; sha256="1pc18v99n1psiiv7jxy3as1qwg2y41i1syrpvkbk05yii1qzsw2b"; depends=[Matrix maxLik mvtnorm numDeriv]; }; uiucthemes = derive2 { name="uiucthemes"; version="0.2.1"; sha256="1l96mch9r5npsdv1v4qfyj43ana7a2ff7yj04q6fzhh27v0fx7ak"; depends=[rmarkdown]; }; ukbabynames = derive2 { name="ukbabynames"; version="0.1.1"; sha256="0vrwcf3hixd40ag6kb289anq2ys2k6vdhhsrjbizvndkyn8sr0r0"; depends=[]; }; ukbtools = derive2 { name="ukbtools"; version="0.11.3"; sha256="1j5p9ypn3s781582all64kvywih1ry0lqsh1zirr35g7r46fy783"; depends=[data_table doParallel dplyr foreach ggplot2 magrittr purrr readr scales stringr tibble tidyr XML]; }; ukgasapi = derive2 { name="ukgasapi"; version="0.16"; sha256="0bj1dpsz4709dcb297b9rcb4nbzvxxhrqh5sv2qbrcypdh0x2m3b"; depends=[RCurl XML]; }; ukpolice = derive2 { name="ukpolice"; version="0.1.2"; sha256="0jwc57360cr9fkqzs5j2jmnfagci86jzi6p5d5mpm35drsrzm1ca"; depends=[jsonlite purrr tibble]; }; + ulid = derive2 { name="ulid"; version="0.3.0"; sha256="0xxkqrnlz3pkb3s1gacfzqav54w97gc0w8rh0fn1qy5rkmg2bplv"; depends=[Rcpp]; }; umap = derive2 { name="umap"; version="0.2.2.0"; sha256="1s82w9gy1387h7cprjfbhp49l89zbmn3gc9s0wzqb1s73nza9n31"; depends=[Rcpp reticulate RSpectra]; }; ump = derive2 { name="ump"; version="0.5-8"; sha256="1sg226caq9y41cwl7wr5s9z3bpq2j5p6rj6fy2pasbzimgzw0byx"; depends=[]; }; umx = derive2 { name="umx"; version="2.10.0"; sha256="0sh16dwzkib1gzaj18nk2zdp8pq6ri7hwknzzpz1632r956kd7cy"; depends=[cowplot DiagrammeR ggplot2 knitr lavaan MASS Matrix MuMIn mvtnorm nlme numDeriv OpenMx polycor R2HTML RCurl sfsmisc xtable]; }; @@ -14001,7 +14212,7 @@ in with self; { uniReg = derive2 { name="uniReg"; version="1.1"; sha256="0wjc7pgaisvk26j7grxp2ypsabb5my9wg6c9i5w9zhh5jdx1fdab"; depends=[DoseFinding MASS mvtnorm quadprog SEL]; }; uniah = derive2 { name="uniah"; version="1.0"; sha256="19zwy33gwa749i81mi9h05k8k3l4xbbln3k6q70fa7ic5lqbbdzj"; depends=[ahaz Iso survival]; }; unifDAG = derive2 { name="unifDAG"; version="1.0.2"; sha256="0az9knspvf49mvp41m64lpm1a0nzvkygg957pb81mm9kh6cjbhfs"; depends=[gmp graph]; }; - unifed = derive2 { name="unifed"; version="1.1.0"; sha256="0rcvq5n1k7ji6avnfb5vks9yik1vjxd3pyji1mhhkg2k7kpdn75b"; depends=[]; }; + unifed = derive2 { name="unifed"; version="1.1.1"; sha256="0bh15cvpasgd0ypcmybbss5s9hsilfxgqj4b0mppj44vxm15bzk6"; depends=[]; }; uniformly = derive2 { name="uniformly"; version="0.1.0"; sha256="0n3s0x05v4d79jn51nwj06gm074rgy269f57y2q5z0bkwyp6yc7n"; depends=[pgnorm]; }; uniftest = derive2 { name="uniftest"; version="1.1"; sha256="0a37m7l3lc6rznx10w9h9krnn5paim2i2wvw47ckwag7bv0d4pm4"; depends=[orthopolynom]; }; unikn = derive2 { name="unikn"; version="0.1.0"; sha256="08ykiwb7379rrrqxi1363vfrm6cq3vdmfas2plf26jkx4n806rm2"; depends=[]; }; @@ -14022,7 +14233,7 @@ in with self; { unsystation = derive2 { name="unsystation"; version="0.2.0"; sha256="02da7wzzk5bwd475i67v5x04ay2bn5yd5xffl1asqcqxcc5sy0m8"; depends=[doParallel foreach iterators Rcpp RcppArmadillo]; }; untb = derive2 { name="untb"; version="1.7-4"; sha256="1i7m4vfslsix98dwx4jlrsldm7fhhfp25gr7aapcxqxms7ryaby6"; depends=[Brobdingnag partitions polynom]; }; unvotes = derive2 { name="unvotes"; version="0.2.0"; sha256="0wanvivwm1nmqadq2vapg27kasnjnr0a4np2kw54wj9pg21izqic"; depends=[]; }; - updog = derive2 { name="updog"; version="1.0.1"; sha256="0y2w62f25an1d7fpkiqhimak0ww201r873sjb08akwf82v4k34wz"; depends=[assertthat doParallel foreach ggplot2 ggthemes Rcpp RcppArmadillo stringr]; }; + updog = derive2 { name="updog"; version="1.1.0"; sha256="0zyb9n7wlxvigi4w4rz0nrhpzdycvvdgz6hc4bg4v4bk0k8dnkmk"; depends=[assertthat doParallel foreach ggplot2 ggthemes Rcpp RcppArmadillo stringr]; }; uplift = derive2 { name="uplift"; version="0.3.5"; sha256="11xikfmg6dg8mhwqq6wq9j9aw4ljh84vywpm9v0fk8r5a1wyy2f6"; depends=[coin MASS penalized RItools tables]; }; uplifteval = derive2 { name="uplifteval"; version="0.1.0"; sha256="1gnn40c47rpx40j210bz6fb48d70p6spv3drr8hd5b3vzfz6686c"; depends=[dplyr ggplot2 gridExtra whisker]; }; upmfit = derive2 { name="upmfit"; version="0.1.0"; sha256="0f0rk606v17abgw3mwlwihl6fsxprp44h2xbhv1675i18i36vbgx"; depends=[mcmcplots R2jags]; }; @@ -14040,7 +14251,7 @@ in with self; { usedist = derive2 { name="usedist"; version="0.1.0"; sha256="17mldp0888ig2xc8cp1nhldj5g3srwmbx3mfcnzz21n1fz31jkmg"; depends=[]; }; useful = derive2 { name="useful"; version="1.2.6"; sha256="0n50v1q75k518sq23id14jphwla35q4sasahrnrnllwrachl67v1"; depends=[assertthat dplyr ggplot2 magrittr Matrix plyr purrr scales]; }; userfriendlyscience = derive2 { name="userfriendlyscience"; version="0.7.2"; sha256="17arxxha8qr876nrf9szpymgamxlvacj3lfbmpiv973kyi3hr7m4"; depends=[BiasedUrn car data_tree DiagrammeR digest diptest GGally ggplot2 ggrepel ggridges GPArotation gridExtra gtable knitr lavaan lme4 MASS MBESS minpack_lm pander plyr psych pwr RColorBrewer rio scales SCRT SuppDists ufs viridis XML xtable]; }; - usethis = derive2 { name="usethis"; version="1.5.0"; sha256="0pn6ka3726psaqlx573g6nxi90apf0rn5m4k2lz1jr66xdc19sag"; depends=[clipr clisymbols crayon curl desc fs gh git2r glue purrr rlang rprojroot rstudioapi whisker withr yaml]; }; + usethis = derive2 { name="usethis"; version="1.5.1"; sha256="07an5wbikilg7cb3q6x5aykw8dfqnjrc3wpfb7gjmy0d9fh20fcy"; depends=[clipr clisymbols crayon curl desc fs gh git2r glue purrr rlang rprojroot rstudioapi whisker withr yaml]; }; usfertilizer = derive2 { name="usfertilizer"; version="0.1.5"; sha256="05zjn39hqjjzzp4v4b1zbqq59205s7k0kikms951h57kbyvjz6vk"; depends=[tidyverse]; }; uskewFactors = derive2 { name="uskewFactors"; version="2.0"; sha256="0ndi5987ak8sa7krgiglsibfg0k7z9j8fg47hg1m8ar0sq4r1yj6"; depends=[MASS MCMCpack mvtnorm tmvtnorm]; }; usl = derive2 { name="usl"; version="1.8.0"; sha256="04w7p9i08a51smgg11kh4hablic5rjmr5hndrnlg49j5h20i7w1v"; depends=[nlsr]; }; @@ -14048,9 +14259,9 @@ in with self; { ustyc = derive2 { name="ustyc"; version="1.0.0"; sha256="1267bng2dz3229cbbq47w22i2yq2ydpw26ngqa1nbi3ma6hwqsv4"; depends=[plyr XML]; }; utc = derive2 { name="utc"; version="0.1.5"; sha256="1lhm5rhr78cxp3cz5n6j2zkhjphj7csk026xvvhkjqdi39rrq6i4"; depends=[]; }; utf8 = derive2 { name="utf8"; version="1.1.4"; sha256="0m0ywg8k3blfiahxvh1i4zn9dksrlc937d2lbza5fc38zjnrrnpn"; depends=[]; }; - utile_tables = derive2 { name="utile.tables"; version="0.1.4"; sha256="01456rw4jglkkxbbwcjv4gqcx1jv4l94jbk1szpkgdvqf7pzvgiz"; depends=[dplyr purrr rlang survival tibble tidyr utile_tools]; }; - utile_tools = derive2 { name="utile.tools"; version="0.1.2"; sha256="17fvm631bl1frw54a3fajncagb4r0xfz0s8lnnlk8xybqvyk2qxi"; depends=[dplyr glue lubridate purrr rlang stringr survival tibble]; }; - utile_visuals = derive2 { name="utile.visuals"; version="0.1.1"; sha256="1bzwbs8yzq7qcbgjnavn58c9sqafg7r9lfy1nr5a4d7x40fhzdhd"; depends=[ggplot2]; }; + utile_tables = derive2 { name="utile.tables"; version="0.1.5"; sha256="0z3frv84q1hq60b2qdj7wfxqv62cs9986r0dki7lc0vfs7cyai2h"; depends=[dplyr magrittr purrr rlang survival tibble tidyr utile_tools]; }; + utile_tools = derive2 { name="utile.tools"; version="0.2.0"; sha256="0k3lj94k6ajfpy36rrzwl8b3w2dccshrsmwn8zl70y5159ivm1z2"; depends=[dplyr lubridate purrr rlang stringr tibble]; }; + utile_visuals = derive2 { name="utile.visuals"; version="0.2.0"; sha256="1wh41iiqi1lwsjifglr5ip1ajz8vhnijzjpb7l9lwbvivphhlcwh"; depends=[ggplot2 gridExtra purrr utile_tools]; }; utility = derive2 { name="utility"; version="1.4.3"; sha256="12g2y9xzzi2sl3ya3va1p7nc7hrjhr4arsz06f8xlxw5n8kvdxag"; depends=[]; }; utilsIPEA = derive2 { name="utilsIPEA"; version="0.0.6"; sha256="07avc0j6qkzqmznbydn0zdg743g7g7kn2bcx5n03m3wg0fqyggr7"; depends=[data_table dplyr RCurl stringdist stringr]; }; utiml = derive2 { name="utiml"; version="0.1.5"; sha256="02wxsg1gg2y83cii5ly7r8lk376kas261f9qyl03z55p5m72w9zy"; depends=[mldr ROCR]; }; @@ -14103,7 +14314,7 @@ in with self; { vcov = derive2 { name="vcov"; version="0.0.1"; sha256="1w89mr8dk6436bxap28rszajgm9k7sjfqsr1i4p68dlhw8zk4yq1"; depends=[]; }; vcr = derive2 { name="vcr"; version="0.2.6"; sha256="0gqsiphlnq1lh6mqg9ikipxfzyzdiqxcvbwi0gpgfjk10gjj8f13"; depends=[base64enc crul httr lazyeval R6 urltools webmockr yaml]; }; vcrpart = derive2 { name="vcrpart"; version="1.0-2"; sha256="1xfvsxgyf39d2qxnm40nzkqp7q12y8nbpn9h154n876zxxfs7gh1"; depends=[formula_tools nlme numDeriv partykit rpart sandwich strucchange ucminf zoo]; }; - vctrs = derive2 { name="vctrs"; version="0.1.0"; sha256="13w1r8zpalirpfaz5sykpn0mj4jmhxi2qkdcfq081ixlfjyzwa6c"; depends=[backports digest glue rlang zeallot]; }; + vctrs = derive2 { name="vctrs"; version="0.2.0"; sha256="05h0y8qzwc899qj84gkhg4jwzscd065as00d4d8smv42h4i8zkjv"; depends=[backports digest ellipsis glue rlang zeallot]; }; vcvComp = derive2 { name="vcvComp"; version="1.0.1"; sha256="1103hjzd29f8gpsfbagdryq52m6fkhhh9dbqhbmhixxlimc7sd03"; depends=[]; }; vdg = derive2 { name="vdg"; version="1.2.0"; sha256="1hi5d14nh9q784sbdk018awrawh9f1aix0wl26x7n0xb4707rcmy"; depends=[ggplot2 gridExtra proxy quantreg]; }; vdiffr = derive2 { name="vdiffr"; version="0.3.1"; sha256="1l0vzh7nnwr64cq0nixnr4m0iya4mdpqvh45g2wf1hja51mcvw0a"; depends=[BH devtools diffobj fontquiver freetypeharfbuzz gdtools glue htmltools htmlwidgets purrr R6 Rcpp rlang shiny testthat usethis xml2]; }; @@ -14118,10 +14329,10 @@ in with self; { vegclust = derive2 { name="vegclust"; version="1.7.7"; sha256="0f81jw429ib601lvbzi4q23kb5n6lvavlgw56wfqdmvvkl68vwlc"; depends=[circular Kendall MASS Rcpp sp vegan]; }; vegdata = derive2 { name="vegdata"; version="0.9.5"; sha256="145frmlsdb7m5z8qa03js4061pqmgvy3gykxkpiv1wv2wnfzyvnr"; depends=[foreign XML]; }; vegetarian = derive2 { name="vegetarian"; version="1.2"; sha256="15ys1m8p3067dfsjwz6ds837n6rqd19my23yj8vw78xli3qmn445"; depends=[]; }; - vegperiod = derive2 { name="vegperiod"; version="0.2.5"; sha256="1icjv3z8bfl2yl1pkr3kbs34q2yqv65aadw40jzrd98djdprzkni"; depends=[]; }; + vegperiod = derive2 { name="vegperiod"; version="0.2.6"; sha256="0v8bpxaa0xp8ywnycxs3613scncrhv8g7p99j6n5hs26m4h1km49"; depends=[]; }; vegtable = derive2 { name="vegtable"; version="0.1.4"; sha256="1gk80i4gi98nigiya4n8ng8d2y7l3j63i1ijg4g80nfr5w64qh5w"; depends=[foreign plotKML qdapRegex sp stringi taxlist vegdata]; }; - vein = derive2 { name="vein"; version="0.7.8"; sha256="19rjd84ckw2f6wagzy0rivq2bnyb74gv92rxamhfd7xp05xhp2ml"; depends=[data_table eixport sf sp units]; }; - velociraptr = derive2 { name="velociraptr"; version="1.0"; sha256="1n7q08i37qbbh5cjq6jb4gmpzzip3wx2wx8xx5wpkln8n3nyiqki"; depends=[RCurl rgdal]; }; + vein = derive2 { name="vein"; version="0.7.12"; sha256="1f2x8bdhfsj5v6gql1qq8g2lrxjj5z9pji2iirsy1samqxnnpirk"; depends=[data_table eixport sf sp units]; }; + velociraptr = derive2 { name="velociraptr"; version="1.1.0"; sha256="0a67vmv05cxc9f27aqzr6nkgy2mj3fhykwj5nb23qwfqa669a5hi"; depends=[sf]; }; velox = derive2 { name="velox"; version="0.2.0"; sha256="1jrarfsfflvpc0dqh5gnw92fk8zic222n7pr7hd0lhr5d389k6d0"; depends=[BH raster Rcpp rgdal rgeos sf sp]; }; vembedr = derive2 { name="vembedr"; version="0.1.3"; sha256="0zg6j0g9l7j36ifwabhxrin5z0dics66bqkc7x6rqijmizk1xpba"; depends=[htmltools httr magrittr stringr]; }; venn = derive2 { name="venn"; version="1.7"; sha256="0lll5bcwx64di4m0k56f00vsfaas2l2mkcbblniq302v0g12v8cj"; depends=[]; }; @@ -14137,15 +14348,16 @@ in with self; { vfcp = derive2 { name="vfcp"; version="1.4.0"; sha256="0zj1ihqdx5x1695al1xyi8k001yw8x7gdss72myxlnh7b4flnp9m"; depends=[copula extraDistr stringr]; }; vfprogression = derive2 { name="vfprogression"; version="0.7.1"; sha256="0kgw1jx0rl9v8qy8qg7zjzdgvwqdi7k1lsvsx3lnpw4sfpkzsq23"; depends=[]; }; vhica = derive2 { name="vhica"; version="0.2.4"; sha256="0km49lrzn9rm3wxadwxc290dvx3bsblbmna7f9lnkq6g1z5jdqwg"; depends=[]; }; + viafr = derive2 { name="viafr"; version="0.1.0"; sha256="14y5k1vskfzxfpzjkk9602p8mvvyfrf3qpr517zdb714wv3gwk3h"; depends=[assertthat crul dplyr jsonlite magrittr purrr rlang stringr tibble tidyr utf8]; }; vietnamcode = derive2 { name="vietnamcode"; version="0.1.1"; sha256="0vc0c1fg30afar2dkch5h27b8jbglcd9ja6d5hcypnibqz4c68vz"; depends=[]; }; viewshed3d = derive2 { name="viewshed3d"; version="2.0.0"; sha256="0wil1k64clfzjl2j5gl4xi4m4q0l15frxsphvsajp5hqgfpk6fn0"; depends=[data_table doParallel foreach iterators rgl tcltk2 viridis VoxR]; }; vimp = derive2 { name="vimp"; version="1.1.4"; sha256="146z6xismk97613cdiz508hn0mgg0w0rqnjb9as66sq57kqgn5yn"; depends=[SuperLearner]; }; vinereg = derive2 { name="vinereg"; version="0.5.0"; sha256="17qni21jaizmfzl975xd39ahlc5flfnmy6xy7n9adfv346f3zwp0"; depends=[cctools furrr future kde1d rvinecopulib]; }; vines = derive2 { name="vines"; version="1.1.5"; sha256="057d2fdh03cq9kh4vz94arqscahmz14xbr2g59l0vn205lnyilf1"; depends=[ADGofTest copula cubature TSP]; }; violinmplot = derive2 { name="violinmplot"; version="0.2.1"; sha256="1j3hb03y988xa704kp25v1z1pmpxw5k1502zfqjaf8cy4lr3kzsc"; depends=[lattice]; }; - vioplot = derive2 { name="vioplot"; version="0.3.0"; sha256="1ddmmqq7qrnvr5q518afnysrl7ccr8am9njknv3dpwaqzcdr9akn"; depends=[sm zoo]; }; + vioplot = derive2 { name="vioplot"; version="0.3.2"; sha256="13kfjp747bnzksai8j39y2hyl3ljc6n53c2cfhaw78q3d63x0lbv"; depends=[sm zoo]; }; viopoints = derive2 { name="viopoints"; version="0.2-1"; sha256="0cpbkkzm1rxch8gnvlmmzy8g521f5ang3nhlcnin419gha0w6avf"; depends=[]; }; - vip = derive2 { name="vip"; version="0.1.2"; sha256="1y4v0qd7qag9jw9vazlnl3hp4813lcbhmbq60s3znhdmxnbb4irw"; depends=[ggplot2 gridExtra magrittr ModelMetrics pdp plyr tibble]; }; + vip = derive2 { name="vip"; version="0.1.3"; sha256="140sv4rp7g600adh0mq8k8m8v6qdb6rkan87fh6i0svw67vbjr16"; depends=[ggplot2 gridExtra magrittr ModelMetrics pdp plyr tibble]; }; vipor = derive2 { name="vipor"; version="0.4.5"; sha256="112gc0d7f8iavgf56pnzfxb7hy75yhd0zlyjzshdcfbnqcd2a6bx"; depends=[]; }; viridis = derive2 { name="viridis"; version="0.5.1"; sha256="060rf1jn29dq53y3nhb0hykvcap6rqsk04rq544ypiiqb18ngwnx"; depends=[ggplot2 gridExtra viridisLite]; }; viridisLite = derive2 { name="viridisLite"; version="0.3.0"; sha256="1by2l05f0yabwvv64lhnv7bbhx0w683s3wr9j2xda920ghpa23kq"; depends=[]; }; @@ -14162,9 +14374,9 @@ in with self; { visualFields = derive2 { name="visualFields"; version="0.6"; sha256="1w6wkyzjakj6ss9nv4gzkgva4m21jbsz10c2jy660bjb25rf59ih"; depends=[deldir flip gtools Hmisc matrixStats spatstat]; }; visualR = derive2 { name="visualR"; version="2.0.1"; sha256="1q0vzxh6zy76yr5bd55781fk9cb7xr1bpf1fywzsi6341ds5qxys"; depends=[dplyr jsonlite optionstrat plotly quantmod zoo]; }; visualize = derive2 { name="visualize"; version="4.3.0"; sha256="1s49sx828f25d4n93mn28xdbc81zflk2sr3h8ffs2mkjr888qd8y"; depends=[]; }; - visvow = derive2 { name="visvow"; version="0.5.0"; sha256="0kkj09hdan5an59v0jvqchx4kkk7d9ak91c79hs78fdpj65xc16b"; depends=[Cairo DT ggdendro ggplot2 ggrepel MASS plot3D plyr pracma psych Rdpack readxl Rtsne shiny shinyBS splitstackshape svglite WriteXLS]; }; + visvow = derive2 { name="visvow"; version="0.6.0"; sha256="0f6w7gv8pglzvnixxk0x418wva2yzc108hm0rr99rdxqixl56lyc"; depends=[Cairo DT ggdendro ggplot2 ggrepel MASS plot3D plyr pracma psych Rdpack readxl Rtsne shiny shinyBS splitstackshape svglite WriteXLS]; }; vita = derive2 { name="vita"; version="1.0.0"; sha256="114p2lzcr8rn68f0z4kmjdnragqlmi18axda9ma4sbqh8mrmjs9v"; depends=[randomForest Rcpp]; }; - vitae = derive2 { name="vitae"; version="0.1.0"; sha256="1xjrgx0zmy922dg60b296j393lyx2jc07alwzvaj2bgqakpspgk0"; depends=[bookdown dplyr glue knitr RefManageR rlang rmarkdown]; }; + vitae = derive2 { name="vitae"; version="0.2.0"; sha256="0wxd4dlw8s5wi3x9nb6kn1yb3fjg1fbswx4dfg7pl6w19gx8ff4v"; depends=[bookdown dplyr glue knitr RefManageR rlang rmarkdown]; }; vitality = derive2 { name="vitality"; version="1.3"; sha256="17micfmlksnw167vavvhlk431fm20k74y5ggs47pgz5fwpm854zp"; depends=[]; }; vivo = derive2 { name="vivo"; version="0.1.0"; sha256="1xsx7qv30m9zyfqckdzycml563z1xrm0jmsbahs7il55xwg2pndh"; depends=[dplyr ggplot2 ingredients]; }; vkR = derive2 { name="vkR"; version="0.1"; sha256="0rb66am3y009wli8ykl58i02kzm6cdqz5v5d4vvzlbngz8crdkyy"; depends=[httr jsonlite XML]; }; @@ -14177,7 +14389,7 @@ in with self; { voronoiTreemap = derive2 { name="voronoiTreemap"; version="0.2.0"; sha256="1wvnqdrvba4ss4f3k8gzb720irdq2brv2aaq16ywifv8fnjf02r3"; depends=[data_tree DT htmlwidgets rlang shiny shinyjs]; }; vortexR = derive2 { name="vortexR"; version="1.1.6"; sha256="113ndhf2f3hlhmgbg6gh5fq1az6d314fwl872dwypj2zsvfm7x03"; depends=[betareg data_table GGally ggplot2 glmulti gtools irr plyr R_utils stringr vortexRdata]; }; vortexRdata = derive2 { name="vortexRdata"; version="1.0.5"; sha256="0b47q3aslz4110a1bfaa103i098y2ngzrjh01rwasq3gd6xbif9n"; depends=[]; }; - vosonSML = derive2 { name="vosonSML"; version="0.26.3"; sha256="0qcvs0ndfyql1vzx27ks006lwbxl2dx5vnf4jl05pj0jwxc8zgkx"; depends=[data_table dplyr Hmisc httpuv httr igraph magrittr RCurl RedditExtractoR rlang rtweet stringr tm]; }; + vosonSML = derive2 { name="vosonSML"; version="0.27.2"; sha256="0a2qqs6kf48l5ik3dsw40xsw1wzq7bnc3vdh33jiqh2fm93nzvrp"; depends=[data_table dplyr Hmisc httpuv httr igraph magrittr RCurl RedditExtractoR rlang rtweet stringr textutils tictoc tm]; }; vote = derive2 { name="vote"; version="1.1-0"; sha256="1kxbv4062g4x9vn4gh74c6zwdshysw5n7vx9qljhq2wrdnqzjpyg"; depends=[formattable knitr]; }; voteogram = derive2 { name="voteogram"; version="0.3.1"; sha256="12xv0c3g4vr23c8adkk8z7m7sx31w5mjvdg9h4qbvaimb99p2r7z"; depends=[dplyr ggplot2 jsonlite scales]; }; votesys = derive2 { name="votesys"; version="0.1.1"; sha256="1z7cx3rj3bfrkb6jkmf1m1wad5ff46zrab5vhk69wf3jbwd9h920"; depends=[data_table gtools Matrix]; }; @@ -14195,9 +14407,10 @@ in with self; { vsgoftest = derive2 { name="vsgoftest"; version="0.3-2"; sha256="020kghcfv8h0i7fzq3p2grhhbwvqmc9ya9r7lc1kiqg1bfgljg91"; depends=[fitdistrplus Rcpp]; }; vstsr = derive2 { name="vstsr"; version="1.0.0"; sha256="0flsw5yw1vmj5x866klxmjqz5aimkvjiwl1zdciz63p9zffmb4gz"; depends=[httr jsonlite magrittr R6 RCurl xml2]; }; vtable = derive2 { name="vtable"; version="0.5.0"; sha256="02dagwaakf08v9y2lm5j2r5bfz8sg6ac0hv6akmjp0llq2bd725d"; depends=[sjlabelled]; }; - vtreat = derive2 { name="vtreat"; version="1.4.0"; sha256="0mvfqv7zhkhihdw0iazpf82qi05j457mknrc8p38amqak4n3xgdm"; depends=[wrapr]; }; + vtreat = derive2 { name="vtreat"; version="1.4.4"; sha256="0wsa2aaggscaig6zgnxl7xi9a2r6256j6dw85493b3lfifb6bdq4"; depends=[wrapr]; }; vtree = derive2 { name="vtree"; version="2.0.0"; sha256="1zxsvzbyq6nkghg9dx1zxs2mnxzwv54nv317fh3vq45c6wdj43cn"; depends=[DiagrammeR DiagrammeRsvg rsvg]; }; vudc = derive2 { name="vudc"; version="1.1"; sha256="0zxz6n3ixa3xjzcinky8ymqjx9w8y8z65mz8d84dl00mxzkmkz4h"; depends=[]; }; + vwline = derive2 { name="vwline"; version="0.2-2"; sha256="1hilr996xn5wh8kfyab55w2i1c02a8x909h4ahag5q6s7603qng5"; depends=[gridBezier polyclip]; }; vwr = derive2 { name="vwr"; version="0.3.0"; sha256="1h790vjcdfngs1siwldvqz8jrxpkajl3266lzadfnmchfan1x7xv"; depends=[lattice latticeExtra stringdist]; }; wBoot = derive2 { name="wBoot"; version="1.0.3"; sha256="08qgkkv6jvqmxq5gvfp7jbrc3k8mxajfww7k8a3p8888aq411p7q"; depends=[boot simpleboot]; }; wCorr = derive2 { name="wCorr"; version="1.9.1"; sha256="1n4qd11bh0aq80fsw68vfky7nnvgkk6irsfjrknkf9bjvwvihlak"; depends=[minqa mnormt Rcpp RcppArmadillo]; }; @@ -14220,7 +14433,7 @@ in with self; { wally = derive2 { name="wally"; version="1.0.9"; sha256="1g6dywny8s8fpdnfvrlbzsp9d9dhxdxrm1j4dd3b9r6rpiajf964"; depends=[data_table prodlim riskRegression]; }; walmartAPI = derive2 { name="walmartAPI"; version="0.1.5"; sha256="1nng8izncj2nmmpywn1ggpzvjh8q7y3q6260qhy9kbmvrrl26spf"; depends=[dplyr glue httr magrittr purrr stringr tibble]; }; walrus = derive2 { name="walrus"; version="1.0.3"; sha256="1nk2glcvy4hyksl5ipq2mz8jy4fss90hx6cq98m3w96kzjni6jjj"; depends=[ggplot2 jmvcore R6 WRS2]; }; - wand = derive2 { name="wand"; version="0.2.0"; sha256="1p2r96nyr36jv418xi4j2ldarymb4xmpis6d2iz7mq9755kb4fnh"; depends=[dplyr purrr rappdirs Rcpp stringi tibble tidyr]; }; + wand = derive2 { name="wand"; version="0.5.0"; sha256="0y9xmh9a93lnadg83i223j2nf77jazz8m1ck1bmdf5jwj4vyzaqa"; depends=[]; }; warbleR = derive2 { name="warbleR"; version="1.1.15"; sha256="1vd2yvb1crzxbrbfk8iv31ir09xc646m8glfgqkgazhnj0y6l6yr"; depends=[bioacoustics bitops dtw fftw iterators jpeg maps monitoR NatureSounds pbapply pracma RCurl rjson seewave Sim_DiffProc soundgen tuneR]; }; warpMix = derive2 { name="warpMix"; version="0.1.0"; sha256="13zbl4aifhg7j5b3vpwgzgs09hr7yblz0rckmj5qh40s78j8cpfn"; depends=[fda fields lme4 MASS nlme reshape2]; }; washdata = derive2 { name="washdata"; version="0.1.2"; sha256="01cnlhymh3qg9c7fda8s6lvm4j2vklmb72dfk17sn4p0kkikf9m8"; depends=[]; }; @@ -14274,7 +14487,7 @@ in with self; { weightQuant = derive2 { name="weightQuant"; version="1.0"; sha256="1ngz51wr5qpnb98lfbddwvipcra86dq5whm6z8c4xd921anb15bx"; depends=[doParallel foreach quantreg]; }; 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]; }; - weightr = derive2 { name="weightr"; version="2.0.1"; sha256="1pn6jyjr8g22x1hdmikppbh6pqbqwzvlxkh0cp3811ljipsl0qdj"; depends=[ggplot2 scales]; }; + weightr = derive2 { name="weightr"; version="2.0.2"; sha256="1qsyak91kdgv48wf6qhpfbiirlg4ba9w6rw8ynjcsnqqdvmly1lb"; depends=[ggplot2 scales]; }; weights = derive2 { name="weights"; version="1.0"; sha256="0186bfpkhxngrshac6bpg37alp6slwhwd43inrm8hqg0vhpfgc4c"; depends=[gdata Hmisc mice]; }; weirs = derive2 { name="weirs"; version="0.25"; sha256="17a0ppi7ghikrwn39zvhg2cvhmnr3w0qi7r9lj22x65ii9nzadd7"; depends=[]; }; welchADF = derive2 { name="welchADF"; version="0.3.1"; sha256="0vzvbibaxr6baq75ldccv0f3wifabdh9i4qgpmfsn7zv0rypal7v"; depends=[lme4]; }; @@ -14293,6 +14506,7 @@ in with self; { whisker = derive2 { name="whisker"; version="0.3-2"; sha256="0z4cn115gxcl086d6bnqr8afi67b6a7xqg6ivmk3l4ng1x8kcj28"; depends=[]; }; whitechapelR = derive2 { name="whitechapelR"; version="0.3.0"; sha256="0mnq5m59mw8w5g1p0h2xzlz738j397b3444km59bm5yln3j0nsbi"; depends=[igraph plyr]; }; whitening = derive2 { name="whitening"; version="1.1.1"; sha256="0madrdy2pvr7q4lhznw2kyhs7x927npwmpqwfwkv6v5c4zv7mbjp"; depends=[corpcor]; }; + whoa = derive2 { name="whoa"; version="0.0.1"; sha256="1gkm3l0kjf52yc6y437dsfx3hc9bfhnb049hm4qii46nr1plz69x"; depends=[dplyr ggplot2 magrittr Rcpp tibble tidyr vcfR viridis]; }; whoami = derive2 { name="whoami"; version="1.3.0"; sha256="19fwl7z55s4kl2xzwqwh8iwg13kdrv222vyl3kibxgwrjcjwj2y2"; depends=[httr jsonlite]; }; whoapi = derive2 { name="whoapi"; version="0.1.2"; sha256="0ib0an08xsxan24q8mb5ai375njmkdc61lh4321rzgr25iqvi682"; depends=[httr]; }; wicket = derive2 { name="wicket"; version="0.4.0"; sha256="1lizzmj69bswzlk18fv2v4yxxc6dynvmkymdiafznzcyyz4a8xnf"; depends=[BH Rcpp]; }; @@ -14301,6 +14515,7 @@ in with self; { widgetframe = derive2 { name="widgetframe"; version="0.3.1"; sha256="0j0d73m72nzfc1wyrgsqr99ldx72adis6pd57mpim55hz0n9l224"; depends=[htmltools htmlwidgets magrittr purrr]; }; widyr = derive2 { name="widyr"; version="0.1.1"; sha256="14r1qiq4i7lmn3i76aa0d9wcjw1jclm1jf371j25s92w8z36mdln"; depends=[broom dplyr Matrix purrr reshape2 tidyr tidytext]; }; wikibooks = derive2 { name="wikibooks"; version="0.2"; sha256="178lhri1b8if2j7y7l9kqgyvmkn4z0bxp5l4dmm97x3pav98c7ks"; depends=[]; }; + wikifacts = derive2 { name="wikifacts"; version="0.1.0"; sha256="01mwzqign59lh7wvf8q8kwkgnfxi9nkk6n0qwfh27q64fajw8clg"; depends=[magrittr rvest xml2]; }; wikilake = derive2 { name="wikilake"; version="0.4"; sha256="0pm0brzkf2k6aknwl4b3fba5ly7mhah8qfb0h94fckiaqbnpyx9v"; depends=[maps rvest selectr sp stringi stringr units WikipediR xml2]; }; wikipediatrend = derive2 { name="wikipediatrend"; version="1.1.14"; sha256="00i38py9n4l0iqkn3257a3jbiwh3hrmx1p9x6rfh9sgfcch8yyj5"; depends=[hellno httr jsonlite RColorBrewer rvest stringr xml2]; }; wikisourcer = derive2 { name="wikisourcer"; version="0.1.4"; sha256="0x6yp7hmrasrxpwlbsabzrr316d5yxynafmv0jh6yhx4i36l08wf"; depends=[magrittr purrr rvest tibble urltools xml2]; }; @@ -14335,7 +14550,7 @@ in with self; { wordcloud2 = derive2 { name="wordcloud2"; version="0.2.1"; sha256="1a2q42bn65q4idxq0vxysyam16q6c18inxv4dqhfy0x52j8z9x6k"; depends=[base64enc htmlwidgets]; }; wordmatch = derive2 { name="wordmatch"; version="1.0"; sha256="0zscp361qf79y1zsliga18hc7wj36cnydshrqb9pv67b65njrznz"; depends=[plyr reshape2]; }; wordnet = derive2 { name="wordnet"; version="0.1-14"; sha256="12a21zlc7h973gi1632gngbk8b09vhp3sldh1mh9b5n6h18ga25p"; depends=[rJava]; }; - wordspace = derive2 { name="wordspace"; version="0.2-0"; sha256="0rrnbimf68ax1qxsyn7g0kd76abijzxg5i11h93l0fnzi2g2a9xn"; depends=[cluster iotools MASS Matrix Rcpp sparsesvd]; }; + wordspace = derive2 { name="wordspace"; version="0.2-5"; sha256="1xrnzq5hmdwdd7692as4ddjkr64bfgl141xx2gvcla308rxql9yp"; depends=[cluster iotools MASS Matrix Rcpp sparsesvd]; }; workflowr = derive2 { name="workflowr"; version="1.4.0"; sha256="1m7x89wmivcpj4p8qi6dlpf25j4r7l5axa602qq1bx0r050hajrm"; depends=[callr fs getPass git2r glue httr knitr rmarkdown rprojroot rstudioapi stringr whisker yaml]; }; worldmet = derive2 { name="worldmet"; version="0.8.7"; sha256="1hhh3a28xxi5265053gclsbihv41372f64isz9xc5sjdjnpcv6g4"; depends=[doParallel dplyr foreach leaflet openair readr zoo]; }; worms = derive2 { name="worms"; version="0.2.2"; sha256="183chjdi5qvsmdznvc9igcxaz769a37rwh5nzgvf5zf012a85wir"; depends=[httr plyr]; }; @@ -14351,7 +14566,7 @@ in with self; { wql = derive2 { name="wql"; version="0.4.9"; sha256="0m16l807mhcjkbqhlzhc24pw4hl78fjyykiszlg337x3qs803fg2"; depends=[ggplot2 reshape2 zoo]; }; wqs = derive2 { name="wqs"; version="0.0.1"; sha256="14qaa9g9v4nqrv897laflib3wwhflyfaf9wpllmbi5xfv9223rcg"; depends=[glm2 Rsolnp]; }; wrangle = derive2 { name="wrangle"; version="0.5.2"; sha256="1b6qgwdjvwbrarp9ylgkb5ia1p5a5g7ws0jyqrwc6hii8z5yj2qb"; depends=[dplyr lazyeval magrittr rlang tidyr]; }; - wrapr = derive2 { name="wrapr"; version="1.8.7"; sha256="1z35c2r28cdcvrma4i5mlsabhj8bj16avdb0zypq9rmf0v01s2rv"; depends=[]; }; + wrapr = derive2 { name="wrapr"; version="1.8.9"; sha256="153zs72cpm3phcl74ip4l2lgr65jn41509j3xkh34nala02kd8vw"; depends=[]; }; wrassp = derive2 { name="wrassp"; version="0.1.8"; sha256="052x0lxpchr6f97yfj3vmhh8gc8qg5pp1m91h5akrav4yfawbs7k"; depends=[]; }; write_snns = derive2 { name="write.snns"; version="0.0-4.2"; sha256="0sxg7z8rnh4lssbivkrfxldv4ivy37wkndzzndpbvq2gbvbjnp4l"; depends=[]; }; writexl = derive2 { name="writexl"; version="1.1"; sha256="0w4wnpl3yhaqp63p32bk60xrbmd7xd11kxifjbzrghi7d4483a46"; depends=[]; }; @@ -14363,10 +14578,10 @@ in with self; { wsyn = derive2 { name="wsyn"; version="1.0.1"; sha256="1lsaah5dndg1myx3qgbm4hih2wr1zgjfaracnyljfrri2cb436n6"; depends=[fields MASS]; }; wtest = derive2 { name="wtest"; version="3.1"; sha256="1rlas9jn57mcyjic9dhkqj355djldc95q07b076w847cd4pmzqvb"; depends=[]; }; wtss = derive2 { name="wtss"; version="1.1.0"; sha256="019zvmq4z5xy5dwcf4g0z43x2mb14d1lgqhs1zp6821izffpbd0s"; depends=[jsonlite lubridate RCurl roxygen2 zoo]; }; - wunderscraper = derive2 { name="wunderscraper"; version="0.1.0"; sha256="1h9nhxvs673n2ivw466qm77k20541cwgmmq35iv3dcb3hvw36p0r"; depends=[httr jsonlite sf tigris]; }; wux = derive2 { name="wux"; version="2.2-1"; sha256="0iw0kf0wfspnpc83v7gxhcakmp0z34cccnm0jn9c2za9ay9l2swv"; depends=[abind class corpcor fields gdata Hmisc ncdf4 reshape rgdal rgeos rworldmap sp stringr]; }; wvtool = derive2 { name="wvtool"; version="1.0"; sha256="0x9awj6g5lzqp2lhwgh9ib7jmfdzyhwazrjvw1vwacqqfhbz8qxv"; depends=[]; }; wwntests = derive2 { name="wwntests"; version="1.0.0"; sha256="1wsqbhsnzkishqwxz5kjcb5xawafizi3ip4yzxj05p9rx9wja1yc"; depends=[ftsa MASS rainbow sde]; }; + wyz_code_offensiveProgramming = derive2 { name="wyz.code.offensiveProgramming"; version="1.1.8"; sha256="00zhi7xzay5lppx49j9g18vp4czdzcjajqcy6qf5m4lhxjv2bhw7"; depends=[data_table lubridate tidyr]; }; x_ent = derive2 { name="x.ent"; version="1.1.7"; sha256="15qra77dqhj27g3qx92gram4mq4n9fdidygdpvxfmcx7ww3vc6yh"; depends=[ggplot2 jsonlite statmod stringr xtable]; }; x12 = derive2 { name="x12"; version="1.9.0"; sha256="0hrcw1d52yp5rr4r120lcnfxw2rgs95njg37m28blcnfbq2flfc2"; depends=[stringr x13binary]; }; x12GUI = derive2 { name="x12GUI"; version="0.13.0"; sha256="1mga7g9gwb3nv2qs27lz4n9rp6j3svads28hql88sxaif6is3nk1"; depends=[cairoDevice Hmisc lattice RGtk2 stringr x12]; }; @@ -14377,7 +14592,7 @@ in with self; { xRing = derive2 { name="xRing"; version="0.1.0"; sha256="17f1jif8yw2508k86p8mjgw1h20ml5wzaff04ix9xq96plqzi8ma"; depends=[dplR imager tcltk2 tkRplotR]; }; xSub = derive2 { name="xSub"; version="2.0.2"; sha256="00mahp8fi6iskjaf5nwka67a7hqb3i08j8yrd4d2av39zfs268h2"; depends=[countrycode haven RCurl]; }; xVA = derive2 { name="xVA"; version="0.8.1"; sha256="0wr4i37sya5gg6v63ka16g9077gxbhvjqyqfaahhban8skzl2adf"; depends=[SACCR Trading]; }; - xaringan = derive2 { name="xaringan"; version="0.10"; sha256="19a08bm7m1i3jyzn9wqrh46z6987dsq3z2p8r8zxyidb4d20k30v"; depends=[htmltools knitr rmarkdown servr xfun]; }; + xaringan = derive2 { name="xaringan"; version="0.11"; sha256="0020vrfimny7a2wa1v5jkfvb040bp17zr6l2wmz9nl505qlqs2j9"; depends=[htmltools knitr rmarkdown servr xfun]; }; xbreed = derive2 { name="xbreed"; version="1.0.1"; sha256="0grrfra9j0k3mqikmrif5qawh4260ayr40irskzpp9ywsixim63h"; depends=[BGLR]; }; xdcclarge = derive2 { name="xdcclarge"; version="0.1.0"; sha256="1j8wsidwmfjygqlwavxinv4bqc6rddy42jdmlknsjfrrs49yj8kn"; depends=[nlshrink Rcpp RcppArmadillo]; }; xergm = derive2 { name="xergm"; version="1.8.3"; sha256="155469550rsdwszrhw7vdgwz2h0d72a8f4hirrb6hny7f1q63ykk"; depends=[btergm GERGM rem tnam xergm_common]; }; @@ -14385,18 +14600,19 @@ in with self; { xesreadR = derive2 { name="xesreadR"; version="0.2.3"; sha256="1pvdx0mxg2f885bhy4hb3kqzcgva4q7hzzaipkfzyi5lnjdsbc81"; depends=[bupaR data_table dplyr lubridate purrr stringr tidyr XML xml2]; }; xfun = derive2 { name="xfun"; version="0.8"; sha256="05jlbi5byqpw0fkhmmxqglnaxh9gwbcigx77kcpw1pkxnpwfry62"; depends=[]; }; xgb2sql = derive2 { name="xgb2sql"; version="0.1.2"; sha256="1gw5dw0ck5hip8mv347zaswrggk395bg2hgn02bvqs0d31jhmgvi"; depends=[data_table xgboost]; }; - xgboost = derive2 { name="xgboost"; version="0.82.1"; sha256="0plhx63wcm4syslzmjfv6bdgaqn96fnav048hrj0vxk4dzgfp8sq"; depends=[data_table magrittr Matrix stringi]; }; + xgboost = derive2 { name="xgboost"; version="0.90.0.2"; sha256="1gy9rzg43mjpfis893vf15drmbigfn0481zrzss9ajnmnk0q8194"; depends=[data_table magrittr Matrix stringi]; }; 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.6"; sha256="1z2y0ihn68ppay7xkglhw7djki5654g6z4bbpyy41if57z9q554f"; depends=[extrafont ggplot2 Hmisc]; }; xkcdcolors = derive2 { name="xkcdcolors"; version="1.0"; sha256="07fnjv01r3b951dqca2zs9b9f6hsgbpbpsrggvb8rps53kpid0i7"; depends=[FNN]; }; + xlink = derive2 { name="xlink"; version="1.0.0"; sha256="0q5fsd7h067jwh7kgqn534dvnwnbr1xs3iwcpa4ygblp94b50rgm"; depends=[survival]; }; xlsimple = derive2 { name="xlsimple"; version="0.0.1"; sha256="1x0b2pb1sg2sqmh4z03bchsc9fhcphi6mxk4nbb6my2cr0kqrrdq"; depends=[]; }; xlsx = derive2 { name="xlsx"; version="0.6.1"; sha256="1d58qlzdj4vrk4vnlyzri600ix7z3wnc30gnbcc1qz27nlbbv055"; depends=[rJava xlsxjars]; }; xlsxjars = derive2 { name="xlsxjars"; version="0.6.1"; sha256="1rka5smm7yqnhhlblpihhciydfap4i6kjaa4a7isdg7qjmzm3h9p"; depends=[rJava]; }; xltabr = derive2 { name="xltabr"; version="0.1.2"; sha256="0pwbpcdiqkhvzxsi6yxly4zza12bw7zc7ji8cvhldw4yl5sxkz1l"; depends=[magrittr openxlsx]; }; xlutils3 = derive2 { name="xlutils3"; version="0.1.0"; sha256="1cxishi62bd36zlsy5qhzix1p68akdf9kpjg9gfm9aqpcijzccb9"; depends=[magrittr readxl]; }; xmeta = derive2 { name="xmeta"; version="1.1-4"; sha256="1y9jldi8qn4jpr05g8fnvb23gig180hh36pc2v4y8n8289s9yvg2"; depends=[aod glmmML metafor mvmeta numDeriv]; }; - xml2 = derive2 { name="xml2"; version="1.2.0"; sha256="154lmksfiwkhnlmryas25mjhfg6k4mmnnk7bbb29mnn5x5pr2yha"; depends=[Rcpp]; }; + xml2 = derive2 { name="xml2"; version="1.2.1"; sha256="0186d7r36xw1z9f8ajz35a0dz4ch6hmrjl9536yc7vq78v4vn5an"; depends=[Rcpp]; }; xmlparsedata = derive2 { name="xmlparsedata"; version="1.0.2"; sha256="1npf4ng9d34k56ib1ac4cb3p2x8gqm3jha1sc25nv6546ahcrcjh"; depends=[]; }; xmlrpc2 = derive2 { name="xmlrpc2"; version="1.1"; sha256="13rfw0civp3hzi4hn31x1idliid1qb73495x4c31z5msd35lzxrs"; depends=[base64enc curl xml2]; }; xmrr = derive2 { name="xmrr"; version="1.0.36"; sha256="0xxi8z9sp156508y5a7f4ax8yry7lg4qmn0hyk04dn1xr7syd4gs"; depends=[dplyr ggplot2 tidyr]; }; @@ -14417,7 +14633,6 @@ in with self; { xtal = derive2 { name="xtal"; version="1.15"; sha256="1zq3vd5x3vw6acn47yd2x7kflr9sm3znmdkm68cs64ha54jbl3vs"; depends=[]; }; xtensor = derive2 { name="xtensor"; version="0.11.1-0"; sha256="1l9216z46m45vnc69j4qx336ln82qgpagi5m9qa5pabvcpz9b23p"; depends=[Rcpp]; }; xtermStyle = derive2 { name="xtermStyle"; version="3.0.5"; sha256="1q4qq8w4sgxbbb1x0i4k5xndvwisvjszg830wspwb37wigxz8xvz"; depends=[]; }; - xtractomatic = derive2 { name="xtractomatic"; version="3.4.2"; sha256="1w70kk608avnf7zdjx79gxqmj12cw86ma4x0b9j92md1vmpw5389"; depends=[dplyr httr ncdf4 readr sp]; }; xts = derive2 { name="xts"; version="0.11-2"; sha256="1f0kxrvn13py3hk2gh2m56cqm39x3bqp1i350r5viddacrm2yxqj"; depends=[zoo]; }; xtune = derive2 { name="xtune"; version="0.1.0"; sha256="0bpf1cx7v7q0a1jip04xd0bjg9ilagrf7wg7a9y0m6wgw7s2b9jn"; depends=[glmnet selectiveInference]; }; xwf = derive2 { name="xwf"; version="0.2-2"; sha256="1psryam65pg7flfa20smm6lx184f76dhjv1lig8sy7y9hphfv3s1"; depends=[mgcv]; }; @@ -14447,21 +14662,22 @@ in with self; { yuimaGUI = derive2 { name="yuimaGUI"; version="1.3.0"; sha256="1znwfkhnmv9m32izikziqpgxx8gpw50786r81va808x7q058cp5n"; depends=[DT ggplot2 ghyp plotly quantmod sde shiny shinyBS shinydashboard shinyjs yuima]; }; yum = derive2 { name="yum"; version="0.0.1"; sha256="1q8yxn18nia7jh6g2016hxm81d2jak8pwylr6nai9kfynv9wri0g"; depends=[yaml]; }; yummlyr = derive2 { name="yummlyr"; version="0.1.1"; sha256="0xrk6g58laksz92d8mxck923sk4j92g55szrkxk123wjp5kg9vx6"; depends=[httr jsonlite]; }; - zCompositions = derive2 { name="zCompositions"; version="1.3.2"; sha256="1m7njjdisbkz8sx4x37w833d7wxvlz1dpxbmyckiigim2ixv8xin"; depends=[MASS miscF NADA truncnorm]; }; + zCompositions = derive2 { name="zCompositions"; version="1.3.2-1"; sha256="0xd0vgb6hvhxaqjkxwbgjfkx3mly4wkp40vzlsn2dph720vj87b7"; depends=[MASS NADA truncnorm]; }; + zFactor = derive2 { name="zFactor"; version="0.1.9"; sha256="1x0cfcmnmpb8dq6wn6538ghlz9cm00grv54dj91hvb09i96cp95x"; depends=[covr data_table dplyr ggplot2 knitcitations logging rootSolve tibble tidyr]; }; zTree = derive2 { name="zTree"; version="1.0.6"; sha256="1mywxrx6bw7dzhrdwyxbjzc8ikgvw423zycyji0jjr69cfhpmywv"; depends=[plyr]; }; zbank = derive2 { name="zbank"; version="0.1.0"; sha256="0vzvlri3sncvbz2cdg8wzlpskm1lq9ji0jrfy5cx4ib19m6gxhpc"; depends=[crul jsonlite tibble]; }; zeallot = derive2 { name="zeallot"; version="0.1.0"; sha256="1sd1igcfnv27pa3bqxlbyxchi562h7grnjg1l7wxx3bwr49i57s3"; depends=[]; }; zebu = derive2 { name="zebu"; version="0.1.2"; sha256="0f9fsb4z8s7k5jnz2ayd52dzri0z46kjbm0gi5rfqjlmk13bhgk4"; depends=[foreach ggplot2 iterators plyr reshape2]; }; zeitgebr = derive2 { name="zeitgebr"; version="0.3.3"; sha256="1g2bqc1xx42q54i6ck0ihpxkzw3hmxqn3cvv416afjc0cm45zw8d"; depends=[behavr data_table lomb pracma]; }; zeligverse = derive2 { name="zeligverse"; version="0.1.1"; sha256="1hf3hbgzdlhhyy2gvg984dwp8d0qm0ziyn8i9h5x00gwf74vn9dr"; depends=[Amelia dplyr MatchIt purrr rstudioapi tibble WhatIf Zelig ZeligChoice ZeligEI]; }; - zen4R = derive2 { name="zen4R"; version="0.1"; sha256="0zz2jzalc8r2cs1p92kchhx61s4bfc0vaj9abrp5j42h7ywsvfw3"; depends=[httr jsonlite R6]; }; + zen4R = derive2 { name="zen4R"; version="0.2"; sha256="064brdzjb42r034mfhwdhq6win6rn5zqwapnbbkk8m7yqbs1xvii"; depends=[httr jsonlite R6 rvest xml2]; }; zendeskR = derive2 { name="zendeskR"; version="0.4"; sha256="06cjwk08w3x6dx717123psinid5bx6c563jnfn890373jw6xnfrk"; depends=[RCurl rjson]; }; - zenplots = derive2 { name="zenplots"; version="0.0-4"; sha256="0fr9jxqwnbds2grysyz6j129043dfaakwy6gnsb0c7d2iigj9wjy"; depends=[graph MASS PairViz]; }; + zenplots = derive2 { name="zenplots"; version="1.0.0"; sha256="0jz7b52caymsw010dbls5rbakkilmkl6jnnhwbizybllnf2dg578"; depends=[graph loon MASS PairViz]; }; zeroEQpart = derive2 { name="zeroEQpart"; version="0.1.0"; sha256="1n24nqyl0irpyspwx4b73xy228a84aa8zsn9fcf2lrlni5vyzmm0"; depends=[MASS ppcor]; }; zetadiv = derive2 { name="zetadiv"; version="1.1.1"; sha256="0laxp2pd5s0s9wcnvs1r4shid2gi8ap4y9py6gpl207ywq6cxmgz"; depends=[car glm2 Imap mgcv nnls scam vegan]; }; zfa = derive2 { name="zfa"; version="1.0"; sha256="0lddwpifkzggzvy56ans5pfknfr8laxcg264f3ph2z150gw1plsh"; depends=[SKAT]; }; zic = derive2 { name="zic"; version="0.9.1"; sha256="1vd64ljigf6iwgzlgdxgj65nlwir176h7ddznddpaz2abh6n6zwp"; depends=[coda Rcpp RcppArmadillo]; }; - zip = derive2 { name="zip"; version="2.0.2"; sha256="1xvgs7mhxi0sdp5ix4nisqm9lf8f75b7ip7b1hqpq9bzh0x6z8ix"; depends=[]; }; + zip = derive2 { name="zip"; version="2.0.3"; sha256="0zii05jg9v9ljd0wd67g9x4bhlmpmsy5dzd093sbnc5n3vjbi32a"; depends=[]; }; zipR = derive2 { name="zipR"; version="0.1.1"; sha256="1aaw3dslhsw3zgxvkc1v60vsk44x64i4qmjwx0gq4f7dad1rbiqp"; depends=[]; }; zipcode = derive2 { name="zipcode"; version="1.0"; sha256="1lvlf1h5fv412idpdssjfh4fki933dm5nhr41ppl1mf45b9j7azn"; depends=[]; }; zipfR = derive2 { name="zipfR"; version="0.6-10"; sha256="16h5saj0b2qm3qwd7arzamn0n05hn31ybgzq4pb10ri0ajs1cvic"; depends=[]; }; diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index f0074843774..e813e550f6e 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -447,6 +447,7 @@ let mnormt = [ pkgs.libiconv ]; phangorn = [ pkgs.libiconv ]; quadprog = [ pkgs.libiconv ]; + sundialr = [ pkgs.libiconv ]; }; packagesRequireingX = [ diff --git a/pkgs/development/ruby-modules/solargraph/Gemfile.lock b/pkgs/development/ruby-modules/solargraph/Gemfile.lock index 0770eea4ad4..042c0366ffb 100644 --- a/pkgs/development/ruby-modules/solargraph/Gemfile.lock +++ b/pkgs/development/ruby-modules/solargraph/Gemfile.lock @@ -2,7 +2,7 @@ GEM remote: https://rubygems.org/ specs: ast (2.4.0) - backport (1.1.1) + backport (1.1.2) htmlentities (4.3.4) jaro_winkler (1.5.3) kramdown (1.17.0) @@ -23,7 +23,7 @@ GEM ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 1.7) ruby-progressbar (1.10.1) - solargraph (0.35.1) + solargraph (0.35.2) backport (~> 1.1) bundler (>= 1.17.2) htmlentities (~> 4.3, >= 4.3.4) diff --git a/pkgs/development/ruby-modules/solargraph/gemset.nix b/pkgs/development/ruby-modules/solargraph/gemset.nix index 7fa679fc162..2f0c60404bc 100644 --- a/pkgs/development/ruby-modules/solargraph/gemset.nix +++ b/pkgs/development/ruby-modules/solargraph/gemset.nix @@ -14,10 +14,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03j5w2a3qmjnqqqp9i1k8cla7rxfwk8r8j45pl8ndpwcx1hgrnjr"; + sha256 = "1xmjljpyx5ly078gi0lmmgkv4y0msxxa3hmv74bzxzp3l8qbn5vc"; type = "gem"; }; - version = "1.1.1"; + version = "1.1.2"; }; htmlentities = { groups = ["default"]; @@ -139,10 +139,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00pq74a3zvb7x333mwcz7m73p7g4sjwzxmci94jwasl0h35fapzg"; + sha256 = "1r0a7nfb0cwg2d7awbmvzk14594w7vkx844sshl9jpzkjx1asa9n"; type = "gem"; }; - version = "0.35.1"; + version = "0.35.2"; }; thor = { groups = ["default"]; diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 0db88835e6c..c26a5d8e0c8 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.104.0"; + version = "0.105.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "189pibz5b9md6dhiadr7616xlmmrx5zwh7brbyrvgbapq80k9lak"; + sha256 = "0p79v65h580vxm6j5nlrcxpkk4bxgn8wcvwmlfs70pbmdsj0hzwx"; }; installPhase = '' diff --git a/pkgs/development/tools/analysis/pmd/default.nix b/pkgs/development/tools/analysis/pmd/default.nix index 88d84ad1d11..3f3731e2ac8 100644 --- a/pkgs/development/tools/analysis/pmd/default.nix +++ b/pkgs/development/tools/analysis/pmd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pmd"; - version = "6.16.0"; + version = "6.17.0"; nativeBuildInputs = [ unzip ]; src = fetchurl { url = "mirror://sourceforge/pmd/pmd-bin-${version}.zip"; - sha256 = "0h4818dxd9nq925asa9g3g9i2i5hg85ziapacyiqq4bhab67ysy4"; + sha256 = "0000w28dg5z8gs7cxhx7d0fv10ry0yxamk5my28ncqqsg7a4qy8w"; }; installPhase = '' diff --git a/pkgs/development/tools/bazelisk/default.nix b/pkgs/development/tools/bazelisk/default.nix index 27db701ef54..6c0532eac48 100644 --- a/pkgs/development/tools/bazelisk/default.nix +++ b/pkgs/development/tools/bazelisk/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "bazelisk"; - version = "0.0.8"; + version = "1.0"; src = fetchFromGitHub { owner = "bazelbuild"; repo = pname; rev = "v${version}"; - sha256 = "16jiy71x8zr3x94p3qms3xbl8632avhwi66i82wv03n4ahkyb6qr"; + sha256 = "0516rx3qx6nxavy0a1qxjx2rcvdfb2ggig0q4n7fkmrxbnwxh2c9"; }; modSha256 = "1f73j6ryidzi3kfy3rhsqx047vzwvzaqcsl7ykhg87rn2l2s7fdl"; diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index 701b0c48388..1007f4df8ca 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -22,11 +22,11 @@ }: let - version = "0.28.0"; + version = "0.28.1"; src = fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - sha256 = "26ad8cdadd413b8432cf46d9fc3801e8db85d9922f85dd8a7f5a92fec876557f"; + sha256 = "0503fax70w7h6v00mkrrrgf1m5n0vkjqs76lyg95alhzc4yldsic"; }; # Update with `eval $(nix-build -A bazel.updater)`, @@ -323,7 +323,7 @@ stdenv.mkDerivation rec { genericPatches = '' # Substitute python's stub shebang to plain python path. (see TODO add pr URL) # See also `postFixup` where python is added to $out/nix-support - patchShebangs src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt \ + substituteInPlace src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt \ --replace "#!/usr/bin/env python" "#!${python3}/bin/python" # md5sum is part of coreutils diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 25ff6d09d42..0ec57cc8b82 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, jdk, makeWrapper }: +{ stdenv, fetchurl, unzip, jdk, java ? jdk, makeWrapper }: rec { gradleGen = {name, src, nativeVersion} : stdenv.mkDerivation rec { @@ -12,8 +12,8 @@ rec { gradle_launcher_jar=$(echo $out/lib/gradle/lib/gradle-launcher-*.jar) test -f $gradle_launcher_jar - makeWrapper ${jdk}/bin/java $out/bin/gradle \ - --set JAVA_HOME ${jdk} \ + makeWrapper ${java}/bin/java $out/bin/gradle \ + --set JAVA_HOME ${java} \ --add-flags "-classpath $gradle_launcher_jar org.gradle.launcher.GradleMain" ''; @@ -33,7 +33,7 @@ rec { echo ${stdenv.cc.cc} > $out/nix-support/manual-runtime-dependencies ''; - buildInputs = [ unzip jdk makeWrapper ]; + buildInputs = [ unzip java makeWrapper ]; meta = { description = "Enterprise-grade build system"; @@ -51,7 +51,9 @@ rec { }; }; - gradle_latest = gradleGen rec { + gradle_latest = gradle_5_3; + + gradle_5_3 = gradleGen rec { name = "gradle-5.3.1"; nativeVersion = "0.17"; diff --git a/pkgs/development/tools/build-managers/sbt-extras/default.nix b/pkgs/development/tools/build-managers/sbt-extras/default.nix index e0cfe59b051..cf19862b005 100644 --- a/pkgs/development/tools/build-managers/sbt-extras/default.nix +++ b/pkgs/development/tools/build-managers/sbt-extras/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, which, curl, makeWrapper, jdk }: let - rev = "a47a965e00ecd66793832e2a12a1972d25e6f734"; - version = "2019-04-05"; + rev = "53f1edc685d8f269ac551336809e34faf7cd29a6"; + version = "2019-08-14"; in stdenv.mkDerivation { name = "sbt-extras-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { owner = "paulp"; repo = "sbt-extras"; inherit rev; - sha256 = "1hrz7kg0k2iqq18bg6ll2bdj487p0987880dz0c0g35ah70ps2hj"; + sha256 = "1fyfwcnr30c0rgq6xfd2is9a8j1hsrl2p0xqicwqi4bzijy4r6gw"; }; dontBuild = true; diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix index ce15de8678d..08644def517 100644 --- a/pkgs/development/tools/build-managers/scons/default.nix +++ b/pkgs/development/tools/build-managers/scons/default.nix @@ -8,7 +8,7 @@ in { sha256 = "0wzid419mlwqw9llrg8gsx4nkzhqy16m4m40r0xnh6cwscw5wir4"; }; scons_latest = mkScons { - version = "3.0.5"; - sha256 = "0gn7fgxvx94bjm4cim29cdz91ar1rmfxk2f39wwgljvdvhinyryz"; + version = "3.1.0"; + sha256 = "0bqkrpk5j6wvlljpdsimazav44y43qkl9mzc4f8ig8nl73blixgk"; }; } diff --git a/pkgs/development/tools/buildkit/default.nix b/pkgs/development/tools/buildkit/default.nix new file mode 100644 index 00000000000..29b07fbfd0f --- /dev/null +++ b/pkgs/development/tools/buildkit/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, buildGoPackage }: + +buildGoPackage rec { + pname = "buildkit"; + version = "0.4.0"; + rev = "v${version}"; + + goPackagePath = "github.com/moby/buildkit"; + subPackages = [ "cmd/buildctl" ] ++ stdenv.lib.optionals stdenv.isLinux [ "cmd/buildkitd" ]; + + src = fetchFromGitHub { + inherit rev; + owner = "moby"; + repo = "buildkit"; + sha256 = "0gkwcjqbcskn63y79jwa26hxkps452z4bgz8lrryaskzbdpvhh3d"; + }; + + meta = with stdenv.lib; { + description = "Concurrent, cache-efficient, and Dockerfile-agnostic builder toolkit"; + homepage = https://github.com/moby/buildkit; + license = licenses.asl20; + maintainers = with maintainers; [ vdemeester ]; + }; +} diff --git a/pkgs/development/tools/cachix/default.nix b/pkgs/development/tools/cachix/default.nix deleted file mode 100644 index b6098ca98bf..00000000000 --- a/pkgs/development/tools/cachix/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ haskellPackages, haskell }: - -haskell.lib.justStaticExecutables (haskellPackages.extend (self: super: { - cachix = haskell.lib.doDistribute (self.cachix_0_2_1 or self.cachix); - cachix-api = self.cachix-api_0_2_1 or self.cachix-api; -})).cachix diff --git a/pkgs/development/tools/castxml/default.nix b/pkgs/development/tools/castxml/default.nix index 653d0d4505e..1011f95cce7 100644 --- a/pkgs/development/tools/castxml/default.nix +++ b/pkgs/development/tools/castxml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , pythonPackages , cmake , llvmPackages @@ -19,8 +19,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ] ++ stdenv.lib.optionals withMan [ pythonPackages.sphinx ]; + clangVersion = lib.getVersion llvmPackages.clang; + cmakeFlags = [ - "-DCLANG_RESOURCE_DIR=${llvmPackages.clang-unwrapped}" + "-DCLANG_RESOURCE_DIR=${llvmPackages.clang-unwrapped}/lib/clang/${clangVersion}/" "-DSPHINX_MAN=${if withMan then "ON" else "OFF"}" ]; diff --git a/pkgs/development/tools/electron/3.x.nix b/pkgs/development/tools/electron/3.x.nix index 597e66f9b29..a902f279a49 100644 --- a/pkgs/development/tools/electron/3.x.nix +++ b/pkgs/development/tools/electron/3.x.nix @@ -1,7 +1,7 @@ { stdenv, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv, gtk2, at-spi2-atk }: let - version = "3.1.8"; + version = "3.1.13"; name = "electron-${version}"; throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; @@ -19,19 +19,19 @@ let src = { i686-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-ia32.zip"; - sha256 = "1vq4vanlwixgk1q4v5d24f1ywgy2af1r14f9byzfy89vwds77yk9"; + sha256 = "04i0rcp4ajp4nf4arcl5crcc7a85sf0ixqd8jx07k2b1irv4dc23"; }; x86_64-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip"; - sha256 = "13zds8bzn4z11544llkh99fw75gddxs5b9h1m5xgjzw37vf6rpws"; + sha256 = "1psmbplz6jhnnf6hmfhxbmmhn4n1dpnhzbc12pxn645xhfpk9ark"; }; armv7l-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-armv7l.zip"; - sha256 = "0rfw1ydlmixyhifpmm2qyxapx3iqav4nlnzp2km9z7a0hpc4lii6"; + sha256 = "1pzs2cj12xw18jwab0mb8xhndwd95lbsj5ml5xdw2mb0ip5jsvsa"; }; aarch64-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-arm64.zip"; - sha256 = "0qrnvzjz78fblfg4r6xpzc40p10y6865gqpwx2h5vsdfp6sgq898"; + sha256 = "13pc7xn0dkb8i31vg9zplqcvb7r9r7q3inmr3419b5p9bl0687x8"; }; }.${stdenv.hostPlatform.system} or throwSystem; @@ -59,7 +59,7 @@ let src = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-darwin-x64.zip"; - sha256 = "0ms75306dq2ym838zk9d9nypnd8yjipl0zqyq9bvd4r32p241hw9"; + sha256 = "1vvjm4jifzjqvbs2kjlwg1h9p2czr2b5imjr9hld1j8nyfrzb0dx"; }; buildInputs = [ unzip ]; diff --git a/pkgs/development/tools/electron/5.x.nix b/pkgs/development/tools/electron/5.x.nix index 9da68f4dc46..0b993ccf2a7 100644 --- a/pkgs/development/tools/electron/5.x.nix +++ b/pkgs/development/tools/electron/5.x.nix @@ -1,7 +1,7 @@ { stdenv, libXScrnSaver, makeWrapper, fetchurl, wrapGAppsHook, gtk3, unzip, atomEnv, libuuid, at-spi2-atk, at-spi2-core }: let - version = "5.0.0"; + version = "5.0.8"; name = "electron-${version}"; throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; @@ -19,19 +19,19 @@ let src = { i686-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-ia32.zip"; - sha256 = "01320qv0x18rmjn6ibbs49pd04d58rz5dac509lxxay8nfb14gdp"; + sha256 = "1blw38x4fp4w2vs6r1d0jz3pg0m78417i0q9bvwpnwbn6wil857y"; }; x86_64-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip"; - sha256 = "0mkc8r5xggkzdypyq4hxigmjl6d1jn0139l8nwj1vr224ggnskhn"; + sha256 = "1gz5n8gkgka7343qcwckagd4ply1lxwiaccdjv16srk2wwc9bc9m"; }; armv7l-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-armv7l.zip"; - sha256 = "1w767yxm3b6sj52z0wnzr4vfn0m8n2jdjhj3ksmq6qrv401vvib3"; + sha256 = "1y8yna6z7xc378k6hsgngv9v98yjwq36knnr4qan0pw26paw1m82"; }; aarch64-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-arm64.zip"; - sha256 = "1nvpfkrizkmr6xxb2ls19p9mhgpms65ws09bx3l8sqq6275916jk"; + sha256 = "1ha4ajvi0z051b6npigw6w4xi3bj3hhpxfr3xw4fgx6g6bvf1vpx"; }; }.${stdenv.hostPlatform.system} or throwSystem; @@ -68,7 +68,7 @@ let src = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-darwin-x64.zip"; - sha256 = "07s2cq4ffpx86pjxrh1hcvk3r85saxqi3kkbbfkg9r1bbq8zbapm"; + sha256 = "1h7i2ik6wms5v6ji0mp33kzfh9sd89m7w3m2nm6wrjny7m0b43ww"; }; buildInputs = [ unzip ]; diff --git a/pkgs/development/tools/electron/6.x.nix b/pkgs/development/tools/electron/6.x.nix new file mode 100644 index 00000000000..5d412848d2d --- /dev/null +++ b/pkgs/development/tools/electron/6.x.nix @@ -0,0 +1,86 @@ +{ stdenv, libXScrnSaver, makeWrapper, fetchurl, wrapGAppsHook, gtk3, unzip, atomEnv, libuuid, at-spi2-atk, at-spi2-core}: + +let + version = "6.0.1"; + name = "electron-${version}"; + + throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; + + meta = with stdenv.lib; { + description = "Cross platform desktop application shell"; + homepage = https://github.com/electron/electron; + license = licenses.mit; + maintainers = with maintainers; [ travisbhartwell manveru ]; + platforms = [ "x86_64-darwin" "x86_64-linux" "i686-linux" "armv7l-linux" "aarch64-linux" ]; + }; + + linux = { + inherit name version meta; + src = { + i686-linux = fetchurl { + url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-ia32.zip"; + sha256 = "0ly6mjcljw0axkkrz7dsvfywmjb3pmspalfk2259gyqqxj8a37pb"; + }; + x86_64-linux = fetchurl { + url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip"; + sha256 = "0l8k6v16ynikf6x59w5byzhji0d6mqp2q0kjlrby56546qzyfkh6"; + }; + armv7l-linux = fetchurl { + url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-armv7l.zip"; + sha256 = "0c2xl8dm9fmj0d92w53zbn2np2fiwr88hw0dqjdn1rwczhw7zqss"; + }; + aarch64-linux = fetchurl { + url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-arm64.zip"; + sha256 = "0iyq229snm7z411xxfsv7f0bqg6hbw2l8y6ymys110f83hp01f8a"; + }; + }.${stdenv.hostPlatform.system} or throwSystem; + + buildInputs = [ gtk3 ]; + + nativeBuildInputs = [ + unzip + makeWrapper + wrapGAppsHook + ]; + + dontWrapGApps = true; # electron is in lib, we need to wrap it manually + + buildCommand = '' + mkdir -p $out/lib/electron $out/bin + unzip -d $out/lib/electron $src + ln -s $out/lib/electron/electron $out/bin + + fixupPhase + + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${atomEnv.libPath}:${stdenv.lib.makeLibraryPath [ libuuid at-spi2-atk at-spi2-core ]}:$out/lib/electron" \ + $out/lib/electron/electron + + wrapProgram $out/lib/electron/electron \ + --prefix LD_PRELOAD : ${stdenv.lib.makeLibraryPath [ libXScrnSaver ]}/libXss.so.1 \ + "''${gappsWrapperArgs[@]}" + ''; + }; + + darwin = { + inherit name version meta; + + src = fetchurl { + url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-darwin-x64.zip"; + sha256 = "0m8v5fs69kanrd1yk6smbmaaj9gb5j3q487z3wicifry0xn381i2"; + }; + + buildInputs = [ unzip ]; + + buildCommand = '' + mkdir -p $out/Applications + unzip $src + mv Electron.app $out/Applications + mkdir -p $out/bin + ln -s $out/Applications/Electron.app/Contents/MacOs/Electron $out/bin/electron + ''; + }; +in + + stdenv.mkDerivation (if stdenv.isDarwin then darwin else linux) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index fca9bc866fa..2efd97ebb1c 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -1,7 +1,7 @@ { stdenv, libXScrnSaver, makeWrapper, fetchurl, wrapGAppsHook, gtk3, unzip, atomEnv, libuuid, at-spi2-atk }: let - version = "4.1.5"; + version = "4.2.8"; name = "electron-${version}"; throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; @@ -19,19 +19,19 @@ let src = { i686-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-ia32.zip"; - sha256 = "0rqaydlg7wkccks7crwpylad0bsz8knm82mpb7hnj68p9njxpsbz"; + sha256 = "1sikxr0pfpi3wrf1d7fia1vhb1gacsy9pr7qc0fycgnzsy2nvf8n"; }; x86_64-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip"; - sha256 = "0xwvn41pvpsrx54waix8kmg3w1f1f9nmfn08hf9bkgnlgh251shy"; + sha256 = "0wc954cjc13flvdh8rkmnifdx6nirf273v1n76lsklbsq6c73i4h"; }; armv7l-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-armv7l.zip"; - sha256 = "172yq2m4i0pf72xr6w3xgkxfakkx2wrc54aah5j3nr6809bcnzji"; + sha256 = "0370ygpsm42drm70gj12i6mg960wchhqis7zz8i9is2ax1b2xjp5"; }; aarch64-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-arm64.zip"; - sha256 = "0gcgvgplg9c2sm53sa4nll4x486c4m190ma9a98xfx9mp9vy55vq"; + sha256 = "0vl90lsjcsgcxivbaq526ffbx3lsh6axfmpkfxl8cj2jlbsg593k"; }; }.${stdenv.hostPlatform.system} or throwSystem; @@ -68,7 +68,7 @@ let src = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-darwin-x64.zip"; - sha256 = "1z43ga620rw84x1yxvnxf11pd782s5vgj5dgnn4k0nfgxlihy058"; + sha256 = "083v8k17b596fa63a7qrwyn2k8pd5vmg9yijbqbnpfcg4ja3bjx9"; }; buildInputs = [ unzip ]; diff --git a/pkgs/development/tools/github-commenter/default.nix b/pkgs/development/tools/github-commenter/default.nix new file mode 100644 index 00000000000..969d7950cb9 --- /dev/null +++ b/pkgs/development/tools/github-commenter/default.nix @@ -0,0 +1,25 @@ +{ lib, fetchFromGitHub, buildGoPackage }: + +buildGoPackage rec { + pname = "github-commenter"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "cloudposse"; + repo = pname; + rev = version; + sha256 = "0y7yw7x8gqfbkqdfrwd9lffx3rrp62nz1aa86liy2dja97dacpij"; + }; + + goPackagePath = "github.com/cloudposse/${pname}"; + + goDeps = ./deps.nix; + + meta = with lib; { + description = "Command line utility for creating GitHub comments on Commits, Pull Request Reviews or Issues"; + license = licenses.asl20; + homepage = "https://github.com/cloudposse/github-commenter"; + maintainers = [ maintainers.mmahut ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/tools/github-commenter/deps.nix b/pkgs/development/tools/github-commenter/deps.nix new file mode 100644 index 00000000000..4b6be6c6d62 --- /dev/null +++ b/pkgs/development/tools/github-commenter/deps.nix @@ -0,0 +1,102 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 +[ + { + goPackagePath = "github.com/Masterminds/goutils"; + fetch = { + type = "git"; + url = "https://github.com/Masterminds/goutils"; + rev = "41ac8693c5c10a92ea1ff5ac3a7f95646f6123b0"; + sha256 = "180px47gj936qyk5bkv5mbbgiil9abdjq6kwkf7sq70vyi9mcfiq"; + }; + } + { + goPackagePath = "github.com/Masterminds/semver"; + fetch = { + type = "git"; + url = "https://github.com/Masterminds/semver"; + rev = "0fd41f6ff0825cf7efae00e706120bdd48914d93"; + sha256 = "0jf1c03c9cibfci7qaxbk8h758gmc9i0115jdw57v5c45hklw9ah"; + }; + } + { + goPackagePath = "github.com/Masterminds/sprig"; + fetch = { + type = "git"; + url = "https://github.com/Masterminds/sprig"; + rev = "7525b3376b8792ab24d07381324e4e2463e3356b"; + sha256 = "05ia4r8b86s7pk8r3jmjq5x7pgsmp6wvcm42z8vl6vdhdr28bfrg"; + }; + } + { + goPackagePath = "github.com/google/go-github"; + fetch = { + type = "git"; + url = "https://github.com/google/go-github"; + rev = "24f172eae1a0c53c780f259d8492979900e9af2e"; + sha256 = "1bxklfrl1wx2691qindiikkbyixd9p8pfqjn0xqi4riy5hcgz96s"; + }; + } + { + goPackagePath = "github.com/google/go-querystring"; + fetch = { + type = "git"; + url = "https://github.com/google/go-querystring"; + rev = "c8c88dbee036db4e4808d1f2ec8c2e15e11c3f80"; + sha256 = "1yckg2052mz7ps1m68wri6kyb5n4g0vx2yf7s0xs9gdqvvscp57l"; + }; + } + { + goPackagePath = "github.com/google/uuid"; + fetch = { + type = "git"; + url = "https://github.com/google/uuid"; + rev = "c2e93f3ae59f2904160ceaab466009f965df46d6"; + sha256 = "0zw8fvl6jqg0fmv6kmvhss0g4gkrbvgyvl2zgy5wdbdlgp4fja0h"; + }; + } + { + goPackagePath = "github.com/huandu/xstrings"; + fetch = { + type = "git"; + url = "https://github.com/huandu/xstrings"; + rev = "8bbcf2f9ccb55755e748b7644164cd4bdce94c1d"; + sha256 = "1ivvc95514z63k7cpz71l0dwlanffmsh1pijhaqmp41kfiby8rsx"; + }; + } + { + goPackagePath = "github.com/imdario/mergo"; + fetch = { + type = "git"; + url = "https://github.com/imdario/mergo"; + rev = "4c317f2286be3bd0c4f1a0e622edc6398ec4656d"; + sha256 = "0bihha1qsgfjk14yv1hwddv3d8dzxpbjlaxwwyys6lhgxz1cr9h9"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "27936f6d90f9c8e1145f11ed52ffffbfdb9e0af7"; + sha256 = "0yzmgi6g4ak4q8y7w6x0n5cbinlcn8yc3gwgzy4yck00qdn25d6y"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "4def268fd1a49955bfb3dda92fe3db4f924f2285"; + sha256 = "1bfsnari529gw34cz0zqk3d9mrkcj1ay35kangri8kbgll0ss5a6"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "ca1201d0de80cfde86cb01aea620983605dfe99b"; + sha256 = "16j9xyby1vfl4ch6wqzafxxxnxvcp8vhzknpchwabci1f2zcsn6i"; + }; + } +] diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix index f0870598956..ae7f24a62a5 100644 --- a/pkgs/development/tools/golangci-lint/default.nix +++ b/pkgs/development/tools/golangci-lint/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { name = "golangci-lint-${version}"; - version = "1.16.0"; + version = "1.17.1"; goPackagePath = "github.com/golangci/golangci-lint"; subPackages = [ "cmd/golangci-lint" ]; @@ -11,10 +11,10 @@ buildGoModule rec { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - sha256 = "1yzcfmrxyrxhq3vx13qm7czvhvdnaqay75v8ry1lgpg0bnh9pakx"; + sha256 = "1hs24nimv11c63a90ds8ps1lli16m3apsbrd9vpbq2rmxdbpwqac"; }; - modSha256 = "1dsaj6qsac9y4rkssjbmk46vaqbblzdim2rbdh3dgn1m0vdpv505"; + modSha256 = "0k0831rg6ygjffrq5y9488aiacskky7g6bvsfrgfz0g7i0mig1n6"; meta = with lib; { description = "Linters Runner for Go. 5x faster than gometalinter. Nice colored output."; diff --git a/pkgs/development/tools/heroku/default.nix b/pkgs/development/tools/heroku/default.nix index 67030740290..4b2d107aa91 100644 --- a/pkgs/development/tools/heroku/default.nix +++ b/pkgs/development/tools/heroku/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "heroku"; - version = "7.22.4"; + version = "7.27.1"; src = fetchurl { url = "https://cli-assets.heroku.com/heroku-v${version}/heroku-v${version}.tar.xz"; - sha256 = "067kvkdn7yvzb3ws6yjsfbypww914fclhnxrh2dw1hc6cazfgmqp"; + sha256 = "0aq89kvv80mz67j4dgl84ff5j58q5p3k82bbnvxs5nhf2jcandym"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/icestorm/default.nix b/pkgs/development/tools/icestorm/default.nix index c287e40d823..851acd17b7e 100644 --- a/pkgs/development/tools/icestorm/default.nix +++ b/pkgs/development/tools/icestorm/default.nix @@ -1,23 +1,26 @@ { stdenv, fetchFromGitHub , pkgconfig, libftdi , python3, pypy3 -}: -let - pypyCompatible = stdenv.isx86_64; /* pypy3 seems broken on i686 */ - pythonPkg = if pypyCompatible then pypy3 else python3; - pythonInterp = pythonPkg.interpreter; -in +# PyPy yields large improvements in build time and runtime performance, +# and IceStorm isn't intended to be used as a library other than by the +# nextpnr build process (which is also sped up by using PyPy), so we +# use it by default. See 18839e1 for more details. +, usePyPy ? stdenv.isx86_64 /* pypy3 seems broken on i686 */ +}: stdenv.mkDerivation rec { - name = "icestorm-${version}"; - version = "2019.04.16"; + pname = "icestorm"; + version = "2019.08.08"; + + pythonPkg = if usePyPy then pypy3 else python3; + pythonInterp = pythonPkg.interpreter; src = fetchFromGitHub { owner = "cliffordwolf"; repo = "icestorm"; - rev = "d9ea2e15fccebbbce59409b0ae7a1481d78aab86"; - sha256 = "1qa37p7hm7c2ga26xcvsd8xkqrp4hm0w6yh7cvz2q988yjzal5ky"; + rev = "2ccae0d3864fd7268118287a85963c0116745cff"; + sha256 = "1vlk5k7x6c1bjp19niyl0shljj8il94q2brjmda1rwhqxz81g9s7"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/tools/literate-programming/noweb/default.nix b/pkgs/development/tools/literate-programming/noweb/default.nix index 44df2b1e153..43cb6e6c2c7 100644 --- a/pkgs/development/tools/literate-programming/noweb/default.nix +++ b/pkgs/development/tools/literate-programming/noweb/default.nix @@ -1,29 +1,77 @@ -{stdenv, fetchurl, gawk}: - -stdenv.mkDerivation { - name = "noweb-2.11b"; - src = fetchurl { - urls = [ "http://ftp.de.debian.org/debian/pool/main/n/noweb/noweb_2.11b.orig.tar.gz" - "ftp://www.eecs.harvard.edu/pub/nr/noweb.tgz" - ]; - sha256 = "10hdd6mrk26kyh4bnng4ah5h1pnanhsrhqa7qwqy6dyv3rng44y9"; +{ stdenv, fetchFromGitHub, gawk, groff, icon-lang ? null }: + +let noweb = stdenv.mkDerivation rec { + pname = "noweb"; + version = "2.12"; + + src = fetchFromGitHub { + owner = "nrnrnr"; + repo = "noweb"; + rev = "v${builtins.replaceStrings ["."] ["_"] version}"; + sha256 = "1160i2ghgzqvnb44kgwd6s3p4jnk9668rmc15jlcwl7pdf3xqm95"; }; + + patches = [ ./no-FAQ.patch ]; + + nativeBuildInputs = [ groff ] ++ stdenv.lib.optionals (!isNull icon-lang) [ icon-lang ]; + preBuild = '' - mkdir -p $out/lib/noweb + mkdir -p "$out/lib/noweb" cd src - makeFlags="BIN=$out/bin LIB=$out/lib/noweb MAN=$out/share/man TEXINPUTS=$out/share/texmf/tex/latex" ''; - preInstall=''mkdir -p $out/share/texmf/tex/latex''; - postInstall= '' - substituteInPlace $out/bin/cpif --replace "PATH=/bin:/usr/bin" "" - for f in $out/bin/{noweb,nountangle,noroots,noroff,noindex} \ - $out/lib/noweb/{toroff,btdefn,totex,noidx,unmarkup,toascii,tohtml,emptydefn}; do - substituteInPlace $f --replace "nawk" "${gawk}/bin/awk" + + makeFlags = stdenv.lib.optionals (!isNull icon-lang) [ + "LIBSRC=icon" + "ICONC=icont" + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + "CC=clang" + ]; + + installFlags = [ + "BIN=$(out)/bin" + "ELISP=$(out)/share/emacs/site-lisp" + "LIB=$(out)/lib/noweb" + "MAN=$(out)/share/man" + "TEXINPUTS=$(tex)/tex/latex/noweb" + ]; + + preInstall = '' + mkdir -p "$tex/tex/latex/noweb" + ''; + + installTargets = "install-code install-tex install-elisp"; + + postInstall = '' + substituteInPlace "$out/bin/cpif" --replace "PATH=/bin:/usr/bin" "" + + for f in $out/bin/no{index,roff,roots,untangle,web} \ + $out/lib/noweb/to{ascii,html,roff,tex} \ + $out/lib/noweb/{bt,empty}defn \ + $out/lib/noweb/{noidx,unmarkup}; do + # NOTE: substituteInPlace breaks Icon binaries, so make sure the script + # uses (n)awk before calling. + if grep -q nawk "$f"; then + substituteInPlace "$f" --replace "nawk" "${gawk}/bin/awk" + fi done + + # HACK: This is ugly, but functional. + PATH=$out/bin:$PATH make -BC xdoc + make $installFlags install-man + + ln -s "$tex" "$out/share/texmf" ''; - patches = [ ./no-FAQ.patch ]; - meta = { - platforms = stdenv.lib.platforms.linux; + outputs = [ "out" "tex" ]; + + tlType = "run"; + passthru.pkgs = [ noweb.tex ]; + + meta = with stdenv.lib; { + description = "A simple, extensible literate-programming tool"; + homepage = https://www.cs.tufts.edu/~nr/noweb; + license = licenses.bsd2; + maintainers = with maintainers; [ yurrriq ]; + platforms = with platforms; linux ++ darwin; }; -} +}; in noweb diff --git a/pkgs/development/tools/minizinc/ide.nix b/pkgs/development/tools/minizinc/ide.nix index 48a29901ca3..799623d34cc 100644 --- a/pkgs/development/tools/minizinc/ide.nix +++ b/pkgs/development/tools/minizinc/ide.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, qtbase, qtwebengine, qtwebkit, qmake, makeWrapper, minizinc }: let - version = "2.3.0"; + version = "2.3.1"; in stdenv.mkDerivation { name = "minizinc-ide-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { owner = "MiniZinc"; repo = "MiniZincIDE"; rev = version; - sha256 = "0458k7m97qxxylcl60qvp026kicfc4ilxwlb1p3jvjhi9384r00a"; + sha256 = "0w9p5j2i7q4khmxyk2lr7a3qb2kd6ff1hfssxhgpm7zgzixm2300"; }; sourceRoot = "source/MiniZincIDE"; diff --git a/pkgs/development/tools/misc/blackmagic/default.nix b/pkgs/development/tools/misc/blackmagic/default.nix index 28146352835..ddc15f856b5 100644 --- a/pkgs/development/tools/misc/blackmagic/default.nix +++ b/pkgs/development/tools/misc/blackmagic/default.nix @@ -1,28 +1,30 @@ { stdenv, lib, fetchFromGitHub -, gcc-arm-embedded, binutils-arm-embedded, libftdi +, gcc-arm-embedded, libftdi1 , python, pythonPackages }: with lib; stdenv.mkDerivation rec { - name = "blackmagic-${version}"; - version = "1.6.1"; + pname = "blackmagic"; + version = "unstable-2019-08-13"; + # `git describe --always` + firmwareVersion = "v1.6.1-317-gc9c8b08"; src = fetchFromGitHub { owner = "blacksphere"; repo = "blackmagic"; - rev = "29386aee140e5e99a958727358f60980418b4c88"; - sha256 = "05x19y80mixk6blpnfpfngy5d41jpjvdqgjzkmhv1qc03bhyhc82"; + rev = "c9c8b089f716c31433432f5ee54c5c206e4945cf"; + sha256 = "0175plba7h3r1p584ygkjlvg2clvxa2m0xfdcb2v8jza2vzc8ywd"; fetchSubmodules = true; }; nativeBuildInputs = [ - gcc-arm-embedded binutils-arm-embedded + gcc-arm-embedded ]; buildInputs = [ - libftdi + libftdi1 python pythonPackages.intelhex ]; @@ -30,7 +32,7 @@ stdenv.mkDerivation rec { postPatch = '' # Prevent calling out to `git' to generate a version number: substituteInPlace src/Makefile \ - --replace '`git describe --always --dirty`' '${version}' + --replace '$(shell git describe --always --dirty)' '${firmwareVersion}' # Fix scripts that generate headers: for f in $(find scripts libopencm3/scripts -type f); do @@ -41,6 +43,8 @@ stdenv.mkDerivation rec { buildPhase = "${stdenv.shell} ${./helper.sh}"; installPhase = ":"; # buildPhase does this. + enableParallelBuilding = true; + meta = { description = "In-application debugger for ARM Cortex microcontrollers"; longDescription = '' @@ -56,7 +60,7 @@ stdenv.mkDerivation rec { ''; homepage = https://github.com/blacksphere/blackmagic; license = licenses.gpl3Plus; - maintainers = with maintainers; [ pjones ]; + maintainers = with maintainers; [ pjones emily ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/misc/blackmagic/helper.sh b/pkgs/development/tools/misc/blackmagic/helper.sh index b4c7558885b..991d0249e16 100755 --- a/pkgs/development/tools/misc/blackmagic/helper.sh +++ b/pkgs/development/tools/misc/blackmagic/helper.sh @@ -10,6 +10,8 @@ out=${out:-/tmp} ################################################################################ export CFLAGS=$NIX_CFLAGS_COMPILE +export MAKEFLAGS="\ + ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}}" ################################################################################ PRODUCTS="blackmagic.bin blackmagic.hex blackmagic_dfu.bin blackmagic_dfu.hex" diff --git a/pkgs/development/tools/misc/cgdb/default.nix b/pkgs/development/tools/misc/cgdb/default.nix index 31e720b13f2..6de69a34b29 100644 --- a/pkgs/development/tools/misc/cgdb/default.nix +++ b/pkgs/development/tools/misc/cgdb/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "cgdb-${version}"; - version = "0.7.0"; + version = "0.7.1"; src = fetchurl { url = "https://cgdb.me/files/${name}.tar.gz"; - sha256 = "08slzg3702v5nivjhdx2bciqxc5vqcn8pc4i4lsgkcwdcrj94ymz"; + sha256 = "1671gpz5gx5j0zga8xy2x7h33vqh3nij93lbb6dbb366ivjknwmv"; }; buildInputs = [ ncurses readline flex texinfo ]; diff --git a/pkgs/development/tools/misc/cli11/default.nix b/pkgs/development/tools/misc/cli11/default.nix index 904119bd6ae..a3579b73408 100644 --- a/pkgs/development/tools/misc/cli11/default.nix +++ b/pkgs/development/tools/misc/cli11/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cli11"; - version = "1.7.1"; + version = "1.8.0"; src = fetchFromGitHub { owner = "CLIUtils"; repo = "CLI11"; rev = "v${version}"; - sha256 = "0wddck970pczk7c201i2g6s85mkv4f2f4zxy6mndh3pfz41wcs2d"; + sha256 = "0i1x4ax5hal7jdsxw40ljwfv68h0ac85iyi35i8p52p9s5qsc71q"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/tools/misc/libtool/libtool2.nix b/pkgs/development/tools/misc/libtool/libtool2.nix index 0fb3dfed744..0424b901251 100644 --- a/pkgs/development/tools/misc/libtool/libtool2.nix +++ b/pkgs/development/tools/misc/libtool/libtool2.nix @@ -2,10 +2,11 @@ }: stdenv.mkDerivation rec { - name = "libtool-2.4.6"; + pname = "libtool"; + version = "2.4.6"; src = fetchurl { - url = "mirror://gnu/libtool/${name}.tar.gz"; + url = "mirror://gnu/libtool/${pname}-${version}.tar.gz"; sha256 = "1qq61k6lp1fp75xs398yzi6wvbx232l7xbyn3p13cnh27mflvgg3"; }; @@ -23,13 +24,14 @@ stdenv.mkDerivation rec { doCheck = false; doInstallCheck = false; + enableParallelBuilding = true; + # Don't run the native `strip' when cross-compiling. This breaks at least # with `.a' files for MinGW. dontStrip = stdenv.hostPlatform != stdenv.buildPlatform; - meta = { + meta = with stdenv.lib; { description = "GNU Libtool, a generic library support script"; - longDescription = '' GNU libtool is a generic library support script. Libtool hides the complexity of using shared libraries behind a consistent, @@ -39,12 +41,9 @@ stdenv.mkDerivation rec { your Makefile, Makefile.in, or Makefile.am. See the documentation for details. ''; - homepage = https://www.gnu.org/software/libtool/; - - license = stdenv.lib.licenses.gpl2Plus; - + license = licenses.gpl2Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/misc/luarocks/darwin-3.0.x.patch b/pkgs/development/tools/misc/luarocks/darwin-3.0.x.patch index a5e4ac461b4..013ac5180af 100644 --- a/pkgs/development/tools/misc/luarocks/darwin-3.0.x.patch +++ b/pkgs/development/tools/misc/luarocks/darwin-3.0.x.patch @@ -10,7 +10,7 @@ index f93e67a..2eb2db9 100644 + defaults.variables.STAT = "stat" defaults.variables.STATFLAG = "-f '%A'" - local version = util.popen_read("sw_vers -productVersion") -+ local version = "10.10" ++ local version = os.getenv("MACOSX_DEPLOYMENT_TARGET") or "10.12" version = tonumber(version and version:match("^[^.]+%.([^.]+)")) or 3 if version >= 10 then version = 8 diff --git a/pkgs/development/tools/misc/luarocks/darwin-3.1.3.patch b/pkgs/development/tools/misc/luarocks/darwin-3.1.3.patch index 7ef1c7a319c..4ba883f0113 100644 --- a/pkgs/development/tools/misc/luarocks/darwin-3.1.3.patch +++ b/pkgs/development/tools/misc/luarocks/darwin-3.1.3.patch @@ -7,7 +7,7 @@ index c5af5a2..1949fdc 100644 defaults.arch = "macosx-"..target_cpu defaults.variables.LIBFLAG = "-bundle -undefined dynamic_lookup -all_load" - local version = util.popen_read("sw_vers -productVersion") -+ local version = "10.10" ++ local version = os.getenv("MACOSX_DEPLOYMENT_TARGET") or "10.12" version = tonumber(version and version:match("^[^.]+%.([^.]+)")) or 3 if version >= 10 then version = 8 diff --git a/pkgs/development/tools/misc/sccache/default.nix b/pkgs/development/tools/misc/sccache/default.nix index 0d2e813071e..0c994e88e23 100644 --- a/pkgs/development/tools/misc/sccache/default.nix +++ b/pkgs/development/tools/misc/sccache/default.nix @@ -1,21 +1,18 @@ { stdenv, fetchFromGitHub, cargo, rustc, rustPlatform, pkgconfig, glib, openssl, darwin }: rustPlatform.buildRustPackage rec { - version = "0.2.9"; + version = "0.2.10"; name = "sccache-${version}"; src = fetchFromGitHub { owner = "mozilla"; repo = "sccache"; rev = version; - sha256 = "0glaaan6fh19a2d8grgsgnbgw5w53vjl0qmvvnq0ldp3hax90v46"; + sha256 = "13fiifv3bi9shzp30wd7k2nd2j43vzdhk6z5rnfn5a9hmijqpg9n"; }; - cargoSha256 = "0chfdyhj9lyxydbnmldc8rh2v9dda46sxhv35g34a5137sjrizfh"; + cargoSha256 = "1bkglgrasyjyzjj9mwm32d3g3mg5yv74jj3zl7jf20dlq3rg3fh6"; + cargoBuildFlags = [ "--features=all" ]; - # see https://github.com/mozilla/sccache/issues/467 - postPatch = '' - sed -i 's/\(version = "0.2.9\)-alpha.0"/\1"/g' Cargo.lock - ''; nativeBuildInputs = [ pkgconfig cargo rustc ]; diff --git a/pkgs/development/tools/misc/stlink/default.nix b/pkgs/development/tools/misc/stlink/default.nix index 90f901e5112..fdacdaef20f 100644 --- a/pkgs/development/tools/misc/stlink/default.nix +++ b/pkgs/development/tools/misc/stlink/default.nix @@ -1,17 +1,19 @@ -{ stdenv, fetchurl, cmake, libusb1 }: +{ stdenv, fetchFromGitHub, cmake, libusb1 }: # IMPORTANT: You need permissions to access the stlink usb devices. # Add services.udev.pkgs = [ pkgs.stlink ] to your configuration.nix let - version = "1.3.0"; + version = "1.5.1"; in stdenv.mkDerivation { name = "stlink-${version}"; - src = fetchurl { - url = "https://github.com/texane/stlink/archive/${version}.tar.gz"; - sha256 = "3e8cba21744d2c38a0557f6835a05189e1b98202931bb0183d22efc462c893dd"; + src = fetchFromGitHub { + owner = "texane"; + repo = "stlink"; + rev = "v1.5.1"; + sha256 = "1d5gxiqpsm8fc105cxlp27af9fk339fap5h6nay21x5a7n61jgyc"; }; buildInputs = [ cmake libusb1 ]; diff --git a/pkgs/development/tools/misc/swig/4.nix b/pkgs/development/tools/misc/swig/4.nix new file mode 100644 index 00000000000..68febba3813 --- /dev/null +++ b/pkgs/development/tools/misc/swig/4.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }: + +stdenv.mkDerivation rec { + pname = "swig"; + version = "4.0.0"; + + src = fetchFromGitHub { + owner = "swig"; + repo = "swig"; + rev = "rel-${version}"; + sha256 = "0yx33972jd3214xr3mrap0j5clma9bvs42qz8x38dfz62xlsi78v"; + }; + + PCRE_CONFIG = "${pcre.dev}/bin/pcre-config"; + nativeBuildInputs = [ autoconf automake libtool bison ]; + buildInputs = [ pcre ]; + + configureFlags = [ "--without-tcl" ]; + + # Disable ccache documentation as it needs yodl + postPatch = '' + sed -i '/man1/d' CCache/Makefile.in + ''; + + preConfigure = '' + ./autogen.sh + ''; + + meta = with stdenv.lib; { + description = "SWIG, an interface compiler that connects C/C++ code to higher-level languages"; + homepage = http://swig.org/; + # Different types of licenses available: http://www.swig.org/Release/LICENSE . + license = licenses.gpl3Plus; + maintainers = with maintainers; [ orivej ]; + platforms = with platforms; linux ++ darwin; + }; +} diff --git a/pkgs/development/tools/misc/terracognita/default.nix b/pkgs/development/tools/misc/terracognita/default.nix new file mode 100644 index 00000000000..832a2285569 --- /dev/null +++ b/pkgs/development/tools/misc/terracognita/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "terracognita"; + version = "0.1.6"; + + src = fetchFromGitHub { + owner = "cycloidio"; + repo = pname; + rev = "v${version}"; + sha256 = "0ljh9dyn919k5f0yaca5an2vczj8cd5cb6qb4i5bdgmlh3wijiag"; + }; + + modSha256 = "1ssz6rhdqma79x75qsxpa9is5zw1nlc0rv1h23dfsk8vla3p84ml"; + + meta = with lib; { + description = "Reads from existing Cloud Providers (reverse Terraform) and generates your infrastructure as code on Terraform configuration"; + homepage = "https://github.com/cycloidio/terracognita"; + license = licenses.mit; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/development/tools/misc/tinyprog/default.nix b/pkgs/development/tools/misc/tinyprog/default.nix new file mode 100644 index 00000000000..10d067e2c61 --- /dev/null +++ b/pkgs/development/tools/misc/tinyprog/default.nix @@ -0,0 +1,42 @@ +{ lib +, python3Packages +, fetchFromGitHub +}: + +with python3Packages; buildPythonApplication rec { + pname = "tinyprog"; + # `python setup.py --version` from repo checkout + version = "1.0.24.dev99+ga77f828"; + + src = fetchFromGitHub { + owner = "tinyfpga"; + repo = "TinyFPGA-Bootloader"; + rev = "a77f828d3d6ae077e323ec96fc3925efab5aa9d7"; + sha256 = "0jg47q0n1qkdrzri2q6n9a7czicj0qk58asz0xhzkajx1k9z3g5q"; + }; + + sourceRoot = "source/programmer"; + + propagatedBuildInputs = [ + pyserial + jsonmerge + intelhex + tqdm + six + packaging + pyusb + ]; + + nativeBuildInputs = [ setuptools_scm ]; + + preBuild = '' + export SETUPTOOLS_SCM_PRETEND_VERSION="${version}" + ''; + + meta = with lib; { + homepage = https://github.com/tinyfpga/TinyFPGA-Bootloader/tree/master/programmer; + description = "Programmer for FPGA boards using the TinyFPGA USB Bootloader"; + maintainers = with maintainers; [ emily ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/tools/ocaml/camlp4/default.nix b/pkgs/development/tools/ocaml/camlp4/default.nix index 2974ca965fd..a83959fba39 100644 --- a/pkgs/development/tools/ocaml/camlp4/default.nix +++ b/pkgs/development/tools/ocaml/camlp4/default.nix @@ -19,6 +19,9 @@ let param = { "4.07" = { version = "4.07+1"; sha256 = "0cxl4hkqcvspvkx4f2k83217rh6051fll9i2yz7cw6m3bq57mdvl"; }; + "4.08" = { + version = "4.08+1"; + sha256 = "0qplawvxwai25bi27niw2cgz2al01kcnkj8wxwhxslpi21z6pyx1"; }; }."${ocaml.meta.branch}"; in diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix index efd6e562c29..19432843218 100644 --- a/pkgs/development/tools/ocaml/camlp5/default.nix +++ b/pkgs/development/tools/ocaml/camlp5/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation { - name = "camlp5-7.07"; + name = "camlp5-7.08"; src = fetchzip { - url = "https://github.com/camlp5/camlp5/archive/rel707.tar.gz"; - sha256 = "1c8v45553ccbqha2ypfranqlgw06rr5wjr2hlnrx5bf9jfq0h0dn"; + url = "https://github.com/camlp5/camlp5/archive/rel708.tar.gz"; + sha256 = "0b39bvr1aa7kzjhbyycmvcrwil2yjbxc84cb43zfzahx4p2aqr76"; }; buildInputs = [ ocaml ]; diff --git a/pkgs/development/tools/ocaml/dune/default.nix b/pkgs/development/tools/ocaml/dune/default.nix index 61637027386..570edd8223b 100644 --- a/pkgs/development/tools/ocaml/dune/default.nix +++ b/pkgs/development/tools/ocaml/dune/default.nix @@ -6,10 +6,10 @@ else stdenv.mkDerivation rec { pname = "dune"; - version = "1.11.0"; + version = "1.11.1"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/dune-build-info-${version}.tbz"; - sha256 = "11jl2vavypbgvwblch25q10hsd16myik9b3cd4d64zhxk1fzbzdw"; + sha256 = "0hizfaidl1bxl614i65yvyfhsjbp93y7y9qy1a8zw448w1js5bsp"; }; buildInputs = [ ocaml findlib ]; diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix index 18b84e2c961..91870a570b0 100644 --- a/pkgs/development/tools/ocaml/findlib/default.nix +++ b/pkgs/development/tools/ocaml/findlib/default.nix @@ -1,33 +1,17 @@ { stdenv, fetchurl, fetchpatch, m4, ncurses, ocaml, writeText }: -let param = - if stdenv.lib.versionAtLeast ocaml.version "4" - then { - version = "1.8.0"; - sha256 = "1b97zqjdriqd2ikgh4rmqajgxwdwn013riji5j53y3xvcmnpsyrb"; - } else { - version = "1.7.3"; - sha256 = "12xx8si1qv3xz90qsrpazjjk4lc1989fzm97rsmc4diwla7n15ni"; - patches = [ (fetchpatch { - url = "https://raw.githubusercontent.com/ocaml/opam-repository/1f29c5ef8eccd373e5ff2169a30bfd95a9ae6050/packages/ocamlfind/ocamlfind.1.7.3-1/files/threads.patch"; - sha256 = "0cqgpjqpmfbr0ph3jr25gw8hgckj4qlfwmir6vkgi5hvn2qnjpx3"; - }) ]; - }; -in - stdenv.mkDerivation rec { name = "ocaml-findlib-${version}"; - inherit (param) version; + version = "1.8.1"; src = fetchurl { url = "http://download.camlcity.org/download/findlib-${version}.tar.gz"; - inherit (param) sha256; + sha256 = "00s3sfb02pnjmkax25pcnljcnhcggiliccfz69a72ic7gsjwz1cf"; }; buildInputs = [m4 ncurses ocaml]; - patches = [ ./ldconf.patch ./install_topfind.patch ] - ++ (param.patches or []); + patches = [ ./ldconf.patch ./install_topfind.patch ]; dontAddPrefix=true; diff --git a/pkgs/development/tools/ocaml/findlib/install_topfind.patch b/pkgs/development/tools/ocaml/findlib/install_topfind.patch index 7cd32991d0e..dbdb0edd6cb 100644 --- a/pkgs/development/tools/ocaml/findlib/install_topfind.patch +++ b/pkgs/development/tools/ocaml/findlib/install_topfind.patch @@ -6,7 +6,7 @@ mkdir -p "$(prefix)$(OCAMLFIND_BIN)" - test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(prefix)$(OCAML_CORE_STDLIB)" + test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(prefix)$(OCAML_SITELIB)" - files=`$(SH) $(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma findlib.cmxa findlib.a findlib.cmxs topfind.cmi topfind.mli fl_package_base.mli fl_package_base.cmi fl_metascanner.mli fl_metascanner.cmi fl_metatoken.cmi findlib_top.cma findlib_top.cmxa findlib_top.a findlib_top.cmxs findlib_dynload.cma findlib_dynload.cmxa findlib_dynload.a findlib_dynload.cmxs fl_dynload.mli fl_dynload.cmi META` && \ + files=`$(SH) $(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma findlib.cmxa findlib$(LIB_SUFFIX) findlib.cmxs topfind.cmi topfind.mli fl_package_base.mli fl_package_base.cmi fl_metascanner.mli fl_metascanner.cmi fl_metatoken.cmi findlib_top.cma findlib_top.cmxa findlib_top$(LIB_SUFFIX) findlib_top.cmxs findlib_dynload.cma findlib_dynload.cmxa findlib_dynload$(LIB_SUFFIX) findlib_dynload.cmxs fl_dynload.mli fl_dynload.cmi META` && \ cp $$files "$(prefix)$(OCAML_SITELIB)/$(NAME)" f="ocamlfind$(EXEC_SUFFIX)"; { test -f ocamlfind_opt$(EXEC_SUFFIX) && f="ocamlfind_opt$(EXEC_SUFFIX)"; }; \ diff --git a/pkgs/development/tools/parsing/antlr/3.5.nix b/pkgs/development/tools/parsing/antlr/3.5.nix index 4c213ed1c4c..6fa6323d3e8 100644 --- a/pkgs/development/tools/parsing/antlr/3.5.nix +++ b/pkgs/development/tools/parsing/antlr/3.5.nix @@ -1,18 +1,23 @@ -{stdenv, fetchurl, jre}: +{stdenv, fetchurl, fetchFromGitHub, jre}: stdenv.mkDerivation rec { - name = "antlr-${version}"; + pname = "antlr"; version = "3.5.2"; - src = fetchurl { - url ="https://www.antlr3.org/download/antlr-${version}-complete.jar"; + jar = fetchurl { + url = "https://www.antlr3.org/download/antlr-${version}-complete.jar"; sha256 = "0srjwxipwsfzmpi0v32d1l5lzk9gi5in8ayg33sq8wyp8ygnbji6"; }; - - dontUnpack = true; + src = fetchFromGitHub { + owner = "antlr"; + repo = "antlr3"; + rev = "5c2a916a10139cdb5c7c8851ee592ed9c3b3d4ff"; + sha256 = "1i0w2v9prrmczlwkfijfp4zfqfgrss90a7yk2hg3y0gkg2s4abbk"; + }; installPhase = '' - mkdir -p "$out"/{lib/antlr,bin} - cp "$src" "$out/lib/antlr/antlr-${version}-complete.jar" + mkdir -p "$out"/{lib/antlr,bin,include} + cp "$jar" "$out/lib/antlr/antlr-${version}-complete.jar" + cp runtime/Cpp/include/* $out/include/ echo "#! ${stdenv.shell}" >> "$out/bin/antlr" echo "'${jre}/bin/java' -cp '$out/lib/antlr/antlr-${version}-complete.jar' -Xms200M -Xmx400M org.antlr.Tool \"\$@\"" >> "$out/bin/antlr" @@ -32,8 +37,9 @@ stdenv.mkDerivation rec { frameworks. From a grammar, ANTLR generates a parser that can build and walk parse trees. ''; - homepage = https://www.antlr.org/; + homepage = "https://www.antlr.org/"; license = licenses.bsd3; platforms = platforms.linux; + maintainers = [ stdenv.lib.maintainers.farlion ]; }; } diff --git a/pkgs/development/tools/parsing/byacc/default.nix b/pkgs/development/tools/parsing/byacc/default.nix index 4e73c820912..9b3fd86b555 100644 --- a/pkgs/development/tools/parsing/byacc/default.nix +++ b/pkgs/development/tools/parsing/byacc/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "byacc-${version}"; - version = "20180609"; + version = "20190617"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/byacc/${name}.tgz" "https://invisible-mirror.net/archives/byacc/${name}.tgz" ]; - sha256 = "173l9yai5yndbyn8nzdl6q11wv4x959bd0w392i82nfsqcz0pfsv"; + sha256 = "13ai0az00c86s4k94cpgh48nf5dfccpvccpw635z42wjgcb6hy7q"; }; configureFlags = [ diff --git a/pkgs/development/tools/profiling/systemtap/default.nix b/pkgs/development/tools/profiling/systemtap/default.nix index 6b1918a5d98..8f711e14654 100644 --- a/pkgs/development/tools/profiling/systemtap/default.nix +++ b/pkgs/development/tools/profiling/systemtap/default.nix @@ -6,8 +6,8 @@ let ## fetchgit info url = git://sourceware.org/git/systemtap.git; rev = "release-${version}"; - sha256 = "075p45ndr4pzrf5679hcsw1ws4x0xqvx3m037v04545762hki6la"; - version = "4.0"; + sha256 = "0mmpiq7bsrwhp7z07a1pwka4q6d2fbmdx5wp83nxj31rvdxhqwnw"; + version = "4.1"; inherit (kernel) stdenv; inherit (stdenv) lib; diff --git a/pkgs/development/tools/rust/cargo-bloat/default.nix b/pkgs/development/tools/rust/cargo-bloat/default.nix index 71633a8a885..e7c8e869c87 100644 --- a/pkgs/development/tools/rust/cargo-bloat/default.nix +++ b/pkgs/development/tools/rust/cargo-bloat/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-bloat"; - version = "0.7.2"; + version = "0.8.2"; src = fetchFromGitHub { owner = "RazrFalcon"; repo = pname; rev = "v${version}"; - sha256 = "1g011c98vix0285ws8xby5v50272v15zfyaj948vazsb4zl0gxbm"; + sha256 = "1r8d3mqzaiasvhxmry8va55ggq817y82x8yb3vzih84lxq134y8n"; }; - cargoSha256 = "0bpy8888zbqy9b8hkbfsdxqcs88dn2r7p3qnhfn7a6ri4bw7ihhw"; + cargoSha256 = "1ys3wd1k39vkll25c56sfv767rcd53yb46adwgzdkkyl2pjphf1r"; meta = with lib; { description = "A tool and Cargo subcommand that helps you find out what takes most of the space in your executable"; diff --git a/pkgs/development/tools/rust/cargo-expand/default.nix b/pkgs/development/tools/rust/cargo-expand/default.nix index 32cd368fb04..0a36efa79eb 100644 --- a/pkgs/development/tools/rust/cargo-expand/default.nix +++ b/pkgs/development/tools/rust/cargo-expand/default.nix @@ -1,18 +1,22 @@ -{ stdenv, rustPlatform, fetchFromGitHub, darwin }: +{ stdenv, rustPlatform, fetchFromGitHub, llvmPackages, darwin }: rustPlatform.buildRustPackage rec { pname = "cargo-expand"; - version = "0.4.12"; + version = "0.4.13"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "0m57v7mh7wdl0rdbad7vkvcgy93p9gcb971wap8i5nzjvzmp4wlb"; + sha256 = "0s3xd9dr0n64j0m38gd4cafrdr5vnpl557ks4wr0jszyhldnlfkz"; }; - cargoSha256 = "1wvqxj2w02d6zhyw3z5v0w4bfmbmldh63ygmvfxa3ngfb36gcacz"; - buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; + cargoSha256 = "13zz3n1p75267h3qrmvpmd8agnkbk8vfbr8s38wcyysck81pr4px"; + + buildInputs = [ llvmPackages.libclang ] + ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; + + LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; meta = with stdenv.lib; { description = "A utility and Cargo subcommand designed to let people expand macros in their Rust source code"; diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index 56f550e37a2..92e21bfc00e 100644 --- a/pkgs/development/tools/rust/cargo-make/default.nix +++ b/pkgs/development/tools/rust/cargo-make/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.21.0"; + version = "0.22.0"; src = let @@ -10,11 +10,11 @@ rustPlatform.buildRustPackage rec { owner = "sagiegurari"; repo = pname; rev = version; - sha256 = "02hxf0mbk4nj9ja1z70k8fskh1kl3pixwy7gx0si5fbp9rmn04wk"; + sha256 = "13nl370immbhjarc0vfzrsflml3alh2f2zrh4znbks4yc3yp790z"; }; cargo-lock = fetchurl { - url = "https://gist.githubusercontent.com/xrelkd/e4c9c7738b21f284d97cb7b1d181317d/raw/b6017fd825b52987ac7c3b65620917e5d567312b/cargo-make-Cargo.lock"; - sha256 = "15ajxza58bbviwjxl98c0z89w4430902j0z46b594nbm02kv2ad9"; + url = "https://gist.githubusercontent.com/xrelkd/e4c9c7738b21f284d97cb7b1d181317d/raw/d31cfb3598d0a2886abd4d2ed43a02d493c8de8c/cargo-make-Cargo.lock"; + sha256 = "08fzl98d277n9xn3hrg9jahkqwdjfi5saajsppwzdbb3l7xw4jh2"; }; in runCommand "cargo-make-src" {} '' @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "1fsfjavad1cbq1xvck2j5vyppxck606cpmqrwbs4fjvdmlbgx3gp"; + cargoSha256 = "0gj4a15slxnp31mlfgh57h3cwv0lnw5gdmkrmmj79migi96i5i6y"; # Some tests fail because they need network access. # However, Travis ensures a proper build. diff --git a/pkgs/development/tools/sauce-connect/default.nix b/pkgs/development/tools/sauce-connect/default.nix index 715aa552ae5..c6b3d0b4cd0 100644 --- a/pkgs/development/tools/sauce-connect/default.nix +++ b/pkgs/development/tools/sauce-connect/default.nix @@ -4,12 +4,12 @@ with lib; stdenv.mkDerivation rec { name = "sauce-connect-${version}"; - version = "4.5.3"; + version = "4.5.4"; src = fetchurl ( if stdenv.hostPlatform.system == "x86_64-linux" then { url = "https://saucelabs.com/downloads/sc-${version}-linux.tar.gz"; - sha256 = "05fv9rggibx6dbdw8ywwwq45i9gdc53b7i7jhvl01m1sn2ygrrqd"; + sha256 = "1w8fw47q4bzpk5jfagmc0cbp69jdd6jcv2xl1gx91cbp7xd8mcbf"; } else if stdenv.hostPlatform.system == "i686-linux" then { url = "https://saucelabs.com/downloads/sc-${version}-linux32.tar.gz"; sha256 = "1h9n1mzmrmlrbd0921b0sgg7m8z0w71pdb5sif6h1b9f97cp353x"; diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix index 178bfc2dc17..f9128582092 100644 --- a/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/pkgs/development/tools/selenium/chromedriver/default.nix @@ -6,12 +6,12 @@ let allSpecs = { "x86_64-linux" = { system = "linux64"; - sha256 = "0iq015nyhdn1z50aj6k2d38cf1vbp59x7qi48aikb4z1h3h1j6a6"; + sha256 = "04wb6h57daxmnv3a3xrcsznawbx7r8wyi1vk1g26z2l2ppcnsbzv"; }; "x86_64-darwin" = { system = "mac64"; - sha256 = "0bf59g7vx7qbz9lx6wgk82zjbf8isag1n3lbi0gw4b2bgv8md8ia"; + sha256 = "0f8j7m8ardaaw8pv02vxhwkqbcm34366bln0np0j0ig21d4fag09"; }; }; @@ -28,7 +28,7 @@ let in stdenv.mkDerivation rec { name = "chromedriver-${version}"; - version = "2.46"; + version = "76.0.3809.68"; src = fetchurl { url = "https://chromedriver.storage.googleapis.com/${version}/chromedriver_${spec.system}.zip"; diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix index d5a6f3915f2..61d47cf907b 100644 --- a/pkgs/development/tools/skaffold/default.nix +++ b/pkgs/development/tools/skaffold/default.nix @@ -2,9 +2,9 @@ buildGoPackage rec { name = "skaffold-${version}"; - version = "0.30.0"; - # rev is the 0.30.0 commit, mainly for skaffold version command output - rev = "fe31429012110e6fd70f97971288bd266ba95bed"; + version = "0.35.0"; + # rev is the 0.35.0 commit, mainly for skaffold version command output + rev = "1da7608f9eb21ebe722bc054584e591e4223a3dc"; goPackagePath = "github.com/GoogleContainerTools/skaffold"; subPackages = ["cmd/skaffold"]; diff --git a/pkgs/development/tools/trellis/default.nix b/pkgs/development/tools/trellis/default.nix index a348e295933..0888130c2d4 100644 --- a/pkgs/development/tools/trellis/default.nix +++ b/pkgs/development/tools/trellis/default.nix @@ -7,22 +7,22 @@ let boostWithPython3 = boost.override { python = python3; enablePython = true; }; in stdenv.mkDerivation rec { - name = "trellis-${version}"; - version = "2019.04.22"; + pname = "trellis"; + version = "2019.08.09"; srcs = [ (fetchFromGitHub { owner = "symbiflow"; repo = "prjtrellis"; - rev = "5eb0ad870f30422b95d090ac9a476343809c62b9"; - sha256 = "10jkjfhqdr2bff41mh3w8a7kszf2whqqgk5s1z5z07mlh6zfdjlg"; + rev = "a67379179985bb12a611c75d975548cdf6e7d12e"; + sha256 = "0vqwfsblf7ylz0jnnf532kap5s1d1zcvbavxmb6a4v32b9xfdv35"; name = "trellis"; }) (fetchFromGitHub { owner = "symbiflow"; repo = "prjtrellis-db"; - rev = "d0b219af41ae3da6150645fbc5cc5613b530603f"; - sha256 = "1mnzvrqrcbfypvbagwyf6arv3kmj6q7n27gcmyk6ap2xnavkx4bq"; + rev = "b4d626b6402c131e9a035470ffe4cf33ccbe7986"; + sha256 = "0k26lq6c049ja8hhqcljwjb1y5k4gcici23l2n86gyp83jr03ilx"; name = "database"; }) ]; diff --git a/pkgs/development/tools/wasm-pack/default.nix b/pkgs/development/tools/wasm-pack/default.nix index 5827844c1b5..d9ff6f673d8 100644 --- a/pkgs/development/tools/wasm-pack/default.nix +++ b/pkgs/development/tools/wasm-pack/default.nix @@ -3,6 +3,8 @@ , rustPlatform , pkgconfig , openssl +, curl +, Security }: rustPlatform.buildRustPackage rec { @@ -20,7 +22,9 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ openssl ]; + buildInputs = [ openssl ] + ++ stdenv.lib.optionals stdenv.isDarwin [ curl Security ]; + # Tests fetch external resources and build artifacts. # Disabled to work with sandboxing diff --git a/pkgs/development/tools/xcbuild/default.nix b/pkgs/development/tools/xcbuild/default.nix index 29325fad724..29717d75394 100644 --- a/pkgs/development/tools/xcbuild/default.nix +++ b/pkgs/development/tools/xcbuild/default.nix @@ -36,10 +36,15 @@ in stdenv.mkDerivation rec { cp -r --no-preserve=all ${linenoise} ThirdParty/linenoise ''; - # Avoid a glibc >= 2.25 deprecation warning that gets fatal via -Werror. postPatch = stdenv.lib.optionalString (!stdenv.isDarwin) '' + # Avoid a glibc >= 2.25 deprecation warning that gets fatal via -Werror. sed 1i'#include <sys/sysmacros.h>' \ -i Libraries/xcassets/Headers/xcassets/Slot/SystemVersion.h + '' + stdenv.lib.optionalString stdenv.isDarwin '' + # Apple Open Sourced LZFSE, but not libcompression, and it isn't + # part of an impure framework we can add + substituteInPlace Libraries/libcar/Sources/Rendition.cpp \ + --replace "#if HAVE_LIBCOMPRESSION" "#if 0" ''; enableParallelBuilding = true; diff --git a/pkgs/development/web/now-cli/default.nix b/pkgs/development/web/now-cli/default.nix index 4b8a79c6190..91b4fe15e5a 100644 --- a/pkgs/development/web/now-cli/default.nix +++ b/pkgs/development/web/now-cli/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchurl }: stdenv.mkDerivation rec { name = "now-cli-${version}"; - version = "15.5.0"; + version = "15.8.7"; # TODO: switch to building from source, if possible src = fetchurl { url = "https://github.com/zeit/now-cli/releases/download/${version}/now-linux.gz"; - sha256 = "06fs3f5r6ixzzl1bhs92w3lcmpyx8fkga4bv8n9g0ygfm9d1z8gk"; + sha256 = "1x6nsn9qmsy4hk7l2dsyabc7fxkwwwl1y1852vs4dgxi8w1hax93"; }; sourceRoot = "."; diff --git a/pkgs/games/angband/default.nix b/pkgs/games/angband/default.nix index 4bdfc87d8da..435329bdc4a 100644 --- a/pkgs/games/angband/default.nix +++ b/pkgs/games/angband/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, autoreconfHook, ncurses5 }: stdenv.mkDerivation rec { - version = "4.1.3"; + version = "4.2.0"; name = "angband-${version}"; src = fetchFromGitHub { owner = "angband"; repo = "angband"; rev = version; - sha256 = "0g9m7pq8a1hzhr83v552hfk37qc868lms2mlsq29pbi8vxdjybk7"; + sha256 = "0fr59986swx9a2xkxkbfgadzpwy2lq55fgcib05k393kibyz49kg"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/games/azimuth/default.nix b/pkgs/games/azimuth/default.nix index 085bad674c7..8cb583e07d2 100644 --- a/pkgs/games/azimuth/default.nix +++ b/pkgs/games/azimuth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, SDL }: +{ stdenv, fetchFromGitHub, SDL, which, installTool ? false }: stdenv.mkDerivation rec { pname = "azimuth"; @@ -11,7 +11,11 @@ stdenv.mkDerivation rec { sha256 = "1znfvpmqiixd977jv748glk5zc4cmhw5813zp81waj07r9b0828r"; }; + nativeBuildInputs = [ which ]; + buildInputs = [ SDL ]; + preConfigure = '' + cat Makefile substituteInPlace data/azimuth.desktop \ --replace Exec=azimuth "Exec=$out/bin/azimuth" \ --replace "Version=%AZ_VERSION_NUMBER" "Version=${version}" @@ -19,30 +23,12 @@ stdenv.mkDerivation rec { makeFlags = [ "BUILDTYPE=release" - ]; + "INSTALLDIR=$(out)" + ] ++ (if installTool then ["INSTALLTOOL=true"] else ["INSTALLTOOL=false"]); - buildInputs = [ SDL ]; enableParallelBuilding = true; - # the game doesn't have an installation procedure - installPhase = '' - mkdir -p $out/bin - cp out/release/host/bin/azimuth $out/bin/azimuth - cp out/release/host/bin/editor $out/bin/azimuth-editor - cp out/release/host/bin/muse $out/bin/azimuth-muse - cp out/release/host/bin/zfxr $out/bin/azimuth-zfxr - mkdir -p $out/share/doc/azimuth - cp doc/* README.md LICENSE $out/share/doc/azimuth - mkdir -p $out/share/icons/hicolor/128x128/apps $out/share/icons/hicolor/64x64/apps $out/share/icons/hicolor/48x48/apps $out/share/icons/hicolor/32x32/apps - cp data/icons/icon_128x128.png $out/share/icons/hicolor/128x128/apps/azimuth.png - cp data/icons/icon_64x64.png $out/share/icons/hicolor/64x64/apps/azimuth.png - cp data/icons/icon_48x48.png $out/share/icons/hicolor/48x48/apps/azimuth.png - cp data/icons/icon_32x32.png $out/share/icons/hicolor/32x32/apps/azimuth.png - mkdir -p $out/share/applications - cp data/azimuth.desktop $out/share/applications - ''; - meta = { description = "A metroidvania game using only vectorial graphic"; longDescription = '' diff --git a/pkgs/games/crispy-doom/default.nix b/pkgs/games/crispy-doom/default.nix index 5178474ef9e..3897f29c657 100644 --- a/pkgs/games/crispy-doom/default.nix +++ b/pkgs/games/crispy-doom/default.nix @@ -1,10 +1,10 @@ { stdenv, autoreconfHook, pkgconfig, SDL2, SDL2_mixer, SDL2_net, fetchurl }: stdenv.mkDerivation rec { - name = "crispy-doom-5.5.2"; + name = "crispy-doom-5.6"; src = fetchurl { url = "https://github.com/fabiangreffrath/crispy-doom/archive/${name}.tar.gz"; - sha256 = "1pdk7p3r1xskdfcp86jf1n2cny78fyk36z4gbx19h57csc4d5c3a"; + sha256 = "1icz3ivd7v3mvwlslwwd7s3bpjzr54x4lslihyjg1ckq23sl830j"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ SDL2 SDL2_mixer SDL2_net ]; diff --git a/pkgs/games/cutemaze/default.nix b/pkgs/games/cutemaze/default.nix index c77e0c8b485..e0f35fe6d6d 100644 --- a/pkgs/games/cutemaze/default.nix +++ b/pkgs/games/cutemaze/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, qmake, qttools, qtsvg }: +{ stdenv, fetchurl, qmake, qttools, qtsvg, mkDerivation }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "cutemaze-${version}"; - version = "1.2.4"; + version = "1.2.5"; src = fetchurl { url = "https://gottcode.org/cutemaze/${name}-src.tar.bz2"; - sha256 = "0l727j28igs7cx6gvxs43vvzhp3hk0z61df7sprp1vdxzpzzfifl"; + sha256 = "1xrjv3h1bpbji1dl9hkcvmp6qk4j618saffl41455vhrzn170lrj"; }; nativeBuildInputs = [ qmake qttools ]; diff --git a/pkgs/games/devilutionx/default.nix b/pkgs/games/devilutionx/default.nix new file mode 100644 index 00000000000..52d3bdd5b79 --- /dev/null +++ b/pkgs/games/devilutionx/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, cmake, SDL2, SDL2_mixer, SDL2_ttf, libsodium, pkg-config }: +stdenv.mkDerivation rec { + version = "unstable-2019-07-28"; + pname = "devilutionx"; + + src = fetchFromGitHub { + owner = "diasurgical"; + repo = "devilutionX"; + rev = "b2f358874705598ec139f290b21e340c73d250f6"; + sha256 = "0s812km118qq5pzlzvzfndvag0mp6yzvm69ykc97frdiq608zw4f"; + }; + + NIX_CFLAGS_COMPILE = "-I${SDL2_ttf}/include/SDL2"; + + # compilation will fail due to -Werror=format-security + hardeningDisable = [ "format" ]; + + nativeBuildInputs = [ pkg-config cmake ]; + buildInputs = [ libsodium SDL2 SDL2_mixer SDL2_ttf ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp devilutionx $out/bin + + runHook postInstall + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/diasurgical/devilutionX"; + description = "Diablo build for modern operating systems"; + license = licenses.unlicense; + maintainers = [ maintainers.karolchmist ]; + platforms = platforms.linux ++ platforms.darwin ++ platforms.windows; + }; +} diff --git a/pkgs/games/flightgear/default.nix b/pkgs/games/flightgear/default.nix index 9765a9c06ee..5a04e75030f 100644 --- a/pkgs/games/flightgear/default.nix +++ b/pkgs/games/flightgear/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper +{ stdenv, fetchurl, wrapQtAppsHook , freeglut, freealut, libGLU_combined, libICE, libjpeg, openal, openscenegraph, plib , libSM, libunwind, libX11, xorgproto, libXext, libXi , libXmu, libXt, simgear, zlib, boost, cmake, libpng, udev, fltk13, apr @@ -6,14 +6,14 @@ }: let - version = "2018.3.1"; - shortVersion = "2018.3"; + version = "2019.1.1"; + shortVersion = builtins.substring 0 6 version; data = stdenv.mkDerivation rec { name = "flightgear-base-${version}"; src = fetchurl { url = "mirror://sourceforge/flightgear/release-${shortVersion}/FlightGear-${version}-data.tar.bz2"; - sha256 = "1h69ifj84l4k0f497ybk51xj3bprzw4xvwrwzzj708zhkjk78fmh"; + sha256 = "14zm0hzshbca4ych72631hpc4pw2w24zib62ri3lwm8nz6j63qhf"; }; phases = [ "installPhase" ]; @@ -25,13 +25,13 @@ let }; in stdenv.mkDerivation rec { - name = "flightgear-${version}"; + pname = "flightgear"; # inheriting data for `nix-prefetch-url -A pkgs.flightgear.data.src` inherit version data; src = fetchurl { - url = "mirror://sourceforge/flightgear/release-${shortVersion}/${name}.tar.bz2"; - sha256 = "0h56npn00b6fd38cf5cha82nnglxmhd12b7h2rn3gjymwhviyjix"; + url = "mirror://sourceforge/flightgear/release-${shortVersion}/${pname}-${version}.tar.bz2"; + sha256 = "189wal08p9lrz757pmazxnf85sfymsqrm3nfvdad95pfp6bg7pyi"; }; # Of all the files in the source and data archives, there doesn't seem to be @@ -51,11 +51,11 @@ stdenv.mkDerivation rec { categories = "Game;Simulation"; }; + nativeBuildInputs = [ cmake wrapQtAppsHook ]; buildInputs = [ - makeWrapper freeglut freealut libGLU_combined libICE libjpeg openal openscenegraph plib libSM libunwind libX11 xorgproto libXext libXi - libXmu libXt simgear zlib boost cmake libpng udev fltk13 apr qtbase + libXmu libXt simgear zlib boost libpng udev fltk13 apr qtbase glew qtdeclarative ]; @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { ''; qtWrapperArgs = [ - ''--set FG_ROOT "${data}/share/FlightGear"'' + "--set FG_ROOT ${data}/share/FlightGear" ]; enableParallelBuilding = true; diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix index 6953ac2f57a..ea229db6a74 100644 --- a/pkgs/games/hedgewars/default.nix +++ b/pkgs/games/hedgewars/default.nix @@ -1,20 +1,21 @@ { SDL2_image, SDL2_ttf, SDL2_net, fpc, qt5, ghcWithPackages, ffmpeg, freeglut -, stdenv, makeWrapper, fetchurl, cmake, pkgconfig, lua5_1, SDL2, SDL2_mixer +, stdenv, makeWrapper, fetchhg, cmake, pkgconfig, lua5_1, SDL2, SDL2_mixer , zlib, libpng, libGLU_combined, physfs }: let ghc = ghcWithPackages (pkgs: with pkgs; [ - network vector utf8-string /* broken: bytestring-show */ random hslogger + network vector utf8-string bytestring random hslogger SHA entropy pkgs.zlib sandi regex-tdfa ]); in stdenv.mkDerivation rec { - version = "0.9.25"; + version = "1.0.0-beta1"; name = "hedgewars-${version}"; - src = fetchurl { - url = "https://www.hedgewars.org/download/releases/hedgewars-src-${version}.tar.bz2"; - sha256 = "08x7fqpy0hpnbfq2k06g522xayi7s53bca819zfhalvqnqs76pdk"; + src = fetchhg { + url = "https://hg.hedgewars.org/hedgewars/"; + rev = "7ab5cf405686"; + sha256 = "1yrspi82ym5zpavka4cv0vh86g3i2mbbg8ccfcsid4f38lgbb9y4"; }; nativeBuildInputs = [ pkgconfig ]; @@ -75,6 +76,5 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ kragniz fpletz ]; platforms = ghc.meta.platforms; hydraPlatforms = []; - broken = true; # depends on broken Haskell package bytestring-show }; } diff --git a/pkgs/games/opendune/default.nix b/pkgs/games/opendune/default.nix index 0f045faf371..d2f1e27b10e 100644 --- a/pkgs/games/opendune/default.nix +++ b/pkgs/games/opendune/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, SDL, SDL_image, SDL_mixer }: +{ stdenv, lib, fetchFromGitHub, pkgconfig +, alsaLib, libpulseaudio, SDL2, SDL2_image, SDL2_mixer }: # - set the opendune configuration at ~/.config/opendune/opendune.ini: # [opendune] @@ -16,17 +17,30 @@ stdenv.mkDerivation rec { sha256 = "15rvrnszdy3db8s0dmb696l4isb3x2cpj7wcl4j09pdi59pc8p37"; }; - buildInputs = [ SDL SDL_image SDL_mixer ]; + configureFlags = [ + "--with-alsa=${lib.getLib alsaLib}/lib/libasound.so" + "--with-pulse=${lib.getLib libpulseaudio}/lib/libpulse.so" + ]; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ alsaLib libpulseaudio SDL2 SDL2_image SDL2_mixer ]; + + enableParallelBuilding = true; installPhase = '' - install -m 555 -D bin/opendune $out/bin/opendune + runHook preInstall + + install -Dm555 -t $out/bin bin/opendune + install -Dm444 -t $out/share/doc/opendune enhancement.txt README.txt + + runHook postInstall ''; meta = with stdenv.lib; { description = "Dune, Reinvented"; homepage = https://github.com/OpenDUNE/OpenDUNE; license = licenses.gpl2; - maintainers = [ maintainers.nand0p ]; - platforms = platforms.linux; + maintainers = with maintainers; [ nand0p ]; }; } diff --git a/pkgs/games/speed-dreams/default.nix b/pkgs/games/speed-dreams/default.nix index 2556aa49b4c..17cb57d3fdb 100644 --- a/pkgs/games/speed-dreams/default.nix +++ b/pkgs/games/speed-dreams/default.nix @@ -1,29 +1,33 @@ { fetchurl, stdenv, libGLU_combined, freeglut, libX11, plib, openal, freealut, libXrandr, xorgproto, libXext, libSM, libICE, libXi, libXt, libXrender, libXxf86vm, openscenegraph, expat, -libpng, zlib, bash, SDL2, enet, libjpeg, cmake, pkgconfig, libvorbis, runtimeShell }: +libpng, zlib, bash, SDL2, enet, libjpeg, cmake, pkgconfig, libvorbis, runtimeShell, curl }: +let + version = "2.2.2-r6553"; + shortVersion = builtins.substring 0 5 version; +in stdenv.mkDerivation rec { - version = "2.2.1-r6404"; - name = "speed-dreams-${version}"; + inherit version; + pname = "speed-dreams"; src = fetchurl { - url = "mirror://sourceforge/speed-dreams/2.2.1/speed-dreams-src-base-${version}.tar.xz"; - sha256 = "0347sk8xbdsyvl48qybbycd7hvzsx5b37zzjx1yx73nzddhmlpbx"; + url = "mirror://sourceforge/speed-dreams/${shortVersion}/speed-dreams-src-base-${version}.tar.xz"; + sha256 = "1l47d2619kpfkvdwbkwr311qss6jjfwvgl5h9z2w3bwdgz0mbaij"; }; cars-and-tracks = fetchurl { - url = "mirror://sourceforge/speed-dreams/2.2.1/speed-dreams-src-hq-cars-and-tracks-${version}.tar.xz"; - sha256 = "1h50l110n42nrq6j3kcyhi3swgmrjcg979vb6h0zsf46afwv0z3q"; + url = "mirror://sourceforge/speed-dreams/${shortVersion}/speed-dreams-src-hq-cars-and-tracks-${version}.tar.xz"; + sha256 = "0l8ba5pzqqcfy4inyxy2lrrhhgfs43xab7fy751xz2xqpqpfksyq"; }; more-cars-and-tracks = fetchurl { - url = "mirror://sourceforge/speed-dreams/2.2.1/speed-dreams-src-more-hq-cars-and-tracks-${version}.tar.xz"; - sha256 = "03m3gwd03jqgsfjdglzmrv613cp4gh50i63fwmnwl282zhxydcwd"; + url = "mirror://sourceforge/speed-dreams/${shortVersion}/speed-dreams-src-more-hq-cars-and-tracks-${version}.tar.xz"; + sha256 = "10w180mhhk6dw4cza6mqa0hp5qgym9lcizfwykqbgcvs01yl2yqb"; }; wip-cars-and-tracks = fetchurl { - url = "mirror://sourceforge/speed-dreams/2.2.1/speed-dreams-src-wip-cars-and-tracks-${version}.tar.xz"; - sha256 = "0ysk756rd294xzpwvmjh0mb229ngzrc4ry9lpyhyak98rbcp9hxm"; + url = "mirror://sourceforge/speed-dreams/${shortVersion}/speed-dreams-src-wip-cars-and-tracks-${version}.tar.xz"; + sha256 = "1wad9yaydaryhyi7ckyaii124h0z7kziqgcl475a5jr7ggbxc24q"; }; sourceRoot = "."; @@ -35,12 +39,6 @@ stdenv.mkDerivation rec { tar -xf ${wip-cars-and-tracks} ''; - prePatch = '' - # https://sourceforge.net/p/speed-dreams/mailman/message/35665539/ - sed -i "s|lastSlash = '\\\0'|lastSlash = NULL|" src/libs/tgf/params.cpp - sed -i "s|const char\* error = '\\\0'|const char\* error = NULL|" src/libs/tgfclient/openalmusicplayer.cpp - ''; - preBuild = '' make -C src/libs/portability make -C src/libs/portability portability.o @@ -62,11 +60,11 @@ stdenv.mkDerivation rec { buildInputs = [ libpng libGLU_combined freeglut libX11 plib openal freealut libXrandr xorgproto libXext libSM libICE libXi libXt libXrender libXxf86vm zlib bash expat - SDL2 enet libjpeg openscenegraph libvorbis ]; + SDL2 enet libjpeg openscenegraph libvorbis curl ]; meta = { description = "Car racing game - TORCS fork with more experimental approach"; - homepage = http://speed-dreams.sourceforge.net/; + homepage = "http://speed-dreams.sourceforge.net/"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [raskin]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix index 9e6bfc7bab8..5c73e458c1a 100644 --- a/pkgs/games/steam/chrootenv.nix +++ b/pkgs/games/steam/chrootenv.nix @@ -16,6 +16,9 @@ let commonTargetPkgs = pkgs: with pkgs; [ steamPackages.steam-fonts + # Needed for operating system detection until + # https://github.com/ValveSoftware/steam-for-linux/issues/5909 is resolved + lsb-release # Errors in output without those pciutils python2 @@ -45,7 +48,7 @@ let runSh = writeScript "run.sh" '' #!${runtimeShell} - runtime_paths="${lib.concatStringsSep ":" ldPath}" + runtime_paths="/lib32:/lib64:${lib.concatStringsSep ":" ldPath}" if [ "$1" == "--print-steam-runtime-library-paths" ]; then echo "$runtime_paths" exit 0 @@ -80,6 +83,17 @@ in buildFHSUserEnv rec { mono xorg.xkeyboardconfig xorg.libpciaccess + ## screeps dependencies + gnome3.gtk + dbus + zlib + glib + atk + cairo + freetype + gdk_pixbuf + pango + fontconfig ] ++ (if (!nativeOnly) then [ (steamPackages.steam-runtime-wrapped.override { inherit runtimeOnly; @@ -243,7 +257,7 @@ in buildFHSUserEnv rec { exit 1 fi shift - ${lib.optionalString (!nativeOnly) "export LD_LIBRARY_PATH=${lib.concatStringsSep ":" ldPath}:$LD_LIBRARY_PATH"} + ${lib.optionalString (!nativeOnly) "export LD_LIBRARY_PATH=/lib32:/lib64:${lib.concatStringsSep ":" ldPath}:$LD_LIBRARY_PATH"} exec -- "$run" "$@" ''; }; diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index 11873e6f2a0..789aabce043 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -133,7 +133,7 @@ stdenv.mkDerivation rec { homepage = https://cups.org/; description = "A standards-based printing system for UNIX"; license = licenses.gpl2; # actually LGPL for the library and GPL for the rest - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ matthewbauer ]; platforms = platforms.unix; }; } diff --git a/pkgs/misc/drivers/utsushi/default.nix b/pkgs/misc/drivers/utsushi/default.nix new file mode 100644 index 00000000000..328e8ce4562 --- /dev/null +++ b/pkgs/misc/drivers/utsushi/default.nix @@ -0,0 +1,154 @@ +{ stdenv, fetchurl, autoreconfHook, boost, gtkmm2 +, pkg-config, libtool, udev, libjpeg, file, texlive +, libusb, libtiff, imagemagick, sane-backends, tesseract }: + +/* +Alternatively, this package could use the "community source" at +https://gitlab.com/utsushi/utsushi/ +Epson provides proprietary plugins for networking, ocr and some more +scanner models. Those are not (yet ?) packaged here. +*/ + +stdenv.mkDerivation rec { + pname = "utsushi"; + version = "3.57.0"; + + src = fetchurl { + url = "http://support.epson.net/linux/src/scanner/imagescanv3/common/imagescan_${version}.orig.tar.gz"; + sha256 = "0qy6n6nbisbvy0q3idj7hpmj9i85cd0a18klfd8nsqsa2nkg57ny"; + }; + + nativeBuildInputs = [ + pkg-config + autoreconfHook + libtool + ]; + + buildInputs = [ + boost + libusb + libtiff + libjpeg + udev + imagemagick + sane-backends + gtkmm2 + file + tesseract + ]; + + patches = [ + ./patches/absolute-path-to-convert.patch + ./patches/print-errors.patch + ./patches/absolute_path_for_tesseract.patch + ]; + + postPatch = '' + # remove vendored dependencies + rm -r upstream/boost + # create fake udev and sane config + mkdir -p $out/etc/{sane.d,udev/rules.d} + touch $out/etc/sane.d/dll.conf + ''; + + configureFlags = [ + "--with-boost-libdir=${boost}/lib" + "--with-sane-confdir=${placeholder "out"}/etc/sane.d" + "--with-udev-confdir=${placeholder "out"}/etc/udev" + "--with-sane" + "--with-gtkmm" + "--with-jpeg" + "--with-magick" + "--with-sane" + "--with-tiff" + ]; + + installFlags = [ "SANE_BACKENDDIR=${placeholder "out"}/lib/sane" ]; + + enableParallelBuilding = true; + + meta = { + description = "SANE utsushi backend for some Epson scanners"; + longDescription = '' + ImageScanV3 (aka utsushi) scanner driver. + Non-free plugins are not included so no network support. + To use the SANE backend, in /etc/nixos/configuration.nix: + + hardware.sane = { + enable = true; + extraBackends = [ pkgs.utsushi ]; + }; + services.udev.packages = [ pkgs.utsushi ]; + + Supported hardware: + - DS-40 + - DS-70 + - DS-80W + - DS-410 + - DS-510 + - DS-520 + - DS-530 + - DS-535 + - DS-535H + - DS-560 + - DS-575W + - DS-760 + - DS-775 + - DS-780N + - DS-860 + - DS-1630 + - DS-5500 + - DS-6500 + - DS-7500 + - DS-50000 + - DS-60000 + - DS-70000 + - EP-10VA Series + - EP-808A Series + - EP-978A3 Series + - ES-50 + - ES-55R + - ES-60W + - ES-65WR + - ES-300WR + - ES-400 + - ES-500WR + - ES-8500 + - ET-2500 Series + - ET-2550 Series + - ET-4500 Series + - ET-4550 Series + - Expression 1640XL + - FF-680W + - L220/L360 Series + - L365/L366 Series + - L380 Series + - L455 Series + - L565/L566 Series + - L655 Series + - PX-M840FX + - PX-M860F + - PX-M884F + - PX-M7050 Series + - PX-M7050FX Series + - WF-4720 + - WF-6530 Series + - WF-6590 Series + - WF-8510/8590 Series + - WF-R8590 Series + - XP-220 Series + - XP-230 Series + - XP-235 Series + - XP-332 335 Series + - XP-430 Series + - XP-432 435 Series + - XP-530 Series + - XP-540 + - XP-630 Series + - XP-640 + - XP-830 Series + - XP-960 Series + ''; + license = stdenv.lib.licenses.gpl3Plus; + }; +} diff --git a/pkgs/misc/drivers/utsushi/patches/absolute-path-to-convert.patch b/pkgs/misc/drivers/utsushi/patches/absolute-path-to-convert.patch new file mode 100644 index 00000000000..2bc9422b061 --- /dev/null +++ b/pkgs/misc/drivers/utsushi/patches/absolute-path-to-convert.patch @@ -0,0 +1,166 @@ +Index: utsushi-0.57.0/configure.ac +=================================================================== +--- utsushi-0.57.0.orig/configure.ac ++++ utsushi-0.57.0/configure.ac +@@ -221,6 +221,9 @@ AS_IF([test xno != x$enable_code_coverag + [AC_MSG_ERROR([code coverage support requires a GNU C/C++ compiler])]) + ]) + AM_PROG_AR ++AC_PATH_PROG([AWK],[awk]) ++AC_DEFINE_UNQUOTED([AWK], ["$AWK"], ++ [Path to awk.]) + + PKG_PROG_PKG_CONFIG + +@@ -379,27 +382,31 @@ AM_CONDITIONAL([have_libmagick_pp], [tes + AS_IF([test xno != "x$with_magick"], + AS_CASE("x$with_magick", + [xGraphicsMagick], +- [AC_CHECK_PROGS([MAGICK_CONVERT], [gm]) +- AS_IF([test xgm != x$MAGICK_CONVERT], ++ [[AC_PATH_PROG(MAGICK_CONVERT, gm)] ++ AS_IF([test x == x$MAGICK_CONVERT], + [AC_MSG_ERROR([$with_magick requested but not found])]) + AC_DEFINE([HAVE_GRAPHICS_MAGICK], [1]) +- MAGICK_CONVERT="gm convert" ++ HAVE_MAGICK=1 ++ MAGICK_CONVERT="$MAGICK_CONVERT convert" + ], + [xImageMagick], +- [AC_CHECK_PROGS([MAGICK_CONVERT], [convert]) +- AS_IF([test xconvert != x$MAGICK_CONVERT], ++ [[AC_PATH_PROG(MAGICK_CONVERT, convert)] ++ AS_IF([test x == x$MAGICK_CONVERT], + [AC_MSG_ERROR([$with_magick requested but not found])]) + AC_DEFINE([HAVE_IMAGE_MAGICK], [1]) ++ HAVE_MAGICK=1 + ], + [xyes|xcheck], +- [AC_CHECK_PROGS([MAGICK_CONVERT], [gm convert]) ++ [[AC_PATH_PROGS([MAGICK_CONVERT], [gm convert])] + AS_CASE(x$MAGICK_CONVERT, +- [xgm], ++ [x*gm], + [AC_DEFINE([HAVE_GRAPHICS_MAGICK], [1]) +- MAGICK_CONVERT="gm convert" ++ HAVE_MAGICK=1 ++ MAGICK_CONVERT="$MAGICK_CONVERT convert" + ], +- [xconvert], ++ [x*convert], + [AC_DEFINE([HAVE_IMAGE_MAGICK], [1]) ++ HAVE_MAGICK=1 + ], + [dnl default case + AS_IF([test xcheck != "x$with_magick"], +@@ -410,7 +417,7 @@ AS_IF([test xno != "x$with_magick"], + AC_MSG_ERROR([unknown value: --with-magick=$with_magick]) + ])) + AC_DEFINE_UNQUOTED([MAGICK_CONVERT], ["$MAGICK_CONVERT"]) +-AM_CONDITIONAL([have_magick], [test x != "x$MAGICK_CONVERT"]) ++AM_CONDITIONAL([have_magick], [test x != "x$HAVE_MAGICK"]) + + AS_IF([test xno != "x$with_gtkmm"], + [PKG_CHECK_MODULES([LIBGTKMM], [gtkmm-2.4 >= 2.20], +Index: utsushi-0.57.0/filters/magick.cpp +=================================================================== +--- utsushi-0.57.0.orig/filters/magick.cpp ++++ utsushi-0.57.0/filters/magick.cpp +@@ -81,19 +81,18 @@ chomp (char *str) + } + + bool +-magick_version_before_(const char *magick, const char *cutoff) ++magick_version_before_(const char *cutoff) + { + FILE *fp = NULL; + int errc = 0; + +- if (0 == strcmp ("GraphicsMagick", magick)) +- fp = popen ("gm convert -version" +- "| awk '/^GraphicsMagick/{print $2}'", "r"); +- if (fp) errc = errno; +- +- if (0 == strcmp ("ImageMagick", magick)) +- fp = popen ("convert -version" +- "| awk '/^Version:/{print $3}'", "r"); ++#if HAVE_GRAPHICS_MAGICK ++ fp = popen (MAGICK_CONVERT " -version" ++ "| " AWK " '/^GraphicsMagick/{print $2}'", "r"); ++#elif HAVE_IMAGE_MAGICK ++ fp = popen (MAGICK_CONVERT " -version" ++ "| " AWK " '/^Version:/{print $3}'", "r"); ++#endif + if (fp) errc = errno; + + if (fp) +@@ -106,42 +105,32 @@ magick_version_before_(const char *magic + + if (version) + { +- log::debug ("found %1%-%2%") % magick % version; ++ log::debug ("found " MAGICK_CONVERT "version %1%") % version; + return (0 > strverscmp (version, cutoff)); + } + } + + if (errc) +- log::alert ("failure checking %1% version: %2%") +- % magick ++ log::alert ("failure checking " MAGICK_CONVERT " version: %1%") + % strerror (errc); + + return false; + } + + bool +-graphics_magick_version_before_(const char *cutoff) +-{ +- return magick_version_before_("GraphicsMagick", cutoff); +-} +- +-bool +-image_magick_version_before_(const char *cutoff) +-{ +- return magick_version_before_("ImageMagick", cutoff); +-} +- +-bool + auto_orient_is_usable () + { + static int usable = -1; + + if (-1 == usable) + { +- if (HAVE_GRAPHICS_MAGICK) // version -auto-orient was added +- usable = !graphics_magick_version_before_("1.3.18"); +- if (HAVE_IMAGE_MAGICK) // version known to work +- usable = !image_magick_version_before_("6.7.8-9"); ++#if HAVE_GRAPHICS_MAGICK ++ // version -auto-orient was added ++ usable = !magick_version_before_("1.3.18"); ++#elif HAVE_IMAGE_MAGICK ++ // version known to work ++ usable = !magick_version_before_("6.7.8-9"); ++#endif + if (-1 == usable) + usable = false; + usable = (usable ? 1 : 0); +@@ -392,7 +381,7 @@ magick::arguments (const context& ctx) + if (color_correction_) + { + if (HAVE_IMAGE_MAGICK +- && !image_magick_version_before_("6.6.1-0")) ++ && !magick_version_before_("6.6.1-0")) + argv += " -color-matrix"; + else + argv += " -recolor"; +@@ -416,7 +405,7 @@ magick::arguments (const context& ctx) + size_t mat_size = ((HAVE_IMAGE_MAGICK) ? 6 : 5); + + if (HAVE_IMAGE_MAGICK +- && !image_magick_version_before_("6.6.1-0")) ++ && !magick_version_before_("6.6.1-0")) + argv += " -color-matrix"; + else + argv += " -recolor"; diff --git a/pkgs/misc/drivers/utsushi/patches/absolute_path_for_tesseract.patch b/pkgs/misc/drivers/utsushi/patches/absolute_path_for_tesseract.patch new file mode 100644 index 00000000000..d4d44497921 --- /dev/null +++ b/pkgs/misc/drivers/utsushi/patches/absolute_path_for_tesseract.patch @@ -0,0 +1,56 @@ +Index: utsushi-0.57.0/filters/reorient.cpp +=================================================================== +--- utsushi-0.57.0.orig/filters/reorient.cpp ++++ utsushi-0.57.0/filters/reorient.cpp +@@ -96,8 +96,8 @@ chomp (char *str) + bool + tesseract_version_before_(const char *cutoff) + { +- FILE *fp = popen ("tesseract --version 2>&1" +- "| awk '/^tesseract/{ print $2 }'", "r"); ++ FILE *fp = popen (TESSERACT " --version 2>&1" ++ "| " AWK " '/^tesseract/{ print $2 }'", "r"); + int errc = errno; + + if (fp) +@@ -126,7 +126,7 @@ tesseract_version_before_(const char *cu + bool + have_tesseract_language_pack_(const char *lang) + { +- std::string cmd("tesseract --list-langs 2>&1" ++ std::string cmd(TESSERACT " --list-langs 2>&1" + "| sed -n '/^"); + cmd += lang; + cmd += "$/p'"; +@@ -291,7 +291,7 @@ reorient::reorient () + + if (found) + { +- if (have_tesseract_()) engine_ = "tesseract"; ++ if (have_tesseract_()) engine_ = TESSERACT; + if (have_ocr_engine_()) engine_ = abs_path_name; + } + freeze_options (); // initializes option tracking member variables +Index: utsushi-0.57.0/configure.ac +=================================================================== +--- utsushi-0.57.0.orig/configure.ac ++++ utsushi-0.57.0/configure.ac +@@ -196,6 +196,8 @@ AC_DEFINE([HAVE_IMAGE_MAGICK_PP], + [0], [Define to 1 if ImageMagick's C++ API is usable]) + AC_DEFINE([MAGICK_CONVERT], + [], [Define to an appropriate command-line invocation for convert]) ++AC_DEFINE([TESSERACT], ++ [], [Define to an appropriate command-line invocation for tesseract]) + AC_DEFINE([WITH_INCLUDED_BOOST], + [0], [Define to 1 if using the included Boost sources]) + +@@ -419,6 +421,9 @@ AS_IF([test xno != "x$with_magick"], + AC_DEFINE_UNQUOTED([MAGICK_CONVERT], ["$MAGICK_CONVERT"]) + AM_CONDITIONAL([have_magick], [test x != "x$HAVE_MAGICK"]) + ++AC_PATH_PROG([TESSERACT], [tesseract], [tesseract]) ++AC_DEFINE_UNQUOTED([TESSERACT], ["$TESSERACT"]) ++ + AS_IF([test xno != "x$with_gtkmm"], + [PKG_CHECK_MODULES([LIBGTKMM], [gtkmm-2.4 >= 2.20], + [AC_DEFINE([HAVE_LIBGTKMM], [1])], diff --git a/pkgs/misc/drivers/utsushi/patches/print-errors.patch b/pkgs/misc/drivers/utsushi/patches/print-errors.patch new file mode 100644 index 00000000000..06660ebde98 --- /dev/null +++ b/pkgs/misc/drivers/utsushi/patches/print-errors.patch @@ -0,0 +1,15 @@ +Index: utsushi-0.57.0/lib/log.cpp +=================================================================== +--- utsushi-0.57.0.orig/lib/log.cpp ++++ utsushi-0.57.0/lib/log.cpp +@@ -26,8 +26,8 @@ + + namespace utsushi { + +-log::priority log::threshold = log::FATAL; +-log::category log::matching = log::NOTHING; ++log::priority log::threshold = log::ERROR; ++log::category log::matching = log::ALL; + + template<> + std::basic_ostream< char >& diff --git a/pkgs/misc/drivers/utsushi/patches/series b/pkgs/misc/drivers/utsushi/patches/series new file mode 100644 index 00000000000..de0964c758b --- /dev/null +++ b/pkgs/misc/drivers/utsushi/patches/series @@ -0,0 +1,3 @@ +absolute-path-to-convert.patch +print-errors.patch +absolute_path_for_tesseract.patch diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix index a75c6c1ec76..d68ac0f9fc1 100644 --- a/pkgs/misc/seafile-shared/default.nix +++ b/pkgs/misc/seafile-shared/default.nix @@ -1,14 +1,14 @@ {stdenv, fetchFromGitHub, which, autoreconfHook, pkgconfig, curl, vala, python, intltool, fuse, ccnet}: stdenv.mkDerivation rec { - version = "6.2.11"; + version = "7.0.2"; name = "seafile-shared-${version}"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile"; rev = "v${version}"; - sha256 = "16d4m5n5zhip13l6pv951lm081pnwxpiqcm7j4gxqm1ian48m787"; + sha256 = "0633hhz2cky95y8mvrg9q2cyrnzpnzvn8fcq350wl4a64ij6wa04"; }; nativeBuildInputs = [ pkgconfig which autoreconfHook vala intltool ]; diff --git a/pkgs/misc/themes/adwaita-qt/default.nix b/pkgs/misc/themes/adwaita-qt/default.nix index f2a682bcf7d..9b979a11b93 100644 --- a/pkgs/misc/themes/adwaita-qt/default.nix +++ b/pkgs/misc/themes/adwaita-qt/default.nix @@ -1,16 +1,14 @@ -{ stdenv, fetchFromGitHub, cmake, ninja, qtbase }: +{ mkDerivation, lib, fetchFromGitHub, cmake, ninja, qtbase }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "adwaita-qt"; - version = "1.0"; - - name = "${pname}-${version}"; + version = "1.1.0"; src = fetchFromGitHub { owner = "FedoraQt"; repo = pname; rev = version; - sha256 = "0xn8bianmdj15k11mnw52by9vxkmvpqr2s304kl3dbjj1l7v4cd7"; + sha256 = "1jlh4l3sxiwglgx6h4aqi364gr4xipmn09bk88cp997r9sm8jcp9"; }; nativeBuildInputs = [ @@ -28,7 +26,7 @@ stdenv.mkDerivation rec { --replace "DESTINATION \"\''${QT_PLUGINS_DIR}/styles" "DESTINATION \"$qtPluginPrefix/styles" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A style to bend Qt applications to look like they belong into GNOME Shell"; homepage = https://github.com/FedoraQt/adwaita-qt; license = licenses.gpl2Plus; diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 7ad6283c930..b8e9dd2d960 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -39,12 +39,12 @@ let agda-vim = buildVimPluginFrom2Nix { pname = "agda-vim"; - version = "2019-01-23"; + version = "2019-08-04"; src = fetchFromGitHub { owner = "derekelkins"; repo = "agda-vim"; - rev = "06efbd079a7dfc0a8b079aed4509e17113cc0977"; - sha256 = "06i9m2xbdsp704d71zv6jcbbn7ibp3fy3wn823azkjcnk317n73i"; + rev = "4fc0a0a95a347b7b98715a78b6f41edd5aa084c5"; + sha256 = "15zzc1aqzflw36462ka5914cmfqckciqcgcff0kfmzglfcx7is6z"; }; }; @@ -61,12 +61,12 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2019-08-02"; + version = "2019-08-12"; src = fetchFromGitHub { owner = "w0rp"; repo = "ale"; - rev = "dd1e1025b8a9b13cb7966bf2baa3e6b42a862857"; - sha256 = "0rgfsnx4dbigbc17r3ksvikmdkyfz3fl4g78nd31lxhsn3x5akcj"; + rev = "28c93ab1854ef41a46855401cc4addbaf7dfb9d4"; + sha256 = "12kfvnycdf4sshajhzj3b5l92zbdgvnj1sdzfj7mc77d0k4mzskq"; }; }; @@ -303,34 +303,34 @@ let coc-git = buildVimPluginFrom2Nix { pname = "coc-git"; - version = "2019-07-24"; + version = "2019-08-11"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-git"; - rev = "e7f37ceaf250b152de5712454f42172337cb8a0f"; - sha256 = "0p2m3gwhjifbf53g68r8prg7rz7gm5nzv9hw4ar6msy61rmjpy56"; + rev = "30021c6a3aa7a33617ce1cb187468851bbaf1eb5"; + sha256 = "09r0ygsjv5d3v6js1ghb49j74plp0jkja2pmd1pbjgafxm02mb2y"; }; }; coc-go = buildVimPluginFrom2Nix { pname = "coc-go"; - version = "2019-08-02"; + version = "2019-08-06"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-go"; - rev = "6a4b1485dbbd1e4bbc18a03beaeebe3cc6018e8f"; - sha256 = "1nd9fph6yvg1n7cabd5li9qxs3b2g0v3q7qq1n1xmp3n49c5m0nr"; + rev = "3f2748c87c89242c59d3583e8effa0de76c8abe7"; + sha256 = "1c7v1j3vny20dkc898hgr6val3jk1vc2aswsqm3cb2c3mqwhsrls"; }; }; coc-highlight = buildVimPluginFrom2Nix { pname = "coc-highlight"; - version = "2019-07-01"; + version = "2019-08-03"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-highlight"; - rev = "00e3cc159b3ce427d9f4e7993bcd963f37a3eb54"; - sha256 = "0q9dfnn598499b8r9nsw0fi5ng873rvhwl5l70zqnc8ny9rbv74r"; + rev = "b84cfa2738ab0843217c742eb69b4b6e630d45fa"; + sha256 = "0yrl29fdn0hwyiz4z75km1gidc4bkx1ra6g1pfddlwbbjj32lbqp"; }; }; @@ -391,12 +391,12 @@ let coc-lists = buildVimPluginFrom2Nix { pname = "coc-lists"; - version = "2019-08-01"; + version = "2019-08-12"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-lists"; - rev = "999865c6bd3745689d1eb4009b9b706cb5a68617"; - sha256 = "0sq9im0bbbpsjcf22frn24rb5apxf3sravqhlvwkh34wh9qjvzgy"; + rev = "2c502ceec9816259350969970e76402c984ac4f9"; + sha256 = "1ic62ba9w4diajd1d65xpqxkb3kjpp3d09p1n7pv8341w015zcf9"; }; }; @@ -413,12 +413,12 @@ let coc-pairs = buildVimPluginFrom2Nix { pname = "coc-pairs"; - version = "2019-07-25"; + version = "2019-08-07"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-pairs"; - rev = "3070d22f15c8e41ff01aed9b6b9a377ae5f0358a"; - sha256 = "00ixzdn3wpwm3pp0b87l4bvln9nrmqcd0k5c851x6bif06gsnydz"; + rev = "51e404a60fa0461ebfaea4ba1311357b8825e73f"; + sha256 = "0sz45z7i7fqnvl4968dalksz9qk0al6a57wyyhyl7rx1wv67vaya"; }; }; @@ -490,12 +490,12 @@ let coc-solargraph = buildVimPluginFrom2Nix { pname = "coc-solargraph"; - version = "2019-06-21"; + version = "2019-08-11"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-solargraph"; - rev = "f7732c49d5173a4f32f3419eaf591857b9d753cb"; - sha256 = "14fcl9zwyq8rpc9pdbydsf1jilc8wmylvs8wjc13l8h3avndpkwd"; + rev = "6a146623192e661e18830c58abe1055fddcf57d7"; + sha256 = "1mc8jqpgwy5q4jzb5p09j5mal9paq50dl1hsxhg0y5q6rqrr7qhz"; }; }; @@ -512,12 +512,12 @@ let coc-tabnine = buildVimPluginFrom2Nix { pname = "coc-tabnine"; - version = "2019-07-21"; + version = "2019-08-11"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-tabnine"; - rev = "4cddbdc9ecb92fb1633bd3b89bb9aacc3a5504ce"; - sha256 = "08k6vmdzgws6f9461gjc4psqn2ypwf1nz9sjncs1vddckxwxl9k3"; + rev = "819e2c523df6f809e0f83e4b5079bc9702adbe66"; + sha256 = "1l1hajj7hihm5klar28j6jqsad6bnjcy3h2cddvhavm696azibfv"; }; }; @@ -764,6 +764,17 @@ let }; }; + delimitMate = buildVimPluginFrom2Nix { + pname = "delimitMate"; + version = "2017-06-19"; + src = fetchFromGitHub { + owner = "Raimondi"; + repo = "delimitMate"; + rev = "728b57a6564c1d2bdfb9b9e0f2f8c5ba3d7e0c5c"; + sha256 = "0fskm9gz81dk8arcidrm71mv72a7isng1clssqkqn5wnygbiimsn"; + }; + }; + denite-extra = buildVimPluginFrom2Nix { pname = "denite-extra"; version = "2019-03-29"; @@ -788,12 +799,12 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2019-08-03"; + version = "2019-08-17"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "85fa3ed3b430df61d1b8aeb8772162acfebc1f46"; - sha256 = "1m7y3ph51wxcm3yasdg3ajxwm4bqdjq7ajg5c4f3d3xf8f2nkl87"; + rev = "c263e50e03e62dc15fc912fd9eaca75752d33fd0"; + sha256 = "19avsx03wv3piq6c1x105na08f90c0p24rz8x59c2yv0p1gdm74n"; }; }; @@ -901,12 +912,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2019-08-03"; + version = "2019-08-14"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "e8cab49ac99a5bb45e16a4bf24bb697163e7beaf"; - sha256 = "1g03ybsjv7j5iad34bax949s29lxi89cs5i3g9h0ypg4if1c0g53"; + rev = "bb2b16309b94695a3344c713282368b3329a2412"; + sha256 = "0dbph7p921ibh2nyfansj5pzqw98vh1w4m9kv04n3wwyygzym5q9"; }; }; @@ -1013,12 +1024,12 @@ let falcon = buildVimPluginFrom2Nix { pname = "falcon"; - version = "2019-08-01"; + version = "2019-08-14"; src = fetchFromGitHub { owner = "fenetikm"; repo = "falcon"; - rev = "370f7efa1ce15d4d8fa62b2b00ea60bebd11ef73"; - sha256 = "0i5vjxwrmj0amf8dbr6slq91gg2rkvdw8gwam7qaf7n6d874qxbn"; + rev = "d642592f062c5e4d195e627ac4104d4e0355a125"; + sha256 = "053kgsgsqnazzzignfvmgca46gm8z75alq7hsix4lvj3hrmx9lac"; }; }; @@ -1046,12 +1057,12 @@ let ferret = buildVimPluginFrom2Nix { pname = "ferret"; - version = "2019-06-12"; + version = "2019-08-13"; src = fetchFromGitHub { owner = "wincent"; repo = "ferret"; - rev = "f6d7d01de8a92baee83218001c0bdbade8458a72"; - sha256 = "1zsh7yc2mv1hv6gj7bhzbx4qqmasc32sxsdlh4sz95nxsfnk28dr"; + rev = "aeb47b01b36021aaf84ff4f7f1a4cf64bc68fe53"; + sha256 = "1cssvdpkmrlby50p2lyqfz1jhp5igyv1bqd34588p3ivsd3hrhyy"; }; }; @@ -1124,12 +1135,12 @@ let ghcid = buildVimPluginFrom2Nix { pname = "ghcid"; - version = "2019-07-04"; + version = "2019-08-07"; src = fetchFromGitHub { owner = "ndmitchell"; repo = "ghcid"; - rev = "08dff021a806c252d8eeccf44fa30e8d4118b137"; - sha256 = "05w4lqqs25m10rpjglkm1ggyssl9kig0nbd0qkg0l38zhc87afjr"; + rev = "f7aee1f324d2a731a13b4495260a1aeaf0c0b52a"; + sha256 = "1s0byckwkxwhrzrhdhjvfzzyg3pvbkbc3pikp395pzcf8kmpmvcv"; }; }; @@ -1355,12 +1366,12 @@ let jedi-vim = buildVimPluginFrom2Nix { pname = "jedi-vim"; - version = "2019-07-13"; + version = "2019-08-11"; src = fetchFromGitHub { owner = "davidhalter"; repo = "jedi-vim"; - rev = "b9f83175951654256cff41737841b4abc0c9266d"; - sha256 = "0w24zqs1026khdzr7v283yx9yc3sp5rw4kzsjwalclg5xnyy55c0"; + rev = "b3d715c5fccddbae95c0f8b5485e98c7b8143827"; + sha256 = "0hf6k5nabhfaqgf76962hdihpvja93fahz6psf98q2xrz09c7i86"; fetchSubmodules = true; }; }; @@ -1477,12 +1488,12 @@ let lightline-vim = buildVimPluginFrom2Nix { pname = "lightline-vim"; - version = "2019-08-02"; + version = "2019-08-14"; src = fetchFromGitHub { owner = "itchyny"; repo = "lightline.vim"; - rev = "d589eb55305043955e65df8f326580f06e4533c9"; - sha256 = "0fvj8p5dh0gg9kxnn6shfyb84jmvv5f6wvh6fa0cgycy7xl1jrrk"; + rev = "09c61dc3f650eccd2c165c36db8330496321aa50"; + sha256 = "14g79s9pn8bb50kwd50sw8knss5mgq8iihxa2bwkjr55jj5ghkwb"; }; }; @@ -1697,12 +1708,12 @@ let neomake = buildVimPluginFrom2Nix { pname = "neomake"; - version = "2019-07-28"; + version = "2019-08-15"; src = fetchFromGitHub { owner = "neomake"; repo = "neomake"; - rev = "d49607c3dd8d041f3f61bc2ae58569b3f8259830"; - sha256 = "05akv0j09jr4k7hjyn717lpsw4xkjyfk572yabzfryii40mi3iga"; + rev = "cad94240c8284ab3502c62acc18e420ca22107de"; + sha256 = "12i0qwckg7fl5gim7k20kvd1xcqspws994nq5b8nn08ljw01dcfq"; }; }; @@ -1719,12 +1730,12 @@ let neosnippet-snippets = buildVimPluginFrom2Nix { pname = "neosnippet-snippets"; - version = "2019-08-03"; + version = "2019-08-11"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet-snippets"; - rev = "c5b182d5831f298bde1d6ce9bf28ada62fb61157"; - sha256 = "0diq8yhrs0359sajzd07ri0f985lgkl5959284pbjhv3r8vm22rc"; + rev = "f38f1732e4bb0643b3019b5b733a87f5f03ea348"; + sha256 = "1brzryd2sc44xpkz4w4s78a8vmwddvzkqgiyiaygp45k87q2yp24"; }; }; @@ -1785,23 +1796,23 @@ let nerdcommenter = buildVimPluginFrom2Nix { pname = "nerdcommenter"; - version = "2019-07-03"; + version = "2019-08-07"; src = fetchFromGitHub { owner = "scrooloose"; repo = "nerdcommenter"; - rev = "7f5c217f79b8fce063fec490ab0b2814dd480f08"; - sha256 = "0s7njz8v408hrb0kbkiisrjvqmzy9z5dxgd738ncpxpslyd81xlw"; + rev = "a05185584d7cae7791fb40b7656cf642fdbe4938"; + sha256 = "1yri2gw2i4nkssm6fd1l8b9hkinb6h70wsavkb712ivdzqpcls6y"; }; }; nerdtree = buildVimPluginFrom2Nix { pname = "nerdtree"; - version = "2019-07-14"; + version = "2019-08-09"; src = fetchFromGitHub { owner = "scrooloose"; repo = "nerdtree"; - rev = "63c59208c1f9eef7068a944f5c3033bd1a348b97"; - sha256 = "11531x591dw99mf3ladsim6cv162ypb421q60kljg0hg7fvjml8y"; + rev = "184fbb6ffea6dc69726b229a08153c9d08522386"; + sha256 = "1h4wqmiplk3ay56db20dxxw90i9rij2kp2zjfhbfz525pxjg82gn"; }; }; @@ -1884,23 +1895,23 @@ let nvimdev-nvim = buildVimPluginFrom2Nix { pname = "nvimdev-nvim"; - version = "2019-07-29"; + version = "2019-08-05"; src = fetchFromGitHub { owner = "neovim"; repo = "nvimdev.nvim"; - rev = "a874e3ae9ecd58c6b95b20813e47c4b45bd66a37"; - sha256 = "0kcki6g20i8p7fmh07cspz3vb38rz3w04mvima9b2kd6hqv23px7"; + rev = "4f2f53872672f44049cef04a1f8f3cc4f921eae8"; + sha256 = "1yci56rdxqk5zfzqlkmhsw5s7c9xladhl3d4ks1j2b4dcb8gdsf5"; }; }; onehalf = buildVimPluginFrom2Nix { pname = "onehalf"; - version = "2019-06-26"; + version = "2019-08-17"; src = fetchFromGitHub { owner = "sonph"; repo = "onehalf"; - rev = "408104a30ae4f220096e591350a72e60cc15f9b3"; - sha256 = "0jyf8cri6d1s4pragarz02ma8kvxphlblp4i70f12z1yiazykzh2"; + rev = "fdcbffe3175c29bb78d19dcaf9b2a456482fcf1e"; + sha256 = "0zbmh3cf2lnn3mcqbz4s992v6kaddq9nj4xb1wxvgyqp7kjkpwql"; }; }; @@ -2137,12 +2148,12 @@ let rust-vim = buildVimPluginFrom2Nix { pname = "rust-vim"; - version = "2019-08-01"; + version = "2019-08-15"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust.vim"; - rev = "772eaa6a991d2a0f53844f241a6af3bc1ab1fc50"; - sha256 = "1794yvladda6wz574qn0cv3giainqssl864vhh16aigjjaqy76nf"; + rev = "a49b1473eca309e5f5cf2486100d9efe23a6e4ff"; + sha256 = "0m6rryyg3mka2h9j9v8sm1zm8cqwmvix38aa1p114w2vrpfxbs0x"; }; }; @@ -2168,6 +2179,17 @@ let }; }; + seoul256-vim = buildVimPluginFrom2Nix { + pname = "seoul256-vim"; + version = "2017-09-05"; + src = fetchFromGitHub { + owner = "junegunn"; + repo = "seoul256.vim"; + rev = "1475b7610663c68aa90b6e565997c8792ce0d222"; + sha256 = "03gqw14f5cirivcg1p06g500ns066yv5rd0z3zikvn4ql7n278dk"; + }; + }; + shabadou-vim = buildVimPluginFrom2Nix { pname = "shabadou-vim"; version = "2016-07-19"; @@ -2203,12 +2225,12 @@ let SpaceCamp = buildVimPluginFrom2Nix { pname = "SpaceCamp"; - version = "2019-06-26"; + version = "2019-08-12"; src = fetchFromGitHub { owner = "jaredgorski"; repo = "SpaceCamp"; - rev = "f0c31ff9e0b5359c43cfd33820f2b4790d94b1d8"; - sha256 = "08kbcmqjr383sh8h7p1fwav72lvncx78c0zq0b72prbvfw8pfq5c"; + rev = "9f7bee325f32db1ee509b82e5144df522fa2aca2"; + sha256 = "1i9kyipnd7fkv7vdlwpsb44h0yzvf0rjrwrj09w8bj2lqmcv8yjp"; }; }; @@ -2379,12 +2401,12 @@ let tcomment_vim = buildVimPluginFrom2Nix { pname = "tcomment_vim"; - version = "2019-07-23"; + version = "2019-08-11"; src = fetchFromGitHub { owner = "tomtom"; repo = "tcomment_vim"; - rev = "9de9f7611297a1198b782d81eca84ec49e86008b"; - sha256 = "0lbnd4l0jslfhizg5v7d0db1kwvvqpf5d9s2d51mmy6a0787qb0h"; + rev = "c9cecefc639b6019e0f12b7e9fb5a2375cd550c1"; + sha256 = "0xb61wchvj1iqzwxzscv3zwbsx1qjh8qhkmijsrjz92566g12xhy"; }; }; @@ -2786,12 +2808,12 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2019-07-27"; + version = "2019-08-11"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "c213f2ac44292a6c5548872e63acb0648cc07a9a"; - sha256 = "0imhjaqhr145vw52517jbg8ckw4y9qr831v3rq8qpxgxawanr02w"; + rev = "a40184536b3b93b6272585da9c36dca802d47a01"; + sha256 = "0ygv6mc8fby6chzms7ah6sbq7yf7jhcnavbw52dra2sdfm2h2kch"; }; }; @@ -2852,12 +2874,12 @@ let vim-bazel = buildVimPluginFrom2Nix { pname = "vim-bazel"; - version = "2019-01-30"; + version = "2019-08-14"; src = fetchFromGitHub { owner = "bazelbuild"; repo = "vim-bazel"; - rev = "9a555405baaccc3fa4cad2fc6c627eb43f3be939"; - sha256 = "15kzi9b30l6xhz71r376w3vgml7g4vpi046ff9fvl1i6vi4ny78f"; + rev = "7c4987b4266d117a9f1d4c7fe7f4dfba33dfc8c8"; + sha256 = "182w8ibr34z86nmx6byabkah0q9fgrzml8m2ardaqzqjqr2ya5yg"; }; }; @@ -2940,12 +2962,12 @@ let vim-codefmt = buildVimPluginFrom2Nix { pname = "vim-codefmt"; - version = "2019-06-16"; + version = "2019-08-14"; src = fetchFromGitHub { owner = "google"; repo = "vim-codefmt"; - rev = "0de948ca411c65ee1d07be84ee406e38f7a725d8"; - sha256 = "1cyvj1q94frnii1mcx1f1dhl5z38ppmly6wjgz71hs1w5qdy12qh"; + rev = "18f47c3ac563b60f71103b1e1d29b349ff9d8549"; + sha256 = "0z36jjj1bxb4xz9lyjrbv769797g3x475ncamflfj6yj72vvhfy4"; }; }; @@ -3015,6 +3037,17 @@ let }; }; + vim-cpp-enhanced-highlight = buildVimPluginFrom2Nix { + pname = "vim-cpp-enhanced-highlight"; + version = "2019-07-01"; + src = fetchFromGitHub { + owner = "octol"; + repo = "vim-cpp-enhanced-highlight"; + rev = "da1d86aaf42bd4e52272b5a2f62b098c3986c048"; + sha256 = "02cz8av85pjxpl9ggiy0y0z3gnjvd6ng1pafzv0c64xharg9l5aq"; + }; + }; + vim-csharp = buildVimPluginFrom2Nix { pname = "vim-csharp"; version = "2017-03-29"; @@ -3083,23 +3116,23 @@ let vim-dirvish = buildVimPluginFrom2Nix { pname = "vim-dirvish"; - version = "2019-07-20"; + version = "2019-08-05"; src = fetchFromGitHub { owner = "justinmk"; repo = "vim-dirvish"; - rev = "eba64ed111a3aab8121a0e5b6df62c6f19e05322"; - sha256 = "13cmxbpimnm9nkn9igkd8cpcvydw6nlzgyxzq11qdj31bjfs4nma"; + rev = "3020cce00581054e9177297ee5461737a35de7de"; + sha256 = "1qvkgjfrwl2qmi2b1cvznvbmsn8rqgm4wcgb79il07ij4lnwf9g9"; }; }; vim-dispatch = buildVimPluginFrom2Nix { pname = "vim-dispatch"; - version = "2019-08-01"; + version = "2019-08-07"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dispatch"; - rev = "c58708e820252d594541a86e31fbc95ec8d37e3e"; - sha256 = "0py41f0dkvx95w8hb3a2cys981x8nz4a0nn3hs7rjv3z0brrsxfx"; + rev = "a76bec9196fe27e195d167a5c2ee1da763d31b96"; + sha256 = "0a9sxpdpll68drk3w98xvmv2z31q4afw70iwjrb7lmp8raxn0i2z"; }; }; @@ -3171,12 +3204,12 @@ let vim-elixir = buildVimPluginFrom2Nix { pname = "vim-elixir"; - version = "2019-07-22"; + version = "2019-08-15"; src = fetchFromGitHub { owner = "elixir-lang"; repo = "vim-elixir"; - rev = "46a68476fc7b4f454c829d83d21997b82ac66f76"; - sha256 = "1fyi39s211cw2db7zb5a5jy2r18h5azpkiij52ba6asxk7n5dghs"; + rev = "1b7f422a1e6b0693032e54a14277a2aa2ec437f5"; + sha256 = "0v7gmqk5i6l49lz5r6v783qrc2fw5afchgllqc25jmlbr0bhd8fm"; }; }; @@ -3215,12 +3248,12 @@ let vim-fireplace = buildVimPluginFrom2Nix { pname = "vim-fireplace"; - version = "2019-08-02"; + version = "2019-08-12"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fireplace"; - rev = "5886fd272a7957fa2791c567866c7fc2b4dec73c"; - sha256 = "11ygf520p7s7fj7gv1pnzv62ywa2afbm5kbkipbdwwnd4m90amzk"; + rev = "8712a165da4d1de9fb6ae918322ece843ac742e0"; + sha256 = "0yjljc01dk75q6rhr3kwa8lhr9ymya0i4bwvsvr09kz7dgsqf5s7"; }; }; @@ -3281,12 +3314,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2019-08-03"; + version = "2019-08-16"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "e5a6a8c5256c8afe2c607f8566e4ef35c43b5de2"; - sha256 = "165vgx5h1qmkbir30a1hd5mym2d09wz0q556cwhipmypkyfnfzcp"; + rev = "442d56e23cd75a336b28cf5e46bf0def8c65dff5"; + sha256 = "0viijvsds2a6l34bjca3yrsizmips1l8g2hcqd1v7v2bqhf4jsqh"; }; }; @@ -3325,12 +3358,12 @@ let vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2019-07-26"; + version = "2019-08-16"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "c75c83df531881008f8cf903eab7cd68bc19ff7a"; - sha256 = "1j0jy4bld43lwsjwkmym369scxpk8zbj0v3sskam8sq71blkzqca"; + rev = "46f15ed42ad987b003ef5e81ec114c748c73ea89"; + sha256 = "0lr3i22b949d64d2l1gvlgb3hzmhhvkdjjz7nqr5bda0pj3rxhzw"; }; }; @@ -3358,12 +3391,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2019-08-02"; + version = "2019-08-12"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "974fd4367cd327a075b79f6d9d7b71f3e84d7a4c"; - sha256 = "1q8k9rgy191d502jl654nvlmh2nd5m2lq03l5ldyi2y6cgrd5k8d"; + rev = "007b69c27b63fbcbe2e0766073b09281274b0231"; + sha256 = "14klcx69p5ngl3qvanc0l23ind2hsgzj917a80a6lvs78h4mwp7w"; }; }; @@ -3611,12 +3644,12 @@ let vim-javascript = buildVimPluginFrom2Nix { pname = "vim-javascript"; - version = "2019-07-08"; + version = "2019-08-14"; src = fetchFromGitHub { owner = "pangloss"; repo = "vim-javascript"; - rev = "7cc6baebaf0065fd8c31cc9216c87bfa543eb71a"; - sha256 = "0d905n5v4c8vifp229lijrylq6ajlsmxkl1w603nzkappw8kky1s"; + rev = "b6c8c8419240bdd29b5eb51a47d488fd390deed5"; + sha256 = "0p56av0zmig4rpsq4w4armnccyd713xdm5lwrck3cip55c39382f"; }; }; @@ -3689,12 +3722,12 @@ let vim-jsx-pretty = buildVimPluginFrom2Nix { pname = "vim-jsx-pretty"; - version = "2019-07-27"; + version = "2019-08-07"; src = fetchFromGitHub { owner = "MaxMEllon"; repo = "vim-jsx-pretty"; - rev = "994503b30c929353c107eb9166accd68d35b83b5"; - sha256 = "134cmj0ajxjps649prmra9jgqp9gxqcfk0llxj92x0srjcg1xjhf"; + rev = "49a4b2e2a66b43c1335d1df378d5ebb6f381fe05"; + sha256 = "0pfscx95cjkw48ccn53x04wkrbh2kan2p3djyk2f5ml9n1ln8if5"; }; }; @@ -3810,23 +3843,23 @@ let vim-lsc = buildVimPluginFrom2Nix { pname = "vim-lsc"; - version = "2019-08-02"; + version = "2019-08-13"; src = fetchFromGitHub { owner = "natebosch"; repo = "vim-lsc"; - rev = "ad9d2bd0582419e902bc402545da397634202ed0"; - sha256 = "12b46vcc8kw6nhp177vs8b4lwh0nd34a74j5vfa2wd5d3mhqz5j8"; + rev = "6583613e4cf1842e6e273893bb0275d2e90ea27a"; + sha256 = "1wmzr31y9c0sj2bfq1l2a5dny6l7s74q0dfp6b0ajw9i6q5nbv25"; }; }; vim-maktaba = buildVimPluginFrom2Nix { pname = "vim-maktaba"; - version = "2019-01-24"; + version = "2019-08-14"; src = fetchFromGitHub { owner = "google"; repo = "vim-maktaba"; - rev = "ec7a094e602babc2e0d43dc5fa5411e46e3bd70c"; - sha256 = "1377wqzrsvwvmzb91a6fm5ma2hnnlas0wgia5bk62a8f1rsgyfgc"; + rev = "ed4357d2caf1d04bd229a24191098759f94b2e25"; + sha256 = "0zz048nbp2dc361g7zr3qdn1n506ym82d6igaz0qv37ani85fq6v"; }; }; @@ -3975,12 +4008,12 @@ let vim-orgmode = buildVimPluginFrom2Nix { pname = "vim-orgmode"; - version = "2018-07-25"; + version = "2019-08-05"; src = fetchFromGitHub { owner = "jceb"; repo = "vim-orgmode"; - rev = "35e94218c12a0c063b4b3a9b48e7867578e1e13c"; - sha256 = "0j6zfqqysnky4z54413l87q7wxbskg0zb221zbz48ry4l1anilhx"; + rev = "10b5ddf57f9416ed5a33419e1095dba7d239b297"; + sha256 = "1hik7bkk1rfxwwn77w1p7c6m1dz7ifpvnnfs8yizhlp9rgs0wjch"; }; }; @@ -4052,12 +4085,12 @@ let vim-peekaboo = buildVimPluginFrom2Nix { pname = "vim-peekaboo"; - version = "2017-03-20"; + version = "2019-08-11"; src = fetchFromGitHub { owner = "junegunn"; repo = "vim-peekaboo"; - rev = "a7c940b15b008afdcea096d3fc4d25e3e431eb49"; - sha256 = "1rc4hr6vwj2mmrgz8lifxf9rvcw1rb5dahq649yn8ccw03x8zn6m"; + rev = "9d3c7f39a6771496fac5f730ae7574bc57da21b4"; + sha256 = "0r61r0s01nn4n153k60dlhr3l0sfj0gcx4y5ry7cvixl85b6y505"; }; }; @@ -4074,12 +4107,12 @@ let vim-plug = buildVimPluginFrom2Nix { pname = "vim-plug"; - version = "2019-07-16"; + version = "2019-08-17"; src = fetchFromGitHub { owner = "junegunn"; repo = "vim-plug"; - rev = "226d6abeb2f02bcd8f5b11288543259fa2e02962"; - sha256 = "1iy0qj7wjbhp7byann4qyww5cyqrb9hsb1wm1j4ihzgrv1yw1qx3"; + rev = "307b0f244d99408decda3a98f58e864d49626818"; + sha256 = "1fbiasm3w4ww4qdyaphk1xl9phqjxl12fsapza084ix48lhfh5pw"; }; }; @@ -4272,12 +4305,12 @@ let vim-sensible = buildVimPluginFrom2Nix { pname = "vim-sensible"; - version = "2019-07-29"; + version = "2019-08-07"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-sensible"; - rev = "67fe033b2b56b6f631a4c7a1179865178665f2a4"; - sha256 = "1jhj88n0xj6s6xjx5zs5906y6wwzr855wczk3f5myzs8z8y5cih5"; + rev = "c176d137892f33945d3d4dd766fd21611e9b5ddf"; + sha256 = "11adqaccwph4z5a4kyycd1gbc1l9np4za0d4fbd3cnh1zqf2xzjz"; }; }; @@ -4294,12 +4327,12 @@ let vim-signify = buildVimPluginFrom2Nix { pname = "vim-signify"; - version = "2019-05-29"; + version = "2019-08-16"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-signify"; - rev = "ac23bd95d5fe0c7a7bf4a331e9d37eb72697c46e"; - sha256 = "18vwj2avxpvgk7pl82i6sxvv6cr80g0gvfsljpag1ncg278yap97"; + rev = "ffab0c9d71bf33529b3dd52783b45652e8b500ad"; + sha256 = "1d8z1nnnsyxh0sm248nzjc169vfx8650b7bg9g60k8v9knkgajyc"; }; }; @@ -4360,12 +4393,12 @@ let vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2019-07-19"; + version = "2019-08-11"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "84ab7e118ca5fee5a67ce4c884c0c1d5c9308e21"; - sha256 = "1ya7y9alzqqy8cpz1sljaqmh8f8pnd5pap9fmg99awr7bpn431rc"; + rev = "5dc42dbc6c4d9b5068ddde901b79c5e483c42114"; + sha256 = "00kf6a5k0gkync0pgw3d3b7gdm6ykb14lvybiaprvbsnxnflgw95"; }; }; @@ -4415,12 +4448,12 @@ let vim-startify = buildVimPluginFrom2Nix { pname = "vim-startify"; - version = "2019-07-29"; + version = "2019-08-15"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-startify"; - rev = "9abd2c76845de00eab207576b69332cf0e16d35c"; - sha256 = "0ljial7ymyzqbzzrmfh87v4207hhkfq0f5lq8v6jbv92nafrq17s"; + rev = "d7849587e5cf36ea4858fe2aab4f7b5faff76d33"; + sha256 = "11nsz9g3m95av5andi1ry0aqq6s9k7jn1sk7m1djnqqqs46vzpmr"; }; }; @@ -4503,23 +4536,23 @@ let vim-terraform = buildVimPluginFrom2Nix { pname = "vim-terraform"; - version = "2019-07-08"; + version = "2019-08-06"; src = fetchFromGitHub { owner = "hashivim"; repo = "vim-terraform"; - rev = "6ee2aab70d8cd3d2405b3042141c94766ea461b0"; - sha256 = "1zld21a0l94hg3qvpb6rzi8kvv9f86mn7pl95rjvs022vfprry05"; + rev = "8b0a0ee7f2463f6949a5ce778169a782b80cdab4"; + sha256 = "0d66hv8r7hnahs6nh6jj00xbly38xgfz6ilg5zlab2kgswmkzxrf"; }; }; vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2019-07-12"; + version = "2019-08-16"; src = fetchFromGitHub { owner = "janko-m"; repo = "vim-test"; - rev = "6781cc1dbfec16efc7a67bf8f8c118898664da11"; - sha256 = "0iqbb5ycl33q0542gj7kr3dyalvha59y0dyyzymzs5lqa1q0y7in"; + rev = "4729346c46c34ce03d6e12b39727d85cdfcec44b"; + sha256 = "1aazaydi9136i4b5pq9jd4ccrgcx72gyra7ja05igmszkhcznlq9"; }; }; @@ -4646,12 +4679,12 @@ let vim-unimpaired = buildVimPluginFrom2Nix { pname = "vim-unimpaired"; - version = "2019-06-29"; + version = "2019-08-07"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-unimpaired"; - rev = "a49c4f2bf05f18a6e4f6572a19763ba7abba52b1"; - sha256 = "0ivybshm1dvlqsbh153a3fq3dhwj144x049l78ss7zrqnbb70jsw"; + rev = "ab7082c0e89df594a5ba111e18af17b3377d216d"; + sha256 = "1gvzjihkxnc84kd7sdh26kmm0rqi19xmwiisfqhf307yqyqa6lkj"; }; }; @@ -4690,12 +4723,12 @@ let vim-vue = buildVimPluginFrom2Nix { pname = "vim-vue"; - version = "2019-08-01"; + version = "2019-08-03"; src = fetchFromGitHub { owner = "posva"; repo = "vim-vue"; - rev = "fcdc2d25d19edf5f0dcf87bc2c5c7327190bf59b"; - sha256 = "1lryy3kqihgm3sql686z3irwsr96ka0vj10bqfsdmjzk05h87yhb"; + rev = "c424294e769b26659176065f9713c395731f7b3a"; + sha256 = "1ig8qacavr15i6z7whlkf2ivw5smnqsw3jwhh4dg5q6037k1hjh1"; }; }; @@ -4822,12 +4855,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2019-08-03"; + version = "2019-08-14"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "b2385ed9016442a27c8ce028ab566de864ee1910"; - sha256 = "0q2w8jhnpfzr49bqpmgya31w55pi7zvr41ar6maqchqi9fns25gf"; + rev = "866699bdae3696130159e7115954c64de8e7bdcd"; + sha256 = "0302k0ss9drp37dzs123w6y1p16vxgmwn06z86x837n02xzpwwzq"; }; }; @@ -4844,12 +4877,12 @@ let vimwiki = buildVimPluginFrom2Nix { pname = "vimwiki"; - version = "2019-04-20"; + version = "2019-08-08"; src = fetchFromGitHub { owner = "vimwiki"; repo = "vimwiki"; - rev = "be793e28bea4ac30c19c15c4db3fd42d26a5debe"; - sha256 = "18jkhpxmg5crbjsy4bnymgggsd73dqjvjb74kirxj86hh1khfqnh"; + rev = "57d23fa763b498561aca7eb4efb05b52efd120c9"; + sha256 = "034857pz36rps7jmg79brcb25vfb4dgqpdhfy24vyhn3nil46jxs"; }; }; @@ -4866,12 +4899,12 @@ let vundle = buildVimPluginFrom2Nix { pname = "vundle"; - version = "2018-02-03"; + version = "2019-08-17"; src = fetchFromGitHub { owner = "gmarik"; repo = "vundle"; - rev = "9a38216a1c0c597f978d73547d37681fc689c90d"; - sha256 = "1695glma8zf2lnp0w713sdvwqagf1s127p4i60114nk6gx5g5x2c"; + rev = "b255382d6242d7ea3877bf059d2934125e0c4d95"; + sha256 = "0fkmklcq3fgvd6x6irz9bgyvcdaxafykk3k89gsi9p6b0ikw3rw6"; }; }; @@ -4977,12 +5010,12 @@ let youcompleteme = buildVimPluginFrom2Nix { pname = "youcompleteme"; - version = "2019-07-27"; + version = "2019-08-10"; src = fetchFromGitHub { owner = "valloric"; repo = "youcompleteme"; - rev = "afa2ea03d03e6793d34704e4c75f2846ecbffd52"; - sha256 = "0n3c5hzg3bxhcc0ixv7a8rkfwsqprkgd3nxaj5wc36kc2832rg6s"; + rev = "afd69b382844315812fd48912eaa9fa47cba3a8d"; + sha256 = "1x4q1l7dw0axm3hywj5p77057jh0qac7khk2clpdilfwhak0jp07"; fetchSubmodules = true; }; }; @@ -5022,12 +5055,12 @@ let zig-vim = buildVimPluginFrom2Nix { pname = "zig-vim"; - version = "2019-07-27"; + version = "2019-08-14"; src = fetchFromGitHub { owner = "zig-lang"; repo = "zig.vim"; - rev = "b0c2afdd248b08a4525cba3fc428205f37cf0aad"; - sha256 = "05864kcrrkdvdydp967lg1ab3q4w9i1i75s0hpycnk3cvs51z88q"; + rev = "defc660d235152e82271a48bd89bfcc9fa58b432"; + sha256 = "0x6yaiwc3nnyxcrjfdllhx3s7kfspy5ggm3crhd2s81gq9lrxc3q"; }; }; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 0281f9220e9..0c0a883f80a 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -33,6 +33,9 @@ self: super: { dependencies = with super; [ vim-addon-manager ]; }; + # Mainly used as a dependency for fzf-vim. Wraps the fzf program as a vim + # plugin, since part of the fzf vim plugin is included in the main fzf + # program. fzfWrapper = buildVimPluginFrom2Nix { pname = "fzf"; version = fzf.version; @@ -225,6 +228,10 @@ self: super: { dependencies = with super; [ ultisnips ]; }); + fzf-vim = super.fzf-vim.overrideAttrs(old: { + dependencies = [ self.fzfWrapper ]; + }); + sved = let # we put the script in its own derivation to benefit the magic of wrapGAppsHook svedbackend = stdenv.mkDerivation { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 65c0d02bdfc..59b450820c1 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -137,6 +137,7 @@ JuliaEditorSupport/julia-vim junegunn/fzf.vim junegunn/goyo.vim junegunn/limelight.vim +junegunn/seoul256.vim junegunn/vim-easy-align junegunn/vim-github-dashboard junegunn/vim-peekaboo @@ -282,6 +283,7 @@ noc7c9/vim-iced-coffee-script ntpeters/vim-better-whitespace numirias/semshi nvie/vim-flake8 +octol/vim-cpp-enhanced-highlight OrangeT/vim-csharp osyo-manga/shabadou.vim osyo-manga/vim-anzu @@ -306,6 +308,7 @@ rafaqz/ranger.vim rafi/awesome-vim-colorschemes raghur/vim-ghost raichoo/purescript-vim +Raimondi/delimitMate rakr/vim-one reedes/vim-pencil reedes/vim-wordy diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index 14332c70078..44bc7ec3ced 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/misc/vim-plugins/vim-utils.nix @@ -188,7 +188,8 @@ let vam ? null, pathogen ? null, plug ? null, - customRC ? "" + customRC ? "", + beforePlugins ? "", }: let @@ -291,7 +292,7 @@ let " tell vam about which plugins to load when: let l = [] - ${lib.concatMapStrings (p: "call add(l, ${toNix p})\n") vam.pluginDictionaries} + ${lib.concatMapStrings (p: "call add(l, {'name': '${p.pname}'})\n") plugins} call vam#Scripts(l, {}) ''); @@ -341,6 +342,8 @@ let " minimal setup, generated by NIX set nocompatible + ${beforePlugins} + ${vamImpl} ${pathogenImpl} ${plugImpl} diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/boot.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/boot.nix index 318e2728fc2..2a2d4cbe493 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/boot.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/boot.nix @@ -11,7 +11,7 @@ # the more recent adv_cmds release is used for everything else in this package let recentAdvCmds = fetchzip { - url = "http://opensource.apple.com/tarballs/adv_cmds/adv_cmds-158.tar.gz"; + url = "https://opensource.apple.com/tarballs/adv_cmds/adv_cmds-158.tar.gz"; sha256 = "0z081kcprzg5jcvqivfnwvvv6wfxzkjg2jc2lagsf8c7j7vgm8nn"; }; diff --git a/pkgs/os-specific/linux/batman-adv/alfred.nix b/pkgs/os-specific/linux/batman-adv/alfred.nix index cb240ba1695..1f24f4182de 100644 --- a/pkgs/os-specific/linux/batman-adv/alfred.nix +++ b/pkgs/os-specific/linux/batman-adv/alfred.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, gpsd, libcap, libnl }: let - ver = "2019.2"; + ver = "2019.3"; in stdenv.mkDerivation rec { name = "alfred-${ver}"; src = fetchurl { url = "https://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; - sha256 = "1whbi39sx3gz91yvynr7vmnc2l9lcvyynjbd3d9wg6bsm7lz0mmn"; + sha256 = "0rj7vyir4m63b69fgrz06mqlw7nivjfc8mdv19l02xs9vqh7khx4"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/beegfs/default.nix b/pkgs/os-specific/linux/beegfs/default.nix index 076c19cf400..50c48098ab0 100644 --- a/pkgs/os-specific/linux/beegfs/default.nix +++ b/pkgs/os-specific/linux/beegfs/default.nix @@ -159,5 +159,8 @@ in stdenv.mkDerivation rec { free = false; }; maintainers = with maintainers; [ markuskowa ]; + # 2019-08-09 + # fails to build and had stability issues earlier + broken = true; }; } diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index 7270877c52e..f041d2b5042 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { patches = [ ./busybox-in-store.patch - ] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.targetPlatform) ./clang-cross.patch; + ] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) ./clang-cross.patch; postPatch = "patchShebangs ."; diff --git a/pkgs/os-specific/linux/checksec/default.nix b/pkgs/os-specific/linux/checksec/default.nix index dc704dc167e..01e70fbb040 100644 --- a/pkgs/os-specific/linux/checksec/default.nix +++ b/pkgs/os-specific/linux/checksec/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "checksec"; - version = "2.0.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "slimm609"; repo = "checksec.sh"; rev = version; - sha256 = "04lzwm24d576h425rgvgjj2wim29i3961jrj35r43wrswmrsc3r2"; + sha256 = "00s4qg4h9s9vi46jyw7lz36lb5i8h3s9cmicnngp17764xgkr916"; }; patches = [ ./0001-attempt-to-modprobe-config-before-checking-kernel.patch ]; diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index 1af37c2168d..298f5e30d01 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -68,13 +68,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "conky-${version}"; - version = "1.11.3"; + version = "1.11.5"; src = fetchFromGitHub { owner = "brndnmtthws"; repo = "conky"; rev = "v${version}"; - sha256 = "0pdl31xvmy8niagzqx9sd2b6hc6lzwfiaz66m4djf1gz9bksc8qv"; + sha256 = "1a75ss48mn9pknrxy33dh5rdgm67a5kpddsyqfhlcn1761kfzzyp"; }; postPatch = '' diff --git a/pkgs/os-specific/linux/device-tree/default.nix b/pkgs/os-specific/linux/device-tree/default.nix new file mode 100644 index 00000000000..13d819a08a5 --- /dev/null +++ b/pkgs/os-specific/linux/device-tree/default.nix @@ -0,0 +1,17 @@ +{ stdenvNoCC, dtc, findutils }: + +with stdenvNoCC.lib; { + applyOverlays = (base: overlays: stdenvNoCC.mkDerivation { + name = "device-tree-overlays"; + nativeBuildInputs = [ dtc findutils ]; + buildCommand = let + quotedDtbos = concatMapStringsSep " " (o: "\"${toString o}\"") (toList overlays); + in '' + for dtb in $(find ${base} -name "*.dtb" ); do + outDtb=$out/$(realpath --relative-to "${base}" "$dtb") + mkdir -p "$(dirname "$outDtb")" + fdtoverlay -o "$outDtb" -i "$dtb" ${quotedDtbos}; + done + ''; + }); +} diff --git a/pkgs/os-specific/linux/device-tree/raspberrypi.nix b/pkgs/os-specific/linux/device-tree/raspberrypi.nix new file mode 100644 index 00000000000..a77200a68f7 --- /dev/null +++ b/pkgs/os-specific/linux/device-tree/raspberrypi.nix @@ -0,0 +1,32 @@ +{ stdenvNoCC, raspberrypifw }: + +stdenvNoCC.mkDerivation { + name = "raspberrypi-dtbs-${raspberrypifw.version}"; + nativeBuildInputs = [ raspberrypifw ]; + + # Rename DTBs so u-boot finds them, like linux-rpi.nix + buildCommand = '' + mkdir -p $out/broadcom/ + cd $out/broadcom/ + + cp ${raspberrypifw}/share/raspberrypi/boot/bcm*.dtb . + + cp bcm2708-rpi-0-w.dtb bcm2835-rpi-zero-w.dtb + cp bcm2708-rpi-b.dtb bcm2835-rpi-a.dtb + cp bcm2708-rpi-b.dtb bcm2835-rpi-b.dtb + cp bcm2708-rpi-b.dtb bcm2835-rpi-b-rev2.dtb + cp bcm2708-rpi-b-plus.dtb bcm2835-rpi-a-plus + cp bcm2708-rpi-b-plus.dtb bcm2835-rpi-b-plus + cp bcm2708-rpi-b-plus.dtb bcm2835-rpi-zero.dtb + cp bcm2708-rpi-cm.dtb bcm2835-rpi-cm.dtb + cp bcm2709-rpi-2-b.dtb bcm2836-rpi-2-b.dtb + cp bcm2710-rpi-3-b.dtb bcm2837-rpi-3-b.dtb + cp bcm2710-rpi-3-b-plus.dtb bcm2837-rpi-3-b-plus.dtb + cp bcm2710-rpi-cm3.dtb bcm2837-rpi-cm3.dtb + ''; + + passthru = { + # Compatible overlays that may be used + overlays = "${raspberrypifw}/share/raspberrypi/boot/overlays"; + }; +} diff --git a/pkgs/os-specific/linux/ell/default.nix b/pkgs/os-specific/linux/ell/default.nix index 887c09691eb..b10d45d8a4b 100644 --- a/pkgs/os-specific/linux/ell/default.nix +++ b/pkgs/os-specific/linux/ell/default.nix @@ -1,21 +1,46 @@ -{ stdenv, fetchgit, autoreconfHook, pkgconfig }: +{ stdenv +, fetchgit +, autoreconfHook +, pkgconfig +, dbus +}: stdenv.mkDerivation rec { pname = "ell"; - version = "0.20"; + version = "0.21"; + + outputs = [ "out" "dev" ]; src = fetchgit { - url = https://git.kernel.org/pub/scm/libs/ell/ell.git; + url = "https://git.kernel.org/pub/scm/libs/${pname}/${pname}.git"; rev = version; - sha256 = "1g143dbc7cfks63k9yi2m8hpgfp9jj5b56s3hyxjzxm9dac3yn6c"; + sha256 = "0m7fk2xgzsz7am0wjw98sqa42zpw3cz3hz399niw5rj8dbqh0zpy"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + patches = [ + ./fix-dbus-tests.patch + ]; + + nativeBuildInputs = [ + pkgconfig + autoreconfHook + ]; + + checkInputs = [ + dbus + ]; + + enableParallelBuilding = true; + + doCheck = true; meta = with stdenv.lib; { - homepage = https://git.kernel.org/pub/scm/libs/ell/ell.git; + homepage = https://01.org/ell; description = "Embedded Linux Library"; - license = licenses.lgpl21; + longDescription = '' + The Embedded Linux* Library (ELL) provides core, low-level functionality for system daemons. It typically has no dependencies other than the Linux kernel, C standard library, and libdl (for dynamic linking). While ELL is designed to be efficient and compact enough for use on embedded Linux platforms, it is not limited to resource-constrained systems. + ''; + license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = with maintainers; [ mic92 dtzWill ]; }; diff --git a/pkgs/os-specific/linux/ell/fix-dbus-tests.patch b/pkgs/os-specific/linux/ell/fix-dbus-tests.patch new file mode 100644 index 00000000000..b494ba8b43c --- /dev/null +++ b/pkgs/os-specific/linux/ell/fix-dbus-tests.patch @@ -0,0 +1,65 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -140,6 +140,7 @@ + ell_libell_private_la_SOURCES = $(ell_libell_la_SOURCES) + + AM_CFLAGS = -fvisibility=hidden -DUNITDIR=\""$(top_srcdir)/unit/"\" \ ++ -DDBUS_DAEMON=\""$(DBUS_DAEMONDIR)/dbus-daemon"\" \ + -DCERTDIR=\""$(top_builddir)/unit/"\" + + pkgconfigdir = $(libdir)/pkgconfig +--- a/configure.ac ++++ b/configure.ac +@@ -14,6 +14,8 @@ + + AC_PREFIX_DEFAULT(/usr/local) + ++PKG_PROG_PKG_CONFIG ++ + COMPILER_FLAGS + + AC_LANG_C +@@ -131,6 +133,10 @@ + AC_CHECK_PROG(have_xxd, [xxd], [yes], [no]) + fi + ++PKG_CHECK_MODULES(DBUS, dbus-1, dummy=yes, ++ AC_MSG_ERROR(D-Bus is required for running tests)) ++PKG_CHECK_VAR(DBUS_DAEMONDIR, dbus-1, daemondir) ++ + AM_CONDITIONAL(DBUS_TESTS, test "${little_endian}" = "yes") + AM_CONDITIONAL(CERT_TESTS, test "${have_openssl}" = "yes") + +--- a/unit/test-dbus-message-fds.c ++++ b/unit/test-dbus-message-fds.c +@@ -51,7 +51,7 @@ + char *prg_envp[1]; + pid_t pid; + +- prg_argv[0] = "/usr/bin/dbus-daemon"; ++ prg_argv[0] = DBUS_DAEMON; + prg_argv[1] = "--nopidfile"; + prg_argv[2] = "--nofork"; + prg_argv[3] = "--config-file=" UNITDIR "dbus.conf"; +--- a/unit/test-dbus-properties.c ++++ b/unit/test-dbus-properties.c +@@ -48,7 +48,7 @@ + char *prg_envp[1]; + pid_t pid; + +- prg_argv[0] = "/usr/bin/dbus-daemon"; ++ prg_argv[0] = DBUS_DAEMON; + prg_argv[1] = "--nopidfile"; + prg_argv[2] = "--nofork"; + prg_argv[3] = "--config-file=" UNITDIR "dbus.conf"; +--- a/unit/test-dbus.c ++++ b/unit/test-dbus.c +@@ -45,7 +45,7 @@ + char *prg_envp[1]; + pid_t pid; + +- prg_argv[0] = "/usr/bin/dbus-daemon"; ++ prg_argv[0] = DBUS_DAEMON; + prg_argv[1] = "--nopidfile"; + prg_argv[2] = "--nofork"; + prg_argv[3] = "--config-file=" UNITDIR "dbus.conf"; diff --git a/pkgs/os-specific/linux/ena/default.nix b/pkgs/os-specific/linux/ena/default.nix index 495cd49e3f4..9b5d82b9f7b 100644 --- a/pkgs/os-specific/linux/ena/default.nix +++ b/pkgs/os-specific/linux/ena/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, kernel }: stdenv.mkDerivation rec { - version = "2.0.2"; + version = "2.1.2"; name = "ena-${version}-${kernel.version}"; src = fetchFromGitHub { owner = "amzn"; repo = "amzn-drivers"; rev = "ena_linux_${version}"; - sha256 = "0vb8s0w7ddwajk5gj5nqqlqc63p8p556f9ccwviwda2zvgqmk2pb"; + sha256 = "1dp1q99m2x8hq99his6n62yw0v1lbzrlyv67w1ndc774m2k77r5w"; }; hardeningDisable = [ "pic" ]; diff --git a/pkgs/os-specific/linux/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix index b8fec2f416a..d4a23f3ed07 100644 --- a/pkgs/os-specific/linux/evdi/default.nix +++ b/pkgs/os-specific/linux/evdi/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, kernel, libdrm }: stdenv.mkDerivation rec { - name = "evdi-${version}"; - version = "1.6.1"; + pname = "evdi"; + version = "1.6.2"; src = fetchFromGitHub { owner = "DisplayLink"; - repo = "evdi"; + repo = pname; rev = "v${version}"; - sha256 = "1h98w1yfqsrjfhpnyfnggpkxs9yayw441nmfkllmzhzfnsd31fp7"; + sha256 = "0ajjsh1fw7w0k28r6qq7kh3qcr87gzzjp8s890algbglynlafzfw"; }; nativeBuildInputs = kernel.moduleBuildDependencies; diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index a60417d8e23..b4d5d54137c 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -17,6 +17,18 @@ let fontsConf = makeFontsConf { fontDirectories = [ freefont_ttf ]; }; + + isx86 = stdenv.isx86_64 || stdenv.isi686; + + # Dell isn't supported on Aarch64 + haveDell = isx86; + + # only redfish for x86_64 + haveRedfish = stdenv.isx86_64; + + # Currently broken on Aarch64 + haveFlashrom = isx86; + in stdenv.mkDerivation rec { pname = "fwupd"; version = "1.2.8"; @@ -32,19 +44,15 @@ in stdenv.mkDerivation rec { meson ninja gtk-doc pkgconfig gobject-introspection intltool shared-mime-info valgrind gcab docbook_xml_dtd_43 docbook_xsl help2man libxslt python wrapGAppsHook vala ]; + buildInputs = [ - polkit libxmlb gusb sqlite libarchive libsoup elfutils libsmbios gnu-efi libyaml - libgudev colord gpgme libuuid gnutls glib-networking efivar json-glib umockdev - bash-completion cairo freetype fontconfig pango - ]; + polkit libxmlb gusb sqlite libarchive libsoup elfutils gnu-efi libyaml + libgudev colord gpgme libuuid gnutls glib-networking json-glib umockdev + bash-completion cairo freetype fontconfig pango efivar + ] ++ stdenv.lib.optionals haveDell [ libsmbios ]; patches = [ - (substituteAll { - src = ./fix-paths.patch; - inherit flashrom efibootmgr bubblewrap; - tpm2_tools = "${tpm2-tools}"; - }) - + ./fix-paths.patch ./add-option-for-installation-sysconfdir.patch # installed tests are installed to different output @@ -76,8 +84,15 @@ in stdenv.mkDerivation rec { # /etc/os-release not available in sandbox # doCheck = true; - preFixup = '' - gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share") + preFixup = let + binPath = [ efibootmgr bubblewrap tpm2-tools ] ++ stdenv.lib.optional haveFlashrom flashrom; + in + '' + gappsWrapperArgs+=( + --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" + # See programs reached with fu_common_find_program_in_path in source + --prefix PATH : "${stdenv.lib.makeBinPath binPath}" + ) ''; mesonFlags = [ @@ -90,6 +105,13 @@ in stdenv.mkDerivation rec { "--localstatedir=/var" "--sysconfdir=/etc" "-Dsysconfdir_install=${placeholder "out"}/etc" + ] ++ stdenv.lib.optionals (!haveDell) [ + "-Dplugin_dell=false" + "-Dplugin_synaptics=false" + ] ++ stdenv.lib.optionals (!haveRedfish) [ + "-Dplugin_redfish=false" + ] ++ stdenv.lib.optionals (!haveFlashrom) [ + "-Dplugin_flashrom=false" ]; # TODO: We need to be able to override the directory flags from meson setup hook diff --git a/pkgs/os-specific/linux/firmware/fwupd/fix-paths.patch b/pkgs/os-specific/linux/firmware/fwupd/fix-paths.patch index 51adef2e787..9efd7b8d6ab 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/fix-paths.patch +++ b/pkgs/os-specific/linux/firmware/fwupd/fix-paths.patch @@ -17,55 +17,3 @@ index 0cbb6f41..d757a81a 100755 - echo 'Creating stateful directory' - mkdir -p ${DESTDIR}${LOCALSTATEDIR}/lib/fwupd #fi -diff --git a/plugins/flashrom/fu-plugin-flashrom.c b/plugins/flashrom/fu-plugin-flashrom.c -index 598e0c42..a0a2c4a7 100644 ---- a/plugins/flashrom/fu-plugin-flashrom.c -+++ b/plugins/flashrom/fu-plugin-flashrom.c -@@ -52,7 +52,7 @@ fu_plugin_startup (FuPlugin *plugin, GError **error) - g_autoptr(GError) error_local = NULL; - - /* we need flashrom from the host system */ -- data->flashrom_fn = fu_common_find_program_in_path ("flashrom", &error_local); -+ data->flashrom_fn = fu_common_find_program_in_path ("@flashrom@/bin/flashrom", &error_local); - - /* search for devices */ - hwids = fu_plugin_get_hwids (plugin); -diff --git a/plugins/uefi/fu-plugin-uefi.c b/plugins/uefi/fu-plugin-uefi.c -index 9293715c..e2e77c58 100644 ---- a/plugins/uefi/fu-plugin-uefi.c -+++ b/plugins/uefi/fu-plugin-uefi.c -@@ -416,7 +416,7 @@ fu_plugin_update (FuPlugin *plugin, - fu_plugin_add_report_metadata (plugin, "MissingCapsuleHeader", str); - - /* record boot information to system log for future debugging */ -- efibootmgr_path = fu_common_find_program_in_path ("efibootmgr", NULL); -+ efibootmgr_path = fu_common_find_program_in_path ("@efibootmgr@/bin/efibootmgr", NULL); - if (efibootmgr_path != NULL) { - if (!g_spawn_command_line_sync ("efibootmgr -v", - &boot_variables, NULL, NULL, error)) -diff --git a/plugins/uefi/fu-uefi-pcrs.c b/plugins/uefi/fu-uefi-pcrs.c -index 5c7e5239..01acbf7f 100644 ---- a/plugins/uefi/fu-uefi-pcrs.c -+++ b/plugins/uefi/fu-uefi-pcrs.c -@@ -147,7 +147,7 @@ fu_uefi_pcrs_setup (FuUefiPcrs *self, GError **error) - /* old name, then new name */ - argv0 = fu_common_find_program_in_path ("tpm2_listpcrs", NULL); - if (argv0 == NULL) -- argv0 = fu_common_find_program_in_path ("tpm2_pcrlist", error); -+ argv0 = fu_common_find_program_in_path ("@tpm2_tools@/bin/tpm2_pcrlist", error); - if (argv0 == NULL) - return FALSE; - if (!fu_uefi_pcrs_setup_tpm20 (self, argv0, error)) -diff --git a/src/fu-common.c b/src/fu-common.c -index bd6faeef..45ba2a60 100644 ---- a/src/fu-common.c -+++ b/src/fu-common.c -@@ -436,7 +436,7 @@ fu_common_firmware_builder (GBytes *bytes, - g_return_val_if_fail (error == NULL || *error == NULL, NULL); - - /* find bwrap in the path */ -- bwrap_fn = fu_common_find_program_in_path ("bwrap", error); -+ bwrap_fn = fu_common_find_program_in_path ("@bubblewrap@/bin/bwrap", error); - if (bwrap_fn == NULL) - return NULL; - diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix index eb218f36eb4..ebd69d1fe12 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "raspberrypi-firmware"; - version = "1.20190401"; + version = "1.20190620+1"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "firmware"; rev = version; - sha256 = "13q04n1hf8a52avwfp9dhsn2jpp9ivs1mj37gp0h7a6k9044s2xw"; + sha256 = "0gbqlkr50qlmbpwr0n61pb58w0k3sfjfirh2y683rlkp5rlq7mrf"; }; installPhase = '' diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix index 7c4bd77fae0..4531de86b1b 100644 --- a/pkgs/os-specific/linux/fwts/default.nix +++ b/pkgs/os-specific/linux/fwts/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "fwts-${version}"; - version = "19.06.00"; + version = "19.07.00"; src = fetchzip { url = "http://fwts.ubuntu.com/release/fwts-V${version}.tar.gz"; - sha256 = "1aza6j323a908vlz3vkn0hda0jm34njg81aak1g4pqvmzhrg47ls"; + sha256 = "04h99ri3nzhxr2js2a04bcj6zm17zlybqzv528j6hr6v0pv5wn4p"; stripRoot = false; }; diff --git a/pkgs/os-specific/linux/iw/default.nix b/pkgs/os-specific/linux/iw/default.nix index 387792b8631..ad965f95c94 100644 --- a/pkgs/os-specific/linux/iw/default.nix +++ b/pkgs/os-specific/linux/iw/default.nix @@ -1,12 +1,12 @@ -{stdenv, fetchurl, libnl, pkgconfig}: +{ stdenv, fetchurl, pkgconfig, libnl }: stdenv.mkDerivation rec { pname = "iw"; - version = "5.0.1"; + version = "5.3"; src = fetchurl { url = "https://www.kernel.org/pub/software/network/${pname}/${pname}-${version}.tar.xz"; - sha256 = "03awbfrr9i78vgwsa6z2c8g14mia9z8qzrvzxar2ad9299wylf0y"; + sha256 = "1m85ap8hwzfs7xf9r0v5d55ra4mhw45f6vclc7j6gsldpibyibq4"; }; nativeBuildInputs = [ pkgconfig ]; @@ -16,9 +16,15 @@ stdenv.mkDerivation rec { meta = { description = "Tool to use nl80211"; - homepage = http://wireless.kernel.org/en/users/Documentation/iw; + longDescription = '' + iw is a new nl80211 based CLI configuration utility for wireless devices. + It supports all new drivers that have been added to the kernel recently. + The old tool iwconfig, which uses Wireless Extensions interface, is + deprecated and it's strongly recommended to switch to iw and nl80211. + ''; + homepage = https://wireless.wiki.kernel.org/en/users/Documentation/iw; license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [viric]; + maintainers = with stdenv.lib.maintainers; [ viric primeos ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix index 1ba463d1e9a..a1bb98b8297 100644 --- a/pkgs/os-specific/linux/iwd/default.nix +++ b/pkgs/os-specific/linux/iwd/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { pname = "iwd"; - version = "0.18"; + version = "0.19"; src = fetchgit { url = https://git.kernel.org/pub/scm/network/wireless/iwd.git; rev = version; - sha256 = "19scrkdyfj92cycirm22in1jf6rb77sy419gki4m9j8zdyapcqm9"; + sha256 = "0848r06bnx5k6wlmy425hljc3f03x9xx0r83vdvf630jryc9llmz"; }; nativeBuildInputs = [ diff --git a/pkgs/os-specific/linux/ixgbevf/default.nix b/pkgs/os-specific/linux/ixgbevf/default.nix index 6bcc548ba52..8a860cc1467 100644 --- a/pkgs/os-specific/linux/ixgbevf/default.nix +++ b/pkgs/os-specific/linux/ixgbevf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ixgbevf-${version}-${kernel.version}"; - version = "4.3.4"; + version = "4.6.1"; src = fetchurl { url = "mirror://sourceforge/e1000/ixgbevf-${version}.tar.gz"; - sha256 = "122zn9nd8f95bpidiiinc8xaizypkirqs8vlmsdy2iv3w65md9k3"; + sha256 = "0h8a2g4hm38wmr13gvi2188r7nlv2c5rx6cal9gkf1nh6sla181c"; }; nativeBuildInputs = kernel.moduleBuildDependencies; @@ -17,15 +17,18 @@ stdenv.mkDerivation rec { cd src makeFlagsArray+=(KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build INSTALL_MOD_PATH=$out MANDIR=/share/man) substituteInPlace common.mk --replace /sbin/depmod ${kmod}/bin/depmod + # prevent host system kernel introspection + substituteInPlace common.mk --replace /boot/System.map /not-exists ''; enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { description = "Intel 82599 Virtual Function Driver"; homepage = https://sourceforge.net/projects/e1000/files/ixgbevf%20stable/; - license = stdenv.lib.licenses.gpl2; + license = licenses.gpl2; priority = 20; - broken = (stdenv.lib.versionOlder kernel.version "4.9"); + # kernels ship ixgbevf driver for a long time already, maybe switch to a newest kernel? + broken = versionAtLeast kernel.version "5.2"; }; } diff --git a/pkgs/os-specific/linux/kernel/generate-config.pl b/pkgs/os-specific/linux/kernel/generate-config.pl index f886fcfdc35..26fc07202bb 100644 --- a/pkgs/os-specific/linux/kernel/generate-config.pl +++ b/pkgs/os-specific/linux/kernel/generate-config.pl @@ -28,7 +28,7 @@ open ANSWERS, "<$ENV{KERNEL_CONFIG}" or die "Could not open answer file"; while (<ANSWERS>) { chomp; s/#.*//; - if (/^\s*([A-Za-z0-9_]+)(\?)?\s+(\S+)\s*$/) { + if (/^\s*([A-Za-z0-9_]+)(\?)?\s+(.*\S)\s*$/) { $answers{$1} = $3; $requiredAnswers{$1} = !(defined $2); } elsif (!/^\s*$/) { diff --git a/pkgs/os-specific/linux/kernel/hardened-config.nix b/pkgs/os-specific/linux/kernel/hardened-config.nix index 79ee27c52b5..156a4cf4423 100644 --- a/pkgs/os-specific/linux/kernel/hardened-config.nix +++ b/pkgs/os-specific/linux/kernel/hardened-config.nix @@ -83,6 +83,9 @@ optionalAttrs (stdenv.hostPlatform.platform.kernelArch == "x86_64") { SLAB_FREELIST_HARDENED = whenAtLeast "4.14" yes; + # Randomize page allocator when page_alloc.shuffle=1 + SHUFFLE_PAGE_ALLOCATOR = whenAtLeast "5.2" yes; + # Allow enabling slub/slab free poisoning with slub_debug=P SLUB_DEBUG = yes; diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 57b0585ea4e..03b293055da 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.136"; + version = "4.14.139"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0w6z5fhwqgpqnz2js8vj9j5dl6isx8n7rnzrm0vr9r8njaazz396"; + sha256 = "0hkhwcbxg6bry13w9kspx48b10274w6pgv200wh91fjd8jax8qlc"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index dc404f0ef6a..7939ec3bfbf 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.64"; + version = "4.19.67"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1gasmcdsrsk81dscslmrsxqsvkfp5xxdx3ay95izggpk7piqnvvs"; + sha256 = "00m5k0nfcvgff70686rbhn3w8c9wc3jxqvyddw40lylaqdh3s72s"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 000ba6073a3..8084599f867 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.187"; + version = "4.4.189"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1dlzb5yzcsicd41myj3q4dq2ql8xcc49brs5f7xjmc5ynvvjjgnc"; + sha256 = "0nc8v62gw89m3ykqg6nqf749fzm8y1n481ns8vny4gbinyikjhlp"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index de15a2700a9..61f93435a06 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.187"; + version = "4.9.189"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1iyimwl4ysnk6m66m73sg0cnp4vac56d6yy174shfpnj5h2csjq1"; + sha256 = "1cyhwnxkjd0qa5d48657yppjnzbi830q0p25jjv2dxs629k4bnck"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.2.nix b/pkgs/os-specific/linux/kernel/linux-5.2.nix index d74f8548b3b..c87d6505940 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.2.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.2.6"; + version = "5.2.9"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1whzgdz1wnjzkb78yqz4xs3mad02rv17ksmwaf4ykp4lfgxml45y"; + sha256 = "1rnlnphw9rih4qhdld9ic5lnj5jh4vy5nqbj9lqwv9bc615jmw5n"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index e834a769c78..a61d8574cc0 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -9,11 +9,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "lxc-${version}"; - version = "3.1.0"; + version = "3.2.1"; src = fetchurl { url = "https://linuxcontainers.org/downloads/lxc/lxc-${version}.tar.gz"; - sha256 = "1igxqgx8q9cp15mcp1y8j564bl85ijw04jcmgb1s5bmfbg1751sd"; + sha256 = "1m633j5k700nsc3smca7fxqfhxhypxbamh18x9z60zdilj33k42z"; }; nativeBuildInputs = [ diff --git a/pkgs/os-specific/linux/lxcfs/default.nix b/pkgs/os-specific/linux/lxcfs/default.nix index 4299a8e9b37..7acee410a4e 100644 --- a/pkgs/os-specific/linux/lxcfs/default.nix +++ b/pkgs/os-specific/linux/lxcfs/default.nix @@ -3,13 +3,13 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "lxcfs-3.0.4"; + name = "lxcfs-3.1.2"; src = fetchFromGitHub { owner = "lxc"; repo = "lxcfs"; rev = name; - sha256 = "0wav2l8i218yma655870hvg96b5mxdcrsczjawjwv7qxcj5v98pw"; + sha256 = "195skz6wc2gfcf99f1fz1yaw29ngzg9lphnkag7yxnk3ffbhv40s"; }; nativeBuildInputs = [ pkgconfig help2man autoreconfHook ]; diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix index 4e0202cebf3..5aa9e9b43da 100644 --- a/pkgs/os-specific/linux/mdadm/default.nix +++ b/pkgs/os-specific/linux/mdadm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, groff, system-sendmail }: +{ stdenv, utillinux, coreutils, fetchurl, groff, system-sendmail }: stdenv.mkDerivation rec { name = "mdadm-4.1"; @@ -8,26 +8,37 @@ stdenv.mkDerivation rec { sha256 = "0jjgjgqijpdp7ijh8slzzjjw690kydb1jjadf0x5ilq85628hxmb"; }; - # This is to avoid self-references, which causes the initrd to explode - # in size and in turn prevents mdraid systems from booting. - allowedReferences = [ stdenv.cc.libc.out system-sendmail ]; - patches = [ ./no-self-references.patch ]; makeFlags = [ - "NIXOS=1" "INSTALL=install" "INSTALL_BINDIR=$(out)/sbin" + "NIXOS=1" "INSTALL=install" "BINDIR=$(out)/sbin" + "SYSTEMD_DIR=$(out)/lib/systemd/system" "MANDIR=$(out)/share/man" "RUN_DIR=/dev/.mdadm" "STRIP=" ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "CROSS_COMPILE=${stdenv.cc.targetPrefix}" ]; + installFlags = [ "install-systemd" ]; + + enableParallelBuilding = true; + nativeBuildInputs = [ groff ]; - preConfigure = '' + postPatch = '' sed -e 's@/lib/udev@''${out}/lib/udev@' \ -e 's@ -Werror @ @' \ -e 's@/usr/sbin/sendmail@${system-sendmail}@' -i Makefile + sed -i \ + -e 's@/usr/bin/basename@${coreutils}/bin/basename@g' \ + -e 's@BINDIR/blkid@${utillinux}/bin/blkid@g' \ + *.rules + ''; + + # This is to avoid self-references, which causes the initrd to explode + # in size and in turn prevents mdraid systems from booting. + postFixup = '' + grep -r $out $out/bin && false || true ''; meta = with stdenv.lib; { diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix index 303df98d44a..7984e357c82 100644 --- a/pkgs/os-specific/linux/nfs-utils/default.nix +++ b/pkgs/os-specific/linux/nfs-utils/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, lib, pkgconfig, utillinux, libcap, libtirpc, libevent , sqlite, kerberos, kmod, libuuid, keyutils, lvm2, systemd, coreutils, tcp_wrappers -, python3 +, python3, buildPackages }: let @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { # put it in the "lib" output, and the headers in "dev" outputs = [ "out" "dev" "lib" "man" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig buildPackages.stdenv.cc ]; buildInputs = [ libtirpc libcap libevent sqlite lvm2 diff --git a/pkgs/os-specific/linux/nvme-cli/default.nix b/pkgs/os-specific/linux/nvme-cli/default.nix index 4bf1e41bd57..76257f94fe7 100644 --- a/pkgs/os-specific/linux/nvme-cli/default.nix +++ b/pkgs/os-specific/linux/nvme-cli/default.nix @@ -1,18 +1,22 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "nvme-cli-${version}"; - version = "1.8.1"; + pname = "nvme-cli"; + version = "1.9"; src = fetchFromGitHub { owner = "linux-nvme"; repo = "nvme-cli"; rev = "v${version}"; - sha256 = "0agnxfcwgnnimmxrdpg4lmiqc5ai9b4amk8krriw01lflxi3xzn0"; + sha256 = "08x0x7nq8v7gr8a4lrrhclkz6n8fxlhhizxl2nz56w1xmfghcnfv"; }; makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; + # To omit the hostnqn and hostid files that are impure and should be unique + # for each target host: + installTargets = "install-spec"; + meta = with lib; { inherit (src.meta) homepage; description = "NVM-Express user space tooling for Linux"; diff --git a/pkgs/os-specific/linux/pagemon/default.nix b/pkgs/os-specific/linux/pagemon/default.nix index da2f73ec1b3..e1525a951a9 100644 --- a/pkgs/os-specific/linux/pagemon/default.nix +++ b/pkgs/os-specific/linux/pagemon/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "pagemon-${version}"; - version = "0.01.15"; + version = "0.01.16"; src = fetchFromGitHub { - sha256 = "0vbwpyik26zavpqsanmg8p7snk44nyz66flvkkqmhwx1ada9d181"; + sha256 = "0fpxjw6sg6r9r7yy03brri37wmmc32rhzayzlmwgmzay8rifmm7i"; rev = "V${version}"; repo = "pagemon"; owner = "ColinIanKing"; diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix index 6acd327ef0e..e604f73de2d 100644 --- a/pkgs/os-specific/linux/rdma-core/default.nix +++ b/pkgs/os-specific/linux/rdma-core/default.nix @@ -1,9 +1,10 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, pandoc -, ethtool, iproute, libnl, udev, python, perl +{ stdenv, fetchFromGitHub, cmake, pkgconfig, docutils +, pandoc, ethtool, iproute, libnl, udev, python, perl +, makeWrapper } : let - version = "24.0"; + version = "25.0"; in stdenv.mkDerivation { name = "rdma-core-${version}"; @@ -12,10 +13,10 @@ in stdenv.mkDerivation { owner = "linux-rdma"; repo = "rdma-core"; rev = "v${version}"; - sha256 = "038msip4fnd8fh6m0vhnqwsaarp86dbnc9hvf5n19aqhlqbabbdc"; + sha256 = "1r1gfps1xckky06ib1rbf6lp58v2jqpy1ipkr45rf55gpaxf93cj"; }; - nativeBuildInputs = [ cmake pkgconfig pandoc ]; + nativeBuildInputs = [ cmake pkgconfig pandoc docutils makeWrapper ]; buildInputs = [ libnl ethtool iproute udev python perl ]; cmakeFlags = [ @@ -28,6 +29,22 @@ in stdenv.mkDerivation { --replace ethtool "${ethtool}/bin/ethtool" \ --replace 'ip addr' "${iproute}/bin/ip addr" \ --replace 'ip link' "${iproute}/bin/ip link" + + substituteInPlace srp_daemon/srp_daemon.sh.in \ + --replace /bin/rm rm + ''; + + postInstall = '' + # cmake script is buggy, move file manually + mkdir -p $out/${perl.libPrefix} + mv $out/share/perl5/* $out/${perl.libPrefix} + ''; + + postFixup = '' + for pls in $out/bin/{ibfindnodesusing.pl,ibidsverify.pl}; do + echo "wrapping $pls" + wrapProgram $pls --prefix PERL5LIB : "$out/${perl.libPrefix}" + done ''; meta = with stdenv.lib; { diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 3001c8f07c5..cf1f2f242f4 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -5,13 +5,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "sysdig-${version}"; - version = "0.26.1"; + version = "0.26.2"; src = fetchFromGitHub { owner = "draios"; repo = "sysdig"; rev = version; - sha256 = "0mvm14s5lyxddf6fcfwrv7vd8r8vfw9z4447jl5mcvji2rnyywqz"; + sha256 = "1a74cvvy3lhilibc3lzcsvs6pwrdvdx2580qgckp1lrra9gf5hga"; }; nativeBuildInputs = [ cmake perl ]; diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 39aa855e3cc..b7f1af618fe 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "NixOS"; repo = "systemd"; - rev = "aa4c4d39d75ce52664cb28d569b1ceafda7b4c06"; - sha256 = "1ax94gzbdwdcf3wgj7f9cabdkvn2zynnnli7gkbz4isidlpis86g"; + rev = "5fb35fbc783516e2014115c3488134a2afb8494c"; + sha256 = "0pyjvzzh8nnxv4z58n82lz1mjnzv44sylcjgkvw8sp35vx1ryxfh"; }; outputs = [ "out" "lib" "man" "dev" ]; diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix index 3b5b08ff084..ede9fa68280 100644 --- a/pkgs/os-specific/linux/v4l-utils/default.nix +++ b/pkgs/os-specific/linux/v4l-utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig, perl +{ stdenv, lib, fetchurl, pkgconfig, perl, mkDerivation , libjpeg, udev , withUtils ? true , withGUI ? true, alsaLib, libX11, qtbase, libGLU @@ -6,7 +6,7 @@ # See libv4l in all-packages.nix for the libs only (overrides alsa, libX11 & QT) -stdenv.mkDerivation rec { +mkDerivation rec { name = "v4l-utils-${version}"; version = "1.16.6"; diff --git a/pkgs/os-specific/linux/wpa_supplicant/gui.nix b/pkgs/os-specific/linux/wpa_supplicant/gui.nix index 891de61c017..7c6f595bfaf 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/gui.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/gui.nix @@ -1,6 +1,6 @@ -{ stdenv, qtbase, qmake, inkscape, imagemagick, wpa_supplicant }: +{ stdenv, mkDerivation, qtbase, qmake, inkscape, imagemagick, wpa_supplicant }: -stdenv.mkDerivation { +mkDerivation { name = "wpa_gui-${wpa_supplicant.version}"; inherit (wpa_supplicant) src; diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index ce2f788338e..03e11d1a8ed 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, utillinux, nukeReferences, coreutils -, perl +, perl, buildPackages , configFile ? "all" # Userspace dependencies @@ -43,53 +43,43 @@ let postPatch = optionalString buildKernel '' patchShebangs scripts - '' + optionalString stdenv.hostPlatform.isMusl '' - substituteInPlace config/user-libtirpc.m4 \ - --replace /usr/include/tirpc ${libtirpc}/include/tirpc - ''; - - nativeBuildInputs = [ autoreconfHook nukeReferences ] - ++ optional buildKernel (kernel.moduleBuildDependencies ++ [ perl ]); - buildInputs = optionals buildUser [ zlib libuuid python3 attr ] - ++ optionals (buildUser) [ openssl ] - ++ optional stdenv.hostPlatform.isMusl [ libtirpc ]; - - # for zdb to get the rpath to libgcc_s, needed for pthread_cancel to work - NIX_CFLAGS_LINK = "-lgcc_s"; - - hardeningDisable = [ "fortify" "stackprotector" "pic" ]; - - preConfigure = '' - substituteInPlace ./module/zfs/zfs_ctldir.c --replace "umount -t zfs" "${utillinux}/bin/umount -t zfs" - substituteInPlace ./module/zfs/zfs_ctldir.c --replace "mount -t zfs" "${utillinux}/bin/mount -t zfs" - substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/umount" "${utillinux}/bin/umount" - substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/mount" "${utillinux}/bin/mount" + # The arrays must remain the same length, so we repeat a flag that is + # already part of the command and therefore has no effect. + substituteInPlace ./module/zfs/zfs_ctldir.c --replace '"/usr/bin/env", "umount"' '"${utillinux}/bin/umount", "-n"' \ + --replace '"/usr/bin/env", "mount"' '"${utillinux}/bin/mount", "-n"' + '' + optionalString buildUser '' + substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/umount" "${utillinux}/bin/umount" \ + --replace "/bin/mount" "${utillinux}/bin/mount" substituteInPlace ./lib/libshare/nfs.c --replace "/usr/sbin/exportfs" "${nfs-utils}/bin/exportfs" - substituteInPlace ./cmd/ztest/ztest.c --replace "/usr/sbin/ztest" "$out/sbin/ztest" - substituteInPlace ./cmd/ztest/ztest.c --replace "/usr/sbin/zdb" "$out/sbin/zdb" substituteInPlace ./config/user-systemd.m4 --replace "/usr/lib/modules-load.d" "$out/etc/modules-load.d" substituteInPlace ./config/zfs-build.m4 --replace "\$sysconfdir/init.d" "$out/etc/init.d" substituteInPlace ./etc/zfs/Makefile.am --replace "\$(sysconfdir)" "$out/etc" substituteInPlace ./cmd/zed/Makefile.am --replace "\$(sysconfdir)" "$out/etc" - substituteInPlace ./module/Makefile.in --replace "/bin/cp" "cp" substituteInPlace ./etc/systemd/system/zfs-share.service.in \ --replace "/bin/rm " "${coreutils}/bin/rm " - for f in ./udev/rules.d/* - do - substituteInPlace "$f" --replace "/lib/udev/vdev_id" "$out/lib/udev/vdev_id" - done substituteInPlace ./cmd/vdev_id/vdev_id \ --replace "PATH=/bin:/sbin:/usr/bin:/usr/sbin" \ "PATH=${makeBinPath [ coreutils gawk gnused gnugrep systemd ]}" - - ./autogen.sh - configureFlagsArray+=("--libexecdir=$out/libexec") + '' + optionalString stdenv.hostPlatform.isMusl '' + substituteInPlace config/user-libtirpc.m4 \ + --replace /usr/include/tirpc ${libtirpc}/include/tirpc ''; + nativeBuildInputs = [ autoreconfHook nukeReferences ] + ++ optionals buildKernel (kernel.moduleBuildDependencies ++ [ perl ]); + buildInputs = optionals buildUser [ zlib libuuid attr ] + ++ optionals (buildUser) [ openssl python3 ] + ++ optional stdenv.hostPlatform.isMusl libtirpc; + + # for zdb to get the rpath to libgcc_s, needed for pthread_cancel to work + NIX_CFLAGS_LINK = "-lgcc_s"; + + hardeningDisable = [ "fortify" "stackprotector" "pic" ]; + configureFlags = [ "--with-config=${configFile}" - "--with-python=${python3.interpreter}" + (withFeatureAs buildUser "python" python3.interpreter) ] ++ optionals buildUser [ "--with-dracutdir=$(out)/lib/dracut" "--with-udevdir=$(out)/lib/udev" @@ -97,13 +87,16 @@ let "--with-systemdpresetdir=$(out)/etc/systemd/system-preset" "--with-systemdgeneratordir=$(out)/lib/systemd/system-generator" "--with-mounthelperdir=$(out)/bin" + "--libexecdir=$(out)/libexec" "--sysconfdir=/etc" "--localstatedir=/var" "--enable-systemd" - ] ++ optionals buildKernel [ + ] ++ optionals buildKernel ([ "--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source" "--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" - ]; + ] ++ kernel.makeFlags); + + makeFlags = optionals buildKernel kernel.makeFlags; enableParallelBuilding = true; @@ -112,9 +105,10 @@ let "DEFAULT_INITCONF_DIR=\${out}/default" ]; - postInstall = '' - # Prevent kernel modules from depending on the Linux -dev output. - nuke-refs $(find $out -name "*.ko") + postInstall = optionalString buildKernel '' + # Add reference that cannot be detected due to compressed kernel module + mkdir -p "$out/nix-support" + echo "${utillinux}" >> "$out/nix-support/extra-refs" '' + optionalString buildUser '' # Remove provided services as they are buggy rm $out/etc/systemd/system/zfs-import-*.service @@ -174,7 +168,6 @@ in { # incompatibleKernelVersion = "4.19"; # this package should point to a version / git revision compatible with the latest kernel release - # This is now "stable". Move to zfsStable after it's tested more. version = "0.8.1"; sha256 = "0wlbziijx08a9bmbyq4gfz4by9l5jrx44g18i99qnfm78k2q8a84"; diff --git a/pkgs/os-specific/windows/pthread-w32/default.nix b/pkgs/os-specific/windows/pthread-w32/default.nix index 226bbfb16df..de0f36dac5f 100644 --- a/pkgs/os-specific/windows/pthread-w32/default.nix +++ b/pkgs/os-specific/windows/pthread-w32/default.nix @@ -1,61 +1,29 @@ -{ fetchurl, stdenv, mingwrt }: +{ stdenv, fetchzip }: -# This file is tweaked for cross-compilation only. -assert stdenv.hostPlatform != stdenv.buildPlatform; +stdenv.mkDerivation rec { + name = "pthreads-w32-${version}"; + version = "2.9.1"; -stdenv.mkDerivation { - name = "pthread-w32-1.10.0"; - - src = fetchurl { - url = "ftp://sourceware.org/pub/pthreads-win32/pthreads-w32-1-10-0-release.tar.gz"; - sha256 = "1vllxxfa9a7mssb1x98a2r736vsv5ll3sjizbr7a8hw8j9p18j7n"; + src = fetchzip { + url = "https://sourceware.org/pub/pthreads-win32/pthreads-w32-2-9-1-release.tar.gz"; + sha256 = "1s8iny7g06z289ahdj0kzaxj0cd3wvjbd8j3bh9xlg7g444lhy9w"; }; - configurePhase = - '' sed -i GNUmakefile \ - -e 's/CC=gcc/CC=i686-pc-mingw32-gcc/g ; - s/windres/i686-pc-mingw32-windres/g ; - s/dlltool/i686-pc-mingw32-dlltool/g' - ''; - - buildInputs = [ mingwrt ]; - - buildPhase = "make GC"; # to build the GNU C dll with C cleanup code - - installPhase = - '' mkdir -p "$out" "$out/include" "$out/lib" - cp -v *pthread*{dll,a} "$out/lib" - cp -v pthread.h semaphore.h sched.h "$out/include" - ''; - - postFixup = - # By default `mingw_headers' is propagated. Prevent that, because - # otherwise MinGW headers appear twice in `-I', and thus the - # "#include_next <float.h>" in MinGW's <float.h> picks up itself instead - # of picking up GCC's (hence, FLT_RADIX is left undefined, for instance.) - '' rm -f "$out/nix-support/propagated-build-inputs" - ''; - - meta = { - description = "POSIX threads for Woe32"; + makeFlags = [ "CROSS=${stdenv.cc.targetPrefix}" "GC-static" ]; - longDescription = - '' The POSIX 1003.1-2001 standard defines an application programming - interface (API) for writing multithreaded applications. This - interface is known more commonly as pthreads. A good number of - modern operating systems include a threading library of some kind: - Solaris (UI) threads, Win32 threads, DCE threads, DECthreads, or any - of the draft revisions of the pthreads standard. The trend is that - most of these systems are slowly adopting the pthreads standard API, - with application developers following suit to reduce porting woes. + installPhase = '' + runHook preInstall - Woe32 does not, and is unlikely to ever, support pthreads natively. - This project seeks to provide a freely available and high-quality - solution to this problem. - ''; + install -D libpthreadGC2.a $out/lib/libpthread.a - homepage = http://sourceware.org/pthreads-win32/; + runHook postInstall + ''; - license = stdenv.lib.licenses.lgpl21Plus; + meta = with stdenv.lib; { + description = "POSIX threads library for Windows"; + homepage = "https://sourceware.org/pthreads-win32"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ yegortimoshenko ]; + platforms = platforms.windows; }; } diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index 00f83cba8db..9538747da6d 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -6,12 +6,12 @@ stdenv.mkDerivation rec { name = "rabbitmq-server-${version}"; - version = "3.7.16"; + version = "3.7.17"; # when updating, consider bumping elixir version in all-packages.nix src = fetchurl { url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${name}.tar.xz"; - sha256 = "12s1s4zz3fxvb5ah5v6gmaq1kgd41pv9nahsdswa7svbgdc8lykz"; + sha256 = "1ychgvjbi6ikapfcp4rgwa0vihhs1f34c2advb7833jym8alazrr"; }; buildInputs = diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix index 7fdbfb6472c..bfaccdd4ea0 100644 --- a/pkgs/servers/bird/default.nix +++ b/pkgs/servers/bird/default.nix @@ -57,7 +57,7 @@ in }; bird2 = generic { - version = "2.0.4"; - sha256 = "1phl8ycasbzgla83d9zbzzy1ymjz30k1qh1pmywmjhbxa6vi0q37"; + version = "2.0.5"; + sha256 = "1lr963ywy0mkrhgs5969wc354lizddsagrlbf8x84yb5s9pp6jsf"; }; } diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix index 4df24a6d60c..8530d8cb068 100644 --- a/pkgs/servers/clickhouse/default.nix +++ b/pkgs/servers/clickhouse/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "clickhouse-${version}"; - version = "19.6.2.11"; + version = "19.13.1.11"; src = fetchFromGitHub { owner = "yandex"; repo = "ClickHouse"; rev = "v${version}-stable"; - sha256 = "0bs38a8dm5x43klx4nc5dwkkxpab12lp2chyvc2y47c75j7rn5d7"; + sha256 = "1j9jhgl2z84id5z6rbvyal7aha5v3m8pd393cmcsf1bf0fiz8qmc"; }; nativeBuildInputs = [ cmake libtool ninja ]; diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index c18e71977d8..1b3e5466ec3 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { name = "slurm-${version}"; - version = "19.05.1.2"; + version = "19.05.2.1"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # because the latter does not keep older releases. @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { repo = "slurm"; # The release tags use - instead of . rev = "${builtins.replaceStrings ["."] ["-"] name}"; - sha256 = "1r2hxfshz929fcys90rmnj8s7f204q364m6bazhiy8hhm3bsf42k"; + sha256 = "1k19z0qyjr6nwqxv93wbnnhy498788rc4fl9zyf0smc5yq1zbjir"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/servers/dns/doh-proxy/default.nix b/pkgs/servers/dns/doh-proxy/default.nix index ac44dbbf04d..d94f34ebd21 100644 --- a/pkgs/servers/dns/doh-proxy/default.nix +++ b/pkgs/servers/dns/doh-proxy/default.nix @@ -1,17 +1,35 @@ { lib, python3Packages }: -python3Packages.buildPythonApplication rec { +with python3Packages; +buildPythonApplication rec { pname = "doh-proxy"; - version = "0.0.8"; + version = "0.0.9"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0mfl84mcklby6cnsw29kpcxj7mh1cx5yw6mjs4sidr1psyni7x6c"; + sha256 = "1fxzxipzdvk75yrcr78mpdz8lwpisba67lk4jcwxdnkv6997dwfp"; }; - propagatedBuildInputs = with python3Packages; - [ aioh2 dnspython aiohttp-remotes pytestrunner flake8 ]; - doCheck = false; # Trouble packaging unittest-data-provider + nativeBuildInputs = [ pytestrunner flake8]; + + propagatedBuildInputs = [ + aioh2 + dnspython + aiohttp-remotes + ]; + + checkInputs = [ + asynctest + unittest-data-provider + pytest + pytestcov + pytest-aiohttp + ]; + + # attempts to resolve address + checkPhase = '' + pytest -k 'not servers' + ''; meta = with lib; { homepage = https://facebookexperimental.github.io/doh-proxy/; diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index 34791cfdd71..1d8896bfc10 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -23,13 +23,16 @@ exportLuaPathsFor = luaPkgs: '' unwrapped = stdenv.mkDerivation rec { name = "knot-resolver-${version}"; - version = "4.1.0"; + version = "4.2.0"; src = fetchurl { url = "https://secure.nic.cz/files/knot-resolver/${name}.tar.xz"; - sha256 = "2fe470f9bb1007667cdd448f758087244b7195a0234c2b100a9beeed0a2d3e68"; + sha256 = "b37ff9ceefbaa4e4527d183fb1bbb63e641d34d9889ce92715128bc1423c7ef4"; }; + # https://gitlab.labs.nic.cz/knot/knot-resolver/issues/496 + postPatch = "sed '/prefill.test.lua/d' -i modules/meson.build"; + outputs = [ "out" "dev" ]; preConfigure = '' diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix index 684dc02dcf3..fcddd569b36 100644 --- a/pkgs/servers/dns/pdns-recursor/default.nix +++ b/pkgs/servers/dns/pdns-recursor/default.nix @@ -8,11 +8,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "pdns-recursor-${version}"; - version = "4.1.14"; + version = "4.2.0"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2"; - sha256 = "055zhxp58883722dr9y5bi91bk1ypc0whdyi96nklsga7gxbikkz"; + sha256 = "1hn2nw8v6gccwxwm36xczsac4bhxf8b8r7akri2wdp3gh70p4g7h"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/http/couchdb/2.0.0.nix b/pkgs/servers/http/couchdb/2.0.0.nix index cb630c26688..b3c4abfed90 100644 --- a/pkgs/servers/http/couchdb/2.0.0.nix +++ b/pkgs/servers/http/couchdb/2.0.0.nix @@ -1,19 +1,20 @@ { stdenv, fetchurl, erlang, icu, openssl, spidermonkey -, coreutils, bash, makeWrapper }: +, coreutils, bash, makeWrapper, python3 }: stdenv.mkDerivation rec { name = "couchdb-${version}"; - version = "2.3.0"; + version = "2.3.1"; + # when updating this, please consider bumping the OTP version # in all-packages.nix src = fetchurl { url = "mirror://apache/couchdb/source/${version}/apache-${name}.tar.gz"; - sha256 = "0lpk64n6fip85j1jz59kq20jdliwv6mh8j2h5zyxjn5i8b86hf0b"; + sha256 = "0z926hjqyhxhyr65kqxwpmp80nyfqbig6d9dy8dqflpb87n8rss3"; }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ erlang icu openssl spidermonkey ]; + buildInputs = [ erlang icu openssl spidermonkey (python3.withPackages(ps: with ps; [ requests ]))]; patches = [ ./jsapi.patch ]; postPatch = '' diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix index 47082bbeba0..c5e0b47e238 100644 --- a/pkgs/servers/http/nginx/mainline.nix +++ b/pkgs/servers/http/nginx/mainline.nix @@ -1,6 +1,6 @@ { callPackage, ... }@args: callPackage ./generic.nix (args // { - version = "1.17.2"; - sha256 = "1v39gslwbvpfhqqv74q0lkfrhrwsp59xc8pwhvxns7af8s3kccsy"; + version = "1.17.3"; + sha256 = "0g0g9prwjy0rnv6n5smny5yl5dhnmflqdr3hwgyj5jpr5hfgx11v"; }) diff --git a/pkgs/servers/http/nginx/stable.nix b/pkgs/servers/http/nginx/stable.nix index ffc6f81fdc2..31aeaa6f084 100644 --- a/pkgs/servers/http/nginx/stable.nix +++ b/pkgs/servers/http/nginx/stable.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "1.16.0"; - sha256 = "0i8krbi1pc39myspwlvb8ck969c8207hz84lh3qyg5w7syx7dlsg"; + version = "1.16.1"; + sha256 = "0az3vf463b538ajvaq94hsz9ipmjgnamfj1jy0v5flfks5njl77i"; }) diff --git a/pkgs/servers/http/tomcat/axis2/default.nix b/pkgs/servers/http/tomcat/axis2/default.nix index 7f14f6fff19..5da89200816 100644 --- a/pkgs/servers/http/tomcat/axis2/default.nix +++ b/pkgs/servers/http/tomcat/axis2/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "axis2-${version}"; - version = "1.6.4"; + version = "1.7.9"; src = fetchurl { url = "http://apache.proserve.nl/axis/axis2/java/core/${version}/${name}-bin.zip"; - sha256 = "12ir706dn95567j6lkxdwrh28vnp6292h59qwjyqjm7ckglkmgyr"; + sha256 = "0dh0s9bfh95wmmw8nyf2yw95biq7d9zmrbg8k4vzcyz1if228lac"; }; buildInputs = [ unzip apacheAnt jdk ]; diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix index 88c973de0d1..a537a4c6d00 100644 --- a/pkgs/servers/mail/exim/default.nix +++ b/pkgs/servers/mail/exim/default.nix @@ -16,12 +16,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ coreutils db openssl perl pcre ] ++ stdenv.lib.optional enableLDAP openldap - ++ stdenv.lib.optionals enableMySQL [ mysql zlib ] + ++ stdenv.lib.optionals enableMySQL [ mysql.connector-c zlib ] ++ stdenv.lib.optional enableAuthDovecot dovecot ++ stdenv.lib.optional enablePAM pam; preBuild = '' - ${stdenv.lib.optionalString enableMySQL "PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${mysql}/share/mysql/pkgconfig/"} sed ' s:^\(BIN_DIRECTORY\)=.*:\1='"$out"'/bin: s:^\(CONFIGURE_FILE\)=.*:\1=/etc/exim.conf: @@ -52,10 +51,10 @@ stdenv.mkDerivation rec { ''} ${stdenv.lib.optionalString enableMySQL '' s:^# \(LOOKUP_MYSQL=yes\)$:\1: - s:^# \(LOOKUP_MYSQL_PC=mariadb\)$:\1: - s:^\(LOOKUP_LIBS\)=\(.*\):\1=\2 -lmysqlclient: - s:^# \(LOOKUP_LIBS\)=.*:\1=-lmysqlclient: - s:^# \(LOOKUP_INCLUDE\)=.*:\1=-I${mysql}/include/mysql/: + s:^# \(LOOKUP_MYSQL_PC=mysql.connector-c\)$:\1: + s:^\(LOOKUP_LIBS\)=\(.*\):\1=\2 -lmysqlclient -L${mysql.connector-c}/lib/mysql -lssl -ldl -lm -lpthread -lz: + s:^# \(LOOKUP_LIBS\)=.*:\1=-lmysqlclient -L${mysql.connector-c}/lib/mysql -lssl -ldl -lm -lpthread -lz: + s:^# \(LOOKUP_INCLUDE\)=.*:\1=-I${mysql.connector-c}/include/mysql/: ''} ${stdenv.lib.optionalString enableAuthDovecot '' s:^# \(AUTH_DOVECOT\)=.*:\1=yes: diff --git a/pkgs/servers/mediatomb/default.nix b/pkgs/servers/mediatomb/default.nix index 75d12a5f66f..33b7674cf9e 100644 --- a/pkgs/servers/mediatomb/default.nix +++ b/pkgs/servers/mediatomb/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit -, sqlite, expat, mp4v2, flac, spidermonkey_1_8_5, taglib, libexif, curl, ffmpeg, file +, sqlite, expat, mp4v2, flac, spidermonkey, taglib, libexif, curl, ffmpeg, file , pkgconfig, autoreconfHook }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1mimslr4q6mky865y6561rr64cbn4gf0qc2dhgb31hxp4rc1kmzd"; }; - buildInputs = [ sqlite expat spidermonkey_1_8_5 taglib libexif curl ffmpeg file mp4v2 flac + buildInputs = [ sqlite expat spidermonkey taglib libexif curl ffmpeg file mp4v2 flac pkgconfig autoreconfHook ]; meta = with stdenv.lib; { diff --git a/pkgs/servers/meteor/default.nix b/pkgs/servers/meteor/default.nix index b677b6080d1..d367bcfd2e3 100644 --- a/pkgs/servers/meteor/default.nix +++ b/pkgs/servers/meteor/default.nix @@ -1,22 +1,20 @@ { stdenv, lib, fetchurl, zlib, patchelf, runtimeShell }: let - bootstrap = fetchurl { - url = "https://meteorinstall-4168.kxcdn.com/packages-bootstrap/1.5/meteor-bootstrap-os.linux.x86_64.tar.gz"; - sha256 = "0cwwqv88h1ji7g4zmfz34xsrxkn640wr11ddjq5c6b9ygcljci3p"; - }; + version = "1.8.1"; in stdenv.mkDerivation rec { - name = "meteor-${version}"; - version = "1.5"; + inherit version; + pname = "meteor"; + src = fetchurl { + url = "https://static-meteor.netdna-ssl.com/packages-bootstrap/${version}/meteor-bootstrap-os.linux.x86_64.tar.gz"; + sha256 = "1ql58j2d1pqhzpj7c9a6zrpmxxfmlgx743q7lw7g35vz2mpq34c6"; + }; - dontStrip = true; + #dontStrip = true; - unpackPhase = '' - tar xf ${bootstrap} - sourceRoot=.meteor - ''; + sourceRoot = ".meteor"; installPhase = '' mkdir $out @@ -25,7 +23,6 @@ stdenv.mkDerivation rec { chmod -R +w $out/packages cp -r package-metadata $out - chmod -R +w $out/package-metadata devBundle=$(find $out/packages/meteor-tool -name dev_bundle) ln -s $devBundle $out/dev_bundle diff --git a/pkgs/servers/misc/airsonic/default.nix b/pkgs/servers/misc/airsonic/default.nix index 8dd294bcdf8..a7fb0b3b3a7 100644 --- a/pkgs/servers/misc/airsonic/default.nix +++ b/pkgs/servers/misc/airsonic/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "airsonic-${version}"; - version = "10.2.1"; + version = "10.4.0"; src = fetchurl { url = "https://github.com/airsonic/airsonic/releases/download/v${version}/airsonic.war"; - sha256 = "1gjyg9qnrckm2gmym13yhlvw0iaspl8x0534zdw558gi3mjykm4v"; + sha256 = "1m4l10hp5m010ljsvn2ba4bbh8i26d04xffw81gfgjw08gya2hh8"; }; buildCommand = '' diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 70ba29dfe03..532ed971ac8 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }: buildGoPackage rec { - version = "6.2.5"; + version = "6.3.3"; name = "grafana-${version}"; goPackagePath = "github.com/grafana/grafana"; @@ -11,12 +11,12 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "03wign7dkc2a9267mmqicvvzgya0g1i9ygr0dz3jvks2k1yhlv2j"; + sha256 = "006j39n42l91krd1p87dpan1s7dvjjhpidccpxkic189lwg7fbxs"; }; srcStatic = fetchurl { url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "19zc9x1gkmdr7ijsrhrlln5cib20iyx0vgk0z79d8qyhq69nxfs8"; + sha256 = "0n4fkzj3bnq3x08vw18a8lqxjggqsy5l2rgk494i87yaf1pa4gpf"; }; postPatch = '' @@ -36,7 +36,7 @@ buildGoPackage rec { meta = with lib; { description = "Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"; license = licenses.asl20; - homepage = https://grafana.org/; + homepage = "https://grafana.com"; maintainers = with maintainers; [ offline fpletz willibutz ]; platforms = platforms.linux; }; diff --git a/pkgs/servers/monitoring/nagios/default.nix b/pkgs/servers/monitoring/nagios/default.nix index 3459a5fe8f7..92713a43ea2 100644 --- a/pkgs/servers/monitoring/nagios/default.nix +++ b/pkgs/servers/monitoring/nagios/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "nagios-${version}"; - version = "4.4.3"; + version = "4.4.4"; src = fetchurl { url = "mirror://sourceforge/nagios/nagios-4.x/${name}/${name}.tar.gz"; - sha256 = "0rwzlj6qp8hq931rw6s255b33ggmc2fcxs74g9x2zxwcvklg1a5v"; + sha256 = "0nkbv8lzpiknddiq0466dlpp3hw8lqmaidk8931hp4664cdsaw57"; }; patches = [ ./nagios.patch ]; diff --git a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix index 1f342adebaa..9803ba09e16 100644 --- a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "blackbox_exporter-${version}"; - version = "0.12.0"; + version = "0.14.0"; rev = version; goPackagePath = "github.com/prometheus/blackbox_exporter"; @@ -11,14 +11,16 @@ buildGoPackage rec { rev = "v${version}"; owner = "prometheus"; repo = "blackbox_exporter"; - sha256 = "0gd3vymk3qdfjnf0rx9kwc6v0jv7f8l30igvj2v7bljar2d6hzxf"; + sha256 = "1v5n59p9jl6y1ka9mqp0ibx1kpcb3gbpl0i6bhqpbr154frmqm4x"; }; + doCheck = true; + meta = with stdenv.lib; { description = "Blackbox probing of endpoints over HTTP, HTTPS, DNS, TCP and ICMP"; - homepage = https://github.com/prometheus/blackbox_exporter; + homepage = "https://github.com/prometheus/blackbox_exporter"; license = licenses.asl20; - maintainers = with maintainers; [ globin fpletz ]; + maintainers = with maintainers; [ globin fpletz willibutz ]; platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix index 94cb2f74cb0..963315f00c1 100644 --- a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "nginx_exporter-${version}"; - version = "0.4.1"; + version = "0.4.2"; goPackagePath = "github.com/nginxinc/nginx-prometheus-exporter"; @@ -14,9 +14,11 @@ buildGoPackage rec { rev = "v${version}"; owner = "nginxinc"; repo = "nginx-prometheus-exporter"; - sha256 = "0c5bxl9xrd4gh2w5wyrzghmbcy9k1khydzml5cm0rsyqhwsvs8m5"; + sha256 = "023nl83w0fic7sj0yxxgj7jchyafqnmv6dq35amzz37ikx92mdcj"; }; + doCheck = true; + meta = with stdenv.lib; { description = "NGINX Prometheus Exporter for NGINX and NGINX Plus"; homepage = "https://github.com/nginxinc/nginx-prometheus-exporter"; diff --git a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix index 1a623a3171d..a629a2a27e2 100644 --- a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix @@ -1,24 +1,22 @@ -{ lib, buildGoPackage, fetchFromGitHub, makeWrapper, varnish }: +{ lib, buildGoModule, fetchFromGitHub, makeWrapper, varnish }: -buildGoPackage rec { - name = "prometheus_varnish_exporter-${version}"; - version = "1.5"; - - goPackagePath = "github.com/jonnenauha/prometheus_varnish_exporter"; +buildGoModule rec { + pname = "prometheus_varnish_exporter"; + version = "1.5.1"; src = fetchFromGitHub { owner = "jonnenauha"; repo = "prometheus_varnish_exporter"; rev = version; - sha256 = "1040x7fk3s056yrn95siilhi8c9cci2mdncc1xfjf5xj87421qx8"; + sha256 = "1lvs44936n3s9z6c5169jbvx390n5g0qk4pcrmnkndg796ixjshd"; }; - goDeps = ./varnish-exporter_deps.nix; + modSha256 = "0w1zg9jc2466srx9pdckw7rzn7ma4pbd0617b1h98v364wjzgj72"; nativeBuildInputs = [ makeWrapper ]; postInstall = '' - wrapProgram $bin/bin/prometheus_varnish_exporter \ + wrapProgram $out/bin/prometheus_varnish_exporter \ --prefix PATH : "${varnish}/bin" ''; diff --git a/pkgs/servers/monitoring/prometheus/varnish-exporter_deps.nix b/pkgs/servers/monitoring/prometheus/varnish-exporter_deps.nix deleted file mode 100644 index aeacbb5cee8..00000000000 --- a/pkgs/servers/monitoring/prometheus/varnish-exporter_deps.nix +++ /dev/null @@ -1,300 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "github.com/alecthomas/template"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/template"; - rev = "a0175ee3bccc"; - sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; - }; - } - { - goPackagePath = "github.com/alecthomas/units"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/units"; - rev = "2efee857e7cf"; - sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "v1.0.0"; - sha256 = "1i1nz1f6g55xi2y3aiaz5kqfgvknarbfl4f0sx4nyyb4s7xb1z9x"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "v1.1.1"; - sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; - }; - } - { - goPackagePath = "github.com/go-kit/kit"; - fetch = { - type = "git"; - url = "https://github.com/go-kit/kit"; - rev = "v0.8.0"; - sha256 = "1rcywbc2pvab06qyf8pc2rdfjv7r6kxdv2v4wnpqnjhz225wqvc0"; - }; - } - { - goPackagePath = "github.com/go-logfmt/logfmt"; - fetch = { - type = "git"; - url = "https://github.com/go-logfmt/logfmt"; - rev = "v0.3.0"; - sha256 = "1gkgh3k5w1xwb2qbjq52p6azq3h1c1rr6pfwjlwj1zrijpzn2xb9"; - }; - } - { - goPackagePath = "github.com/go-stack/stack"; - fetch = { - type = "git"; - url = "https://github.com/go-stack/stack"; - rev = "v1.8.0"; - sha256 = "0wk25751ryyvxclyp8jdk5c3ar0cmfr8lrjb66qbg4808x66b96v"; - }; - } - { - goPackagePath = "github.com/gogo/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/gogo/protobuf"; - rev = "v1.1.1"; - sha256 = "1525pq7r6h3s8dncvq8gxi893p2nq8dxpzvq0nfl5b4p6mq0v1c2"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "v1.3.1"; - sha256 = "15am4s4646qy6iv0g3kkqq52rzykqjhm4bf08dk0fy2r58knpsyl"; - }; - } - { - goPackagePath = "github.com/json-iterator/go"; - fetch = { - type = "git"; - url = "https://github.com/json-iterator/go"; - rev = "v1.1.6"; - sha256 = "08caswxvdn7nvaqyj5kyny6ghpygandlbw9vxdj7l5vkp7q0s43r"; - }; - } - { - goPackagePath = "github.com/julienschmidt/httprouter"; - fetch = { - type = "git"; - url = "https://github.com/julienschmidt/httprouter"; - rev = "v1.2.0"; - sha256 = "1k8bylc9s4vpvf5xhqh9h246dl1snxrzzz0614zz88cdh8yzs666"; - }; - } - { - goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; - fetch = { - type = "git"; - url = "https://github.com/konsorten/go-windows-terminal-sequences"; - rev = "v1.0.1"; - sha256 = "1lchgf27n276vma6iyxa0v1xds68n2g8lih5lavqnx5x6q5pw2ip"; - }; - } - { - goPackagePath = "github.com/kr/logfmt"; - fetch = { - type = "git"; - url = "https://github.com/kr/logfmt"; - rev = "b84e30acd515"; - sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "v1.0.1"; - sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; - }; - } - { - goPackagePath = "github.com/modern-go/concurrent"; - fetch = { - type = "git"; - url = "https://github.com/modern-go/concurrent"; - rev = "bacd9c7ef1dd"; - sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs"; - }; - } - { - goPackagePath = "github.com/modern-go/reflect2"; - fetch = { - type = "git"; - url = "https://github.com/modern-go/reflect2"; - rev = "v1.0.1"; - sha256 = "06a3sablw53n1dqqbr2f53jyksbxdmmk8axaas4yvnhyfi55k4lf"; - }; - } - { - goPackagePath = "github.com/mwitkow/go-conntrack"; - fetch = { - type = "git"; - url = "https://github.com/mwitkow/go-conntrack"; - rev = "cc309e4a2223"; - sha256 = "0nbrnpk7bkmqg9mzwsxlm0y8m7s9qd9phr1q30qlx2qmdmz7c1mf"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "v0.8.0"; - sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "v1.0.0"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "v1.0.0"; - sha256 = "1f03ndyi3jq7zdxinnvzimz3s4z2374r6dikkc8i42xzb6d1bli6"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "fd36f4220a90"; - sha256 = "1bs5d72k361llflgl94c22n0w53j30rsfh84smgk8mbjbcmjsaa5"; - }; - } - { - goPackagePath = "github.com/prometheus/common"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/common"; - rev = "v0.4.1"; - sha256 = "0sf4sjdckblz1hqdfvripk3zyp8xq89w7q75kbsyg4c078af896s"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "v0.0.2"; - sha256 = "0s7pvs7fgnfpmym3cd0k219av321h9sf3yvdlnn3qy0ps280lg7k"; - }; - } - { - goPackagePath = "github.com/sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/sirupsen/logrus"; - rev = "v1.2.0"; - sha256 = "0r6334x2bls8ddznvzaldx4g88msjjns4mlks95rqrrg7h0ijigg"; - }; - } - { - goPackagePath = "github.com/stretchr/objx"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/objx"; - rev = "v0.1.1"; - sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "v1.3.0"; - sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "0709b304e793"; - sha256 = "0i05s09y5pavmfh71fgih7syxg58x7a4krgd8am6d3mnahnmab5c"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "adae6a3d119a"; - sha256 = "1fx860zsgzqk28j7lmp96qsfrgb0kzbfjvr294hywswcbwdwkb01"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "37e7f081c4d4"; - sha256 = "1bb0mw6ckb1k7z8v3iil2qlqwfj408fvvp8m1cik2b46p7snyjhm"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "5ac8a444bdc5"; - sha256 = "00zdrighflwc4iyizsag184nvl1cbkk02v73kpl5miprdrvzqlr4"; - }; - } - { - goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/alecthomas/kingpin.v2"; - rev = "v2.2.6"; - sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; - }; - } - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "20d25e280405"; - sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.1"; - sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; - }; - } -] diff --git a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix index 52620478339..1b4ffd61ec7 100644 --- a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "wireguard-exporter"; - version = "3.0.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "MindFlavor"; repo = "prometheus_wireguard_exporter"; rev = version; - sha256 = "1vgwsg81xcxh7pcdc667mfviwwpzsm4lpllykf78vfahi9qmwffn"; + sha256 = "0wfv54ny557mjajjdf0lyq5sbf9m7y50ggm7s2v30c639i0swyrc"; }; cargoSha256 = "06s9194lvwd7lynxnsrjfbjfj87ngvjbqjhx3idf7d1w9mgi4ysw"; diff --git a/pkgs/servers/monitoring/zabbix/proxy.nix b/pkgs/servers/monitoring/zabbix/proxy.nix index 2062dc6659f..48b72dc0590 100644 --- a/pkgs/servers/monitoring/zabbix/proxy.nix +++ b/pkgs/servers/monitoring/zabbix/proxy.nix @@ -63,7 +63,10 @@ in mkdir -p $out/share/zabbix/database/ '' + optionalString sqliteSupport '' mkdir -p $out/share/zabbix/database/sqlite3 - cp -prvd database/sqlite3/*.sql $out/share/zabbix/database/sqlite3/ + cp -prvd database/sqlite3/schema.sql $out/share/zabbix/database/sqlite3/ + '' + optionalString mysqlSupport '' + mkdir -p $out/share/zabbix/database/mysql + cp -prvd database/mysql/schema.sql $out/share/zabbix/database/mysql/ '' + optionalString postgresqlSupport '' mkdir -p $out/share/zabbix/database/postgresql cp -prvd database/postgresql/schema.sql $out/share/zabbix/database/postgresql/ diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix index 7b6b5d8fccc..a1799839b64 100644 --- a/pkgs/servers/monitoring/zabbix/versions.nix +++ b/pkgs/servers/monitoring/zabbix/versions.nix @@ -1,12 +1,12 @@ generic: { v42 = generic { - version = "4.2.3"; - sha256 = "0865c1a9vcgg4syhp5133rw9v1h65lp0g1y2f758jb9x9ybrr01s"; + version = "4.2.5"; + sha256 = "135bfafydmd66q97za84micymgf38s9zydp6jssrf7azik699fjd"; }; v40 = generic { - version = "4.0.9"; - sha256 = "1lc4wx3cing5w2qa18yb6232qd70hrfjq7jmnx4ip3nawnswj2xa"; + version = "4.0.11"; + sha256 = "02c4c82vbc27v09rci7flvwvjyb5sx0mknw0fz5i8bb23k1jbbxh"; }; v30 = generic { diff --git a/pkgs/servers/mqtt/mosquitto/default.nix b/pkgs/servers/mqtt/mosquitto/default.nix index 04daa2f4a85..06cef9cefab 100644 --- a/pkgs/servers/mqtt/mosquitto/default.nix +++ b/pkgs/servers/mqtt/mosquitto/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "mosquitto-${version}"; - version = "1.6.3"; + version = "1.6.4"; src = fetchFromGitHub { owner = "eclipse"; repo = "mosquitto"; rev = "v${version}"; - sha256 = "1xvfcqi6pa5pdnqd88gz9qx6kl2q47xp7l3q5wwgj0l9y9mlxp99"; + sha256 = "1kr1dgc4nzhyg3rzymbv4rka3rpb30rwsy6binb7apnw3n3ff58l"; }; postPatch = '' diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix index 12684eab551..11695d753e2 100644 --- a/pkgs/servers/nosql/arangodb/default.nix +++ b/pkgs/servers/nosql/arangodb/default.nix @@ -1,39 +1,60 @@ -{ stdenv, fetchFromGitHub -, openssl, zlib, readline, cmake, python }: +{ stdenv, lib, fetchFromGitHub, openssl, zlib, cmake, python2, perl, snappy, lzo, which }: let -in stdenv.mkDerivation rec { - version = "3.3.19"; - name = "arangodb-${version}"; - - src = fetchFromGitHub { - repo = "arangodb"; - owner = "arangodb"; - rev = "v${version}"; - sha256 = "1qg4lqnn5x0xsmkq41mjj301mfh76r8ys1rkzhinxlq30jld3155"; - }; - - buildInputs = [ - openssl zlib readline python - ]; - - nativeBuildInputs = [ cmake ]; - - postPatch = '' - sed -ie 's!/bin/echo!echo!' 3rdParty/V8/v*/gypfiles/*.gypi - ''; - - configureFlagsArray = [ "--with-openssl-lib=${openssl.out}/lib" ]; - - NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow"; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - homepage = https://github.com/arangodb/arangodb; - description = "A native multi-model database with flexible data models for documents, graphs, and key-values"; - license = licenses.asl20; - platforms = platforms.linux; - maintainers = [ maintainers.flosse ]; + common = { version, sha256 }: stdenv.mkDerivation { + pname = "arangodb"; + inherit version; + + src = fetchFromGitHub { + repo = "arangodb"; + owner = "arangodb"; + rev = "v${version}"; + inherit sha256; + }; + + nativeBuildInputs = [ cmake python2 perl which ]; + buildInputs = [ openssl zlib snappy lzo ]; + + # prevent failing with "cmake-3.13.4/nix-support/setup-hook: line 10: ./3rdParty/rocksdb/RocksDBConfig.cmake.in: No such file or directory" + dontFixCmake = lib.versionAtLeast version "3.5"; + NIX_CFLAGS_COMPILE = lib.optionals (lib.versionAtLeast version "3.5") [ "-Wno-error" ]; + preConfigure = lib.optionalString (lib.versionAtLeast version "3.5") "patchShebangs utils"; + + postPatch = '' + sed -ie 's!/bin/echo!echo!' 3rdParty/V8/v*/gypfiles/*.gypi + + # with nixpkgs, it has no sense to check for a version update + substituteInPlace js/client/client.js --replace "require('@arangodb').checkAvailableVersions();" "" + substituteInPlace js/server/server.js --replace "require('@arangodb').checkAvailableVersions();" "" + ''; + + cmakeFlags = [ + # do not set GCC's -march=xxx based on builder's /proc/cpuinfo + "-DUSE_OPTIMIZE_FOR_ARCHITECTURE=OFF" + # also avoid using builder's /proc/cpuinfo + ] ++ + { "westmere" = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; + "sandybridge" = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; + "ivybridge" = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; + "haswell" = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; + "broadwell" = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; + "skylake" = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; + "skylake-avx512" = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; + }.${stdenv.hostPlatform.platform.gcc.arch or ""} or [ "-DHAVE_SSE42=OFF" "-DASM_OPTIMIZATIONS=OFF" ]; + + enableParallelBuilding = true; + + meta = with lib; { + homepage = https://www.arangodb.com; + description = "A native multi-model database with flexible data models for documents, graphs, and key-values"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = [ maintainers.flosse ]; + }; }; +in { + arangodb_3_2 = common { version = "3.2.18"; sha256 = "05mfrx1g6dh1bzzqs23nvk0rg3v8y2dhdam4lym55pzlhqa7lf0x"; }; + arangodb_3_3 = common { version = "3.3.23.1"; sha256 = "0bnbiispids7jcgrgcmanf9jqgvk0vaflrvgalz587jwr2zf21k8"; }; + arangodb_3_4 = common { version = "3.4.7"; sha256 = "1wr2xvi5lnl6f2ryyxdwn4wnfiaz0rrf58ja1k19m7b6w3264iim"; }; + arangodb_3_5 = common { version = "3.5.0-rc.7"; sha256 = "1sdmbmyml9d3ia3706bv5901qqmh4sxk7js5b9hyfjqpcib10d1k"; }; } diff --git a/pkgs/servers/nosql/cassandra/2.2.nix b/pkgs/servers/nosql/cassandra/2.2.nix index 88c361e6a91..f9966b1ccd5 100644 --- a/pkgs/servers/nosql/cassandra/2.2.nix +++ b/pkgs/servers/nosql/cassandra/2.2.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "2.2.13"; - sha256 = "19jryhjkh5jsgp6jlz2v28vwm5dks8i7mshsv3s2fpnl6147paaq"; + version = "2.2.14"; + sha256 = "1b2x3q1ach44qg07sh8wr7d8a10n36w5522drd3p35djbiwa3d9q"; }) diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix index 25dfa5f47bd..9b173e538d3 100644 --- a/pkgs/servers/nosql/neo4j/default.nix +++ b/pkgs/servers/nosql/neo4j/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "neo4j-${version}"; - version = "3.5.6"; + version = "3.5.8"; src = fetchurl { url = "https://neo4j.com/artifact.php?name=neo4j-community-${version}-unix.tar.gz"; - sha256 = "0ajkz13qsjxjflh2dlyq8w1fiacv5gakf6n98xcvj9yfcm2j4dpm"; + sha256 = "0kj92vljxdhk9pf6gr9cvd2a2ilc4myp5djjkrj3gm37f074swgg"; }; buildInputs = [ makeWrapper jre8 which gawk ]; diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index 84d4d04cac7..94e8519fcc9 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -8,14 +8,14 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.16.3.1402-22929c8a2"; + version = "1.16.4.1469-6d5612c2f"; pname = "plexmediaserver"; name = "${pname}-${version}"; # Fetch the source src = fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/redhat/plexmediaserver-${version}.x86_64.rpm"; - sha256 = "0mb5y777mcyn8lv1afyi0xx0afyzjm67ccbbkyhk2j817k9diyg5"; + sha256 = "16ifgqsxgpqyd1m0xmwrrv4cic1yccklv1jlv7fhq8wc6vz9l6lx"; }; outputs = [ "out" "basedb" ]; diff --git a/pkgs/servers/scylladb/default.nix b/pkgs/servers/scylladb/default.nix new file mode 100644 index 00000000000..1a168608bec --- /dev/null +++ b/pkgs/servers/scylladb/default.nix @@ -0,0 +1,96 @@ +{ + stdenv, + fetchgit, + python3Packages, + pkgconfig, + gcc8Stdenv, + boost, + git, + systemd, + gnutls, + cmake, + makeWrapper, + ninja, + ragel, + hwloc, + jsoncpp, + antlr3, + numactl, + protobuf, + cryptopp, + libxfs, + libyamlcpp, + libsystemtap, + lksctp-tools, + lz4, + libxml2, + zlib, + libpciaccess, + snappy, + libtool, + thrift +}: +gcc8Stdenv.mkDerivation rec { + pname = "scylladb"; + version = "3.0.5"; + + src = fetchgit { + url = "https://github.com/scylladb/scylla.git"; + rev = "403f66ecad6bc773712c69c4a80ebd172eb48b13"; + sha256 = "14mg0kzpkrxvwqyiy19ndy4rsc7s5gnv2gwd3xdwm1lx1ln8ywsi"; + fetchSubmodules = true; + }; + + patches = [ ./seastar-configure-script-paths.patch ]; + + nativeBuildInputs = [ + pkgconfig + cmake + makeWrapper + ninja + ]; + + buildInputs = [ + antlr3 + python3Packages.pyparsing + boost + git + systemd + gnutls + ragel + jsoncpp + numactl + protobuf + cryptopp + libxfs + libyamlcpp + libsystemtap + lksctp-tools + lz4 + libxml2 + zlib + libpciaccess + snappy + libtool + thrift + ]; + + postPatch = '' + patchShebangs ./configure.py + ''; + + configurePhase = '' + ./configure.py --mode=release + ''; + installPhase = '' + mkdir $out + cp -r * $out/ + ''; + meta = with stdenv.lib; { + description = "NoSQL data store using the seastar framework, compatible with Apache Cassandra"; + homepage = "https://scylladb.com"; + license = licenses.agpl3; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.farlion ]; + }; +} diff --git a/pkgs/servers/scylladb/seastar-configure-script-paths.patch b/pkgs/servers/scylladb/seastar-configure-script-paths.patch new file mode 100644 index 00000000000..19c5c816129 --- /dev/null +++ b/pkgs/servers/scylladb/seastar-configure-script-paths.patch @@ -0,0 +1,13 @@ +diff --git a/seastar/configure.py b/seastar/configure.py +index 62d9c204..f6520635 100755 +--- a/seastar/configure.py ++++ b/seastar/configure.py +@@ -924,7 +924,7 @@ with open(buildfile, 'w') as f: + command = ragel -G2 -o $out $in && sed -i -e '1h;2,$$H;$$!d;g' -re 's/static const char _nfa[^;]*;//g' $out + description = RAGEL $out + rule gen +- command = /bin/echo -e $text > $out ++ command = echo -e $text > $out + description = GEN $out + rule swagger + command = json/json2code.py -f $in -o $out diff --git a/pkgs/servers/shairport-sync/default.nix b/pkgs/servers/shairport-sync/default.nix index cb5d79bdfcc..639fa322525 100644 --- a/pkgs/servers/shairport-sync/default.nix +++ b/pkgs/servers/shairport-sync/default.nix @@ -2,11 +2,11 @@ , libdaemon, popt, pkgconfig, libconfig, libpulseaudio, soxr }: stdenv.mkDerivation rec { - version = "3.3.1"; + version = "3.3.2"; name = "shairport-sync-${version}"; src = fetchFromGitHub { - sha256 = "1i28d6ml07f5f9ik831jagicjk84xdla62hs88bkwajbykzjmqrk"; + sha256 = "14f09sj2rxmixd5yjmwp82j49rxn1fvcxkvh7qjif893xgk98a3w"; rev = version; repo = "shairport-sync"; owner = "mikebrady"; diff --git a/pkgs/servers/sql/mysql/5.7.x.nix b/pkgs/servers/sql/mysql/5.7.x.nix index 249a5af5d48..6636c099e83 100644 --- a/pkgs/servers/sql/mysql/5.7.x.nix +++ b/pkgs/servers/sql/mysql/5.7.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, bison +{ stdenv, fetchurl, cmake, bison, pkgconfig , boost, libedit, libevent, lz4, ncurses, openssl, protobuf, readline, zlib, perl , cctools, CoreServices, developer_cmds }: @@ -6,12 +6,12 @@ let self = stdenv.mkDerivation rec { - name = "mysql-${version}"; - version = "5.7.25"; + pname = "mysql"; + version = "5.7.27"; src = fetchurl { - url = "mirror://mysql/MySQL-5.7/${name}.tar.gz"; - sha256 = "0gvjcdnba7nf2dx3fbqk1qyg49zclfvaihb78l8h6qc08di1qxak"; + url = "mirror://mysql/MySQL-5.7/${pname}-${version}.tar.gz"; + sha256 = "1fhv16zr46pxm1j8vb8x8mh3nwzglg01arz8gnazbmjqldr5idpq"; }; preConfigure = stdenv.lib.optional stdenv.isDarwin '' @@ -19,13 +19,11 @@ self = stdenv.mkDerivation rec { export PATH=$PATH:$TMPDIR ''; - nativeBuildInputs = [ cmake bison ]; + nativeBuildInputs = [ cmake bison pkgconfig ]; buildInputs = [ boost libedit libevent lz4 ncurses openssl protobuf readline zlib ] ++ stdenv.lib.optionals stdenv.isDarwin [ perl cctools CoreServices developer_cmds ]; - enableParallelBuilding = true; - outputs = [ "out" "static" ]; cmakeFlags = [ @@ -76,7 +74,7 @@ self = stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://www.mysql.com/; + homepage = "https://www.mysql.com/"; description = "The world's most popular open source database"; platforms = platforms.unix; license = with licenses; [ diff --git a/pkgs/servers/sql/mysql/8.0.x.nix b/pkgs/servers/sql/mysql/8.0.x.nix new file mode 100644 index 00000000000..8785e052224 --- /dev/null +++ b/pkgs/servers/sql/mysql/8.0.x.nix @@ -0,0 +1,73 @@ +{ lib, stdenv, fetchurl, bison, cmake, pkgconfig +, boost, icu, libedit, libevent, lz4, ncurses, openssl, protobuf, re2, readline, zlib +, numactl, perl, cctools, CoreServices, developer_cmds +}: + +let +self = stdenv.mkDerivation rec { + name = "mysql-8.0.17"; + + src = fetchurl { + url = "https://dev.mysql.com/get/Downloads/MySQL-${self.mysqlVersion}/${name}.tar.gz"; + sha256 = "1mjrlxn8vigi69r0r674j2dibdnkaar01ji5965gsyx7k60z7qy6"; + }; + + patches = [ + ./abi-check.patch + ./libutils.patch + ]; + + nativeBuildInputs = [ bison cmake pkgconfig ]; + + buildInputs = [ + boost icu libedit libevent lz4 ncurses openssl protobuf re2 readline zlib + ] ++ lib.optionals stdenv.isLinux [ + numactl + ] ++ lib.optionals stdenv.isDarwin [ + cctools CoreServices developer_cmds + ]; + + outputs = [ "out" "static" ]; + + cmakeFlags = [ + "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.12" # For std::shared_timed_mutex. + "-DCMAKE_SKIP_BUILD_RPATH=OFF" # To run libmysql/libmysql_api_test during build. + "-DFORCE_UNSUPPORTED_COMPILER=1" # To configure on Darwin. + "-DWITH_ROUTER=OFF" # It may be packaged separately. + "-DWITH_SYSTEM_LIBS=ON" + "-DWITH_UNIT_TESTS=OFF" + "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock" + "-DMYSQL_DATADIR=/var/lib/mysql" + "-DINSTALL_INFODIR=share/mysql/docs" + "-DINSTALL_MANDIR=share/man" + "-DINSTALL_PLUGINDIR=lib/mysql/plugin" + "-DINSTALL_INCLUDEDIR=include/mysql" + "-DINSTALL_DOCREADMEDIR=share/mysql" + "-DINSTALL_SUPPORTFILESDIR=share/mysql" + "-DINSTALL_MYSQLSHAREDIR=share/mysql" + "-DINSTALL_MYSQLTESTDIR=" + "-DINSTALL_DOCDIR=share/mysql/docs" + "-DINSTALL_SHAREDIR=share/mysql" + ]; + + postInstall = '' + moveToOutput "lib/*.a" $static + so=${stdenv.hostPlatform.extensions.sharedLibrary} + ln -s libmysqlclient$so $out/lib/libmysqlclient_r$so + ''; + + passthru = { + client = self; + connector-c = self; + server = self; + mysqlVersion = "8.0"; + }; + + meta = with lib; { + homepage = "https://www.mysql.com/"; + description = "The world's most popular open source database"; + license = licenses.gpl2; + maintainers = with maintainers; [ orivej ]; + platforms = platforms.unix; + }; +}; in self diff --git a/pkgs/servers/sql/mysql/abi-check.patch b/pkgs/servers/sql/mysql/abi-check.patch new file mode 100644 index 00000000000..de45d9c3ea2 --- /dev/null +++ b/pkgs/servers/sql/mysql/abi-check.patch @@ -0,0 +1,18 @@ +MySQL ABI check assumes that with -nostdinc any standard #include terminates +preprocessing, but we do not provide that: +https://github.com/NixOS/nixpkgs/issues/44530 + +"#error" does not terminate preprocessing, so we #include a non-existent file instead. + +--- a/cmake/do_abi_check.cmake ++++ b/cmake/do_abi_check.cmake +@@ -68,1 +68,1 @@ FOREACH(file ${ABI_HEADERS}) +- -E -nostdinc -dI -DMYSQL_ABI_CHECK -I${SOURCE_DIR}/include ++ -E -nostdinc -dI -DMYSQL_ABI_CHECK -I${SOURCE_DIR}/include/nostdinc -I${SOURCE_DIR}/include +@@ -74,1 +74,1 @@ FOREACH(file ${ABI_HEADERS}) +- COMMAND sed -e "/^# /d" ++ COMMAND sed -e "/^# /d" -e "/^#include <-nostdinc>$/d" +--- /dev/null ++++ b/include/nostdinc/stdint.h +@@ -0,0 +1,1 @@ ++#include <-nostdinc> diff --git a/pkgs/servers/sql/mysql/libutils.patch b/pkgs/servers/sql/mysql/libutils.patch new file mode 100644 index 00000000000..fa1a35e12f2 --- /dev/null +++ b/pkgs/servers/sql/mysql/libutils.patch @@ -0,0 +1,5 @@ +--- a/cmake/libutils.cmake ++++ b/cmake/libutils.cmake +@@ -345 +345 @@ MACRO(MERGE_CONVENIENCE_LIBRARIES) +- COMMAND /usr/bin/libtool -static -o $<TARGET_FILE:${TARGET}> ++ COMMAND libtool -static -o $<TARGET_FILE:${TARGET}> diff --git a/pkgs/servers/sql/pgbouncer/default.nix b/pkgs/servers/sql/pgbouncer/default.nix index 3b4a0543e18..dcaa8d5e1fa 100644 --- a/pkgs/servers/sql/pgbouncer/default.nix +++ b/pkgs/servers/sql/pgbouncer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, libevent }: +{ stdenv, fetchurl, openssl, libevent, c-ares, pkg-config }: stdenv.mkDerivation rec { name = "pgbouncer-${version}"; @@ -9,12 +9,12 @@ stdenv.mkDerivation rec { sha256 = "1m8vsxyna5grs5p0vnxf3fxxnkk9aqjf3qmr2bbkpkhlzr11986q"; }; - buildInputs = [ libevent openssl ]; + buildInputs = [ libevent openssl c-ares pkg-config ]; meta = with stdenv.lib; { homepage = https://pgbouncer.github.io; description = "Lightweight connection pooler for PostgreSQL"; license = licenses.isc; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/pkgs/servers/sql/pgpool/default.nix b/pkgs/servers/sql/pgpool/default.nix index 3fedf3fa804..3db62aa491c 100644 --- a/pkgs/servers/sql/pgpool/default.nix +++ b/pkgs/servers/sql/pgpool/default.nix @@ -1,15 +1,17 @@ { stdenv, fetchurl, postgresql, openssl, pam ? null, libmemcached ? null }: stdenv.mkDerivation rec { - name = "pgpool-II-3.4.14"; + pname = "pgpool-II"; + version = "4.0.5"; + name = "${pname}-${version}"; src = fetchurl { name = "${name}.tar.gz"; url = "http://www.pgpool.net/download.php?f=${name}.tar.gz"; - sha256 = "1paak83f4lv48xckmf2znryrvhmdz86w4v97mcw2gxm50hcl74sw"; + sha256 = "0v2g2ksikn10kxsa8i47gv0kbklrsscvlddza3caf522q1k0fic4"; }; - patches = [ ./pgpool-II-3.4.14-glibc-2.26.patch ]; + patches = [ ./pgpool.patch ]; buildInputs = [ postgresql openssl pam libmemcached ]; diff --git a/pkgs/servers/sql/pgpool/pgpool-II-3.4.14-glibc-2.26.patch b/pkgs/servers/sql/pgpool/pgpool-II-3.4.14-glibc-2.26.patch deleted file mode 100644 index 6efffff0c6d..00000000000 --- a/pkgs/servers/sql/pgpool/pgpool-II-3.4.14-glibc-2.26.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/watchdog/wd_lifecheck.c b/src/watchdog/wd_lifecheck.c -index 1e72307..5cf68a3 100644 ---- a/src/watchdog/wd_lifecheck.c -+++ b/src/watchdog/wd_lifecheck.c -@@ -26,6 +26,7 @@ - #include <ctype.h> - #include <time.h> - #include <string.h> -+#include <stdint.h> - #include <stdlib.h> - #include <unistd.h> - #include <netdb.h> diff --git a/pkgs/servers/sql/pgpool/pgpool.patch b/pkgs/servers/sql/pgpool/pgpool.patch new file mode 100644 index 00000000000..7c9d92a88bf --- /dev/null +++ b/pkgs/servers/sql/pgpool/pgpool.patch @@ -0,0 +1,23 @@ +diff --git a/src/main/main.c b/src/main/main.c +index eec3c3e4..4169112b 100644 +--- a/src/main/main.c ++++ b/src/main/main.c +@@ -337,10 +337,14 @@ main(int argc, char **argv) + char dirnamebuf[POOLMAXPATHLEN + 1]; + char *dirp; + +- strlcpy(dirnamebuf, conf_file, sizeof(dirnamebuf)); +- dirp = dirname(dirnamebuf); +- snprintf(pool_passwd, sizeof(pool_passwd), "%s/%s", +- dirp, pool_config->pool_passwd); ++ if (pool_config->pool_passwd[0] != '/') { ++ strlcpy(dirnamebuf, conf_file, sizeof(dirnamebuf)); ++ dirp = dirname(dirnamebuf); ++ snprintf(pool_passwd, sizeof(pool_passwd), "%s/%s", ++ dirp, pool_config->pool_passwd); ++ } else ++ strlcpy(pool_passwd, pool_config->pool_passwd, ++ sizeof(pool_passwd)); + pool_init_pool_passwd(pool_passwd, POOL_PASSWD_R); + } + diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index ba4fd8e3d38..711ad35bcc1 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -168,41 +168,41 @@ let in self: { postgresql_9_4 = self.callPackage generic { - version = "9.4.23"; + version = "9.4.24"; psqlSchema = "9.4"; - sha256 = "16qx4gfq7i2nnxm0i3zxpb3z1mmzx05a3fsh95414ay8n049q00d"; + sha256 = "0acl1wmah3r1a0qjjmpc256glccrjnzq4pkwklx4d9s6vmkks9aj"; this = self.postgresql_9_4; inherit self; }; postgresql_9_5 = self.callPackage generic { - version = "9.5.18"; + version = "9.5.19"; psqlSchema = "9.5"; - sha256 = "1pgkz794wmp4f40843sbin49k5lgl59jvl6nazvdbb6mgr441jfz"; + sha256 = "1cqvbsyfs9048wbvdv0vhhaksjyjqv2vvh6ij4vqmjibc4kal34n"; this = self.postgresql_9_5; inherit self; }; postgresql_9_6 = self.callPackage generic { - version = "9.6.14"; + version = "9.6.15"; psqlSchema = "9.6"; - sha256 = "08hsqczy1ixkjyf2vr3s9x69agfz9yr8lh31fir4z0dfr5jw421z"; + sha256 = "02hp69h2p02asfblkaahblzdz2zmawd2r11h6237y5j7yadgxn9w"; this = self.postgresql_9_6; inherit self; }; postgresql_10 = self.callPackage generic { - version = "10.9"; + version = "10.10"; psqlSchema = "10.0"; # should be 10, but changing it is invasive - sha256 = "0m0gbf7nwgag6a1z5f9xszwzgf2xhx0ncakyxwxlzs87n1zk32wm"; + sha256 = "0lzj46dwd9cw94gnqm36bxd7jlhfdyqjrfzr3c4xd3prfn2rnkxd"; this = self.postgresql_10; inherit self; }; postgresql_11 = self.callPackage generic { - version = "11.4"; + version = "11.5"; psqlSchema = "11.1"; # should be 11, but changing it is invasive - sha256 = "12ycjlqncijgmd5z078ybwda8ilas96lc7nxxmdq140mzpgjv002"; + sha256 = "106ikalvrilihlvhq7xj7snq98hgbgq6qsgjrd252wgw1c327pvz"; this = self.postgresql_11; inherit self; }; diff --git a/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix b/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix index f2e814543db..2866c94d3d7 100644 --- a/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix +++ b/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; installPhase = '' - mkdir -p $out/{lib,share/extension} + mkdir -p $out/{lib,share/postgresql/extension} cp *.so $out/lib cp *.sql $out/share/postgresql/extension diff --git a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix index f37e347e89a..ae72b164b84 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix @@ -1,8 +1,5 @@ { stdenv, fetchFromGitHub, postgresql, openssl, zlib, readline }: -if stdenv.lib.versionOlder postgresql.version "10" -then throw "pg_auto_failover not supported for PostgreSQL ${postgresql.version}" -else stdenv.mkDerivation rec { pname = "pg_auto_failover"; version = "1.0.3"; @@ -29,5 +26,6 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.marsam ]; platforms = postgresql.meta.platforms; license = licenses.postgresql; + broken = versionOlder postgresql.version "10"; }; } diff --git a/pkgs/servers/sql/postgresql/ext/pg_bigm.nix b/pkgs/servers/sql/postgresql/ext/pg_bigm.nix index a8e5a54bc29..055d1de3c78 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_bigm.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_bigm.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin # For buildEnv to setup proper symlinks. See #22653 - mkdir -p $out/{lib,share/extension} + mkdir -p $out/{lib,share/postgresql/extension} cp *.so $out/lib cp *.sql $out/share/postgresql/extension diff --git a/pkgs/servers/sql/postgresql/ext/pg_cron.nix b/pkgs/servers/sql/postgresql/ext/pg_cron.nix index d2d2a00ffd5..15d67017189 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_cron.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_cron.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; installPhase = '' - mkdir -p $out/{lib,share/extension} + mkdir -p $out/{lib,share/postgresql/extension} cp *.so $out/lib cp *.sql $out/share/postgresql/extension diff --git a/pkgs/servers/sql/postgresql/ext/pg_hll.nix b/pkgs/servers/sql/postgresql/ext/pg_hll.nix index bccec1107b9..040ff8b80fe 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_hll.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_hll.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; installPhase = '' - mkdir -p $out/{lib,share/extension} + mkdir -p $out/{lib,share/postgresql/extension} cp *.so $out/lib cp *.sql $out/share/postgresql/extension diff --git a/pkgs/servers/sql/postgresql/ext/pg_partman.nix b/pkgs/servers/sql/postgresql/ext/pg_partman.nix index 38e86fbfd8d..5fbe757598c 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_partman.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_partman.nix @@ -14,8 +14,7 @@ stdenv.mkDerivation rec { }; installPhase = '' - mkdir -p $out/bin # For buildEnv to setup proper symlinks. See #22653 - mkdir -p $out/{lib,share/extension} + mkdir -p $out/{lib,share/postgresql/extension} cp src/*.so $out/lib cp updates/* $out/share/postgresql/extension diff --git a/pkgs/servers/sql/postgresql/ext/pg_topn.nix b/pkgs/servers/sql/postgresql/ext/pg_topn.nix index 1a5aa91ae6e..b9015be781e 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_topn.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_topn.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; installPhase = '' - mkdir -p $out/{lib,share/extension} + mkdir -p $out/{lib,share/postgresql/extension} cp *.so $out/lib cp *.sql $out/share/postgresql/extension diff --git a/pkgs/servers/sql/postgresql/ext/pipelinedb.nix b/pkgs/servers/sql/postgresql/ext/pipelinedb.nix index 01dcd54d95e..4a80e5cafcb 100644 --- a/pkgs/servers/sql/postgresql/ext/pipelinedb.nix +++ b/pkgs/servers/sql/postgresql/ext/pipelinedb.nix @@ -1,8 +1,5 @@ { stdenv, fetchFromGitHub, postgresql, zeromq, openssl }: -if stdenv.lib.versionOlder postgresql.version "10" -then throw "PipelineDB not supported for PostgreSQL ${postgresql.version}" -else stdenv.mkDerivation rec { pname = "pipelinedb"; version = "1.0.0-13"; @@ -35,5 +32,6 @@ stdenv.mkDerivation rec { license = licenses.asl20; platforms = postgresql.meta.platforms; maintainers = [ maintainers.marsam ]; + broken = versionOlder postgresql.version "10"; }; } diff --git a/pkgs/servers/sql/postgresql/ext/tds_fdw.nix b/pkgs/servers/sql/postgresql/ext/tds_fdw.nix index 3a4e0cba602..590d46b430e 100644 --- a/pkgs/servers/sql/postgresql/ext/tds_fdw.nix +++ b/pkgs/servers/sql/postgresql/ext/tds_fdw.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.steve-chavez ]; platforms = postgresql.meta.platforms; license = licenses.postgresql; + broken = versionAtLeast postgresql.version "11.0"; }; } diff --git a/pkgs/servers/sql/postgresql/ext/temporal_tables.nix b/pkgs/servers/sql/postgresql/ext/temporal_tables.nix index ac0299208f8..7a4b1ed88fc 100644 --- a/pkgs/servers/sql/postgresql/ext/temporal_tables.nix +++ b/pkgs/servers/sql/postgresql/ext/temporal_tables.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; installPhase = '' - mkdir -p $out/{bin,lib,share/extension} + mkdir -p $out/{lib,share/postgresql/extension} cp *.so $out/lib cp *.sql $out/share/postgresql/extension diff --git a/pkgs/servers/tautulli/default.nix b/pkgs/servers/tautulli/default.nix index b19b4d13893..d074ddf4d72 100644 --- a/pkgs/servers/tautulli/default.nix +++ b/pkgs/servers/tautulli/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub, python }: stdenv.mkDerivation rec { - version = "2.1.32"; + version = "2.1.33"; pname = "Tautulli"; name = "${pname}-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "Tautulli"; repo = pname; rev = "v${version}"; - sha256 = "05z6l3qs2m72c1hcl3qd1lm17hsmyqk48f8dcsvrxa5hibmf84j4"; + sha256 = "1yj4akp10fxqndsbb59rjdw9by6rhmz24syyq6d4x5bg72an9n80"; }; buildPhase = ":"; diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index 40d08841eac..c9f0f2b84bb 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, pcre, libxslt, groff, ncurses, pkgconfig, readline, libedit -, python2, makeWrapper }: +, python2, python3, makeWrapper }: let - common = { version, sha256, extraBuildInputs ? [] }: + common = { version, sha256, python, extraNativeBuildInputs ? [] }: stdenv.mkDerivation rec { name = "varnish-${version}"; @@ -11,11 +11,12 @@ let inherit sha256; }; - nativeBuildInputs = [ pkgconfig ]; + passthru.python = python; + + nativeBuildInputs = with python.pkgs; [ pkgconfig docutils ] ++ extraNativeBuildInputs; buildInputs = [ - pcre libxslt groff ncurses readline python2 libedit - python2.pkgs.docutils makeWrapper - ] ++ extraBuildInputs; + pcre libxslt groff ncurses readline libedit makeWrapper python + ]; buildFlags = "localstatedir=/var/spool"; @@ -41,14 +42,17 @@ in varnish4 = common { version = "4.1.10"; sha256 = "08kwx0il6cqxsx3897042plh1yxjaanbaqjbspfl0xgvyvxk6j1n"; + python = python2; }; varnish5 = common { version = "5.2.1"; sha256 = "1cqlj12m426c1lak1hr1fx5zcfsjjvka3hfirz47hvy1g2fjqidq"; + python = python2; }; varnish6 = common { - version = "6.1.1"; - sha256 = "0gf9hzzrr1lndbbqi8cwlfasi7l517cy3nbgna88i78lm247rvp0"; - extraBuildInputs = [ python2.pkgs.sphinx ]; + version = "6.2.0"; + sha256 = "0lwfk2gq99c653h5f51fs3j37r0gh2pf0p4w5z986nm2mi9z6yn3"; + python = python3; + extraNativeBuildInputs = [ python3.pkgs.sphinx ]; }; } diff --git a/pkgs/servers/varnish/dynamic.nix b/pkgs/servers/varnish/dynamic.nix index 711bc1cf78f..b3e86387ee3 100644 --- a/pkgs/servers/varnish/dynamic.nix +++ b/pkgs/servers/varnish/dynamic.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, varnish, python, docutils }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, varnish, docutils }: stdenv.mkDerivation rec { version = "0.3"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { sha256 = "12a42lbv0vf6fn3qnvngw893kmbd006f8pgab4ir7irc8855xjgf"; }; - nativeBuildInputs = [ pkgconfig docutils autoreconfHook ]; - buildInputs = [ varnish python ]; + nativeBuildInputs = [ pkgconfig docutils autoreconfHook varnish.python ]; + buildInputs = [ varnish ]; postPatch = '' substituteInPlace Makefile.am --replace "''${LIBVARNISHAPI_DATAROOTDIR}/aclocal" "${varnish.dev}/share/aclocal" ''; diff --git a/pkgs/servers/varnish/modules.nix b/pkgs/servers/varnish/modules.nix index 7775221d163..16c74956db7 100644 --- a/pkgs/servers/varnish/modules.nix +++ b/pkgs/servers/varnish/modules.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, varnish, python, docutils, removeReferencesTo }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, varnish, docutils, removeReferencesTo }: stdenv.mkDerivation rec { version = "0.14.0"; @@ -11,8 +11,15 @@ stdenv.mkDerivation rec { sha256 = "17fkbr4i70qgdqsrx1x28ag20xkfyz1v3q3d3ywmv409aczqhm40"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook docutils removeReferencesTo ]; - buildInputs = [ varnish python ]; + nativeBuildInputs = [ + autoreconfHook + docutils + pkgconfig + removeReferencesTo + varnish.python # use same python version as varnish server + ]; + + buildInputs = [ varnish ]; postPatch = '' substituteInPlace bootstrap --replace "''${dataroot}/aclocal" "${varnish.dev}/share/aclocal" diff --git a/pkgs/servers/varnish/rtstatus.nix b/pkgs/servers/varnish/rtstatus.nix index 99c0bb17659..c27633a2d33 100644 --- a/pkgs/servers/varnish/rtstatus.nix +++ b/pkgs/servers/varnish/rtstatus.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, varnish, python, docutils }: +{ stdenv, fetchurl, pkgconfig, varnish, docutils }: stdenv.mkDerivation rec { version = "1.2.0"; @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0hll1aspgpv1daw5sdbn5w1d6birchxgapzb6zi1nhahjlimy4ly"; }; - nativeBuildInputs = [ pkgconfig docutils ]; - buildInputs = [ varnish python ]; + nativeBuildInputs = [ pkgconfig docutils varnish.python ]; + buildInputs = [ varnish ]; configureFlags = [ "VMOD_DIR=$(out)/lib/varnish/vmods" ]; meta = with stdenv.lib; { diff --git a/pkgs/servers/web-apps/shaarli/default.nix b/pkgs/servers/web-apps/shaarli/default.nix index ebca3eae450..64ae1dbbe1d 100644 --- a/pkgs/servers/web-apps/shaarli/default.nix +++ b/pkgs/servers/web-apps/shaarli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "shaarli-${version}"; - version = "0.10.4"; + version = "0.11.0"; src = fetchurl { url = "https://github.com/shaarli/Shaarli/releases/download/v${version}/shaarli-v${version}-full.tar.gz"; - sha256 = "00m41x3nlxcc8dspin61zx7lrv1hjzacjadm34afqrb21yxdp84f"; + sha256 = "1x3a2chagng749cv48zkvjvfwbggqskv6ckkbbmp4fx9qzy2c32k"; }; outputs = [ "out" "doc" ]; diff --git a/pkgs/servers/web-apps/shaarli/material-theme.nix b/pkgs/servers/web-apps/shaarli/material-theme.nix index 939976b0a26..5fd941e9467 100644 --- a/pkgs/servers/web-apps/shaarli/material-theme.nix +++ b/pkgs/servers/web-apps/shaarli/material-theme.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "shaarli-material-${version}"; - version = "0.9.5"; + version = "0.10.4"; src = fetchFromGitHub { owner = "kalvn"; repo = "Shaarli-Material"; rev = "v${version}"; - sha256 = "1bxw74ksvfv46995iwc7jhvl78hd84lcq3h9iyxvs8gpkhkapv55"; + sha256 = "161kf7linyl2l2d7y60v96xz3fwa572fqm1vbm58mjgkzkfndhrv"; }; patchPhase = '' diff --git a/pkgs/shells/powershell/default.nix b/pkgs/shells/powershell/default.nix index 8a5956161e0..a434ef7e4fb 100644 --- a/pkgs/shells/powershell/default.nix +++ b/pkgs/shells/powershell/default.nix @@ -4,8 +4,8 @@ let platformString = if stdenv.isDarwin then "osx" else if stdenv.isLinux then "linux" else throw "unsupported platform"; - platformSha = if stdenv.isDarwin then "0w4dvkbi9jbybq7kvcgdccv8byp4ahlah45w2z8fwq961h3qnhg1" - else if stdenv.isLinux then "19dagxqvw0fpsjm6vbimqbax3bkmdm6wwifkfaq3ylrk0a9wwsrm" + platformSha = if stdenv.isDarwin then "005ax54l7752lhrvlpsyn2yywr4zh58psc7sc1qv9p86d414pmkq" + else if stdenv.isLinux then "1b3n6d2xgvqybmh61smyr415sfaymiilixlvs04yxm6ajsbnsm82" else throw "unsupported platform"; platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH" else if stdenv.isLinux then "LD_LIBRARY_PATH" @@ -15,7 +15,7 @@ let platformString = if stdenv.isDarwin then "osx" in stdenv.mkDerivation rec { name = "powershell-${version}"; - version = "6.2.1"; + version = "6.2.2"; src = fetchzip { url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-${platformString}-x64.tar.gz"; diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index b74b2fc43f3..e9458520bb4 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, pcre }: +{ stdenv, fetchurl, ncurses, pcre, buildPackages }: let version = "5.7.1"; @@ -7,7 +7,6 @@ let url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.xz"; sha256 = "1d1r88n1gfdavx4zy3svl1gljrvzim17jb2r834hafg2a016flrh"; }; - in stdenv.mkDerivation { @@ -61,7 +60,11 @@ else fi fi EOF - $out/bin/zsh -c "zcompile $out/etc/zprofile" + ${if stdenv.hostPlatform == stdenv.buildPlatform then '' + $out/bin/zsh -c "zcompile $out/etc/zprofile" + '' else '' + ${stdenv.lib.getBin buildPackages.zsh}/bin/zsh -c "zcompile $out/etc/zprofile" + ''} mv $out/etc/zprofile $out/etc/zprofile_zwc_is_used ''; # XXX: patch zsh to take zwc if newer _or equal_ diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index fa92411cea6..6afe6d286ee 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2019-07-31"; + version = "2019-08-07"; name = "oh-my-zsh-${version}"; - rev = "6d2221e697ea4a2445202b1c32283610f84585ef"; + rev = "40fafe0f59371d1a9d83b83c614acfd1d740aabb"; src = fetchgit { inherit rev; url = "https://github.com/robbyrussell/oh-my-zsh"; - sha256 = "0yj2cymh2a74014ng7vyfh1b8qhbk14s0sbcj0426mykvilfd31b"; + sha256 = "0vk78dkrgbj51jvbpn337d7dnsb3p7cdj4bk92m6xqby5lmk4q01"; }; pathsToLink = [ "/share/oh-my-zsh" ]; diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index 89e2a7a8031..1a96d9b3acf 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -7,6 +7,7 @@ let # If we're in hydra, we can dispense with the more verbose error # messages and make problems easier to spot. inHydra = config.inHydra or false; + getName = attrs: attrs.name or ("${attrs.pname or "«name-missing»"}-${attrs.version or "«version-missing»"}"); # See discussion at https://github.com/NixOS/nixpkgs/pull/25304#issuecomment-298385426 # for why this defaults to false, but I (@copumpkin) want to default it to true soon. @@ -107,23 +108,23 @@ let You can install it anyway by whitelisting this package, using the following methods: - a) for `nixos-rebuild` you can add ‘${attrs.name or "«name-missing»"}’ to + a) for `nixos-rebuild` you can add ‘${getName attrs}’ to `nixpkgs.config.permittedInsecurePackages` in the configuration.nix, like so: { nixpkgs.config.permittedInsecurePackages = [ - "${attrs.name or "«name-missing»"}" + "${getName attrs}" ]; } b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add - ‘${attrs.name or "«name-missing»"}’ to `permittedInsecurePackages` in + ‘${getName attrs}’ to `permittedInsecurePackages` in ~/.config/nixpkgs/config.nix, like so: { permittedInsecurePackages = [ - "${attrs.name or "«name-missing»"}" + "${getName attrs}" ]; } @@ -134,9 +135,9 @@ let actualOutputs = attrs.outputs or [ "out" ]; missingOutputs = builtins.filter (output: ! builtins.elem output actualOutputs) expectedOutputs; in '' - The package ${attrs.name} has set meta.outputsToInstall to: ${builtins.concatStringsSep ", " expectedOutputs} + The package ${getName attrs} has set meta.outputsToInstall to: ${builtins.concatStringsSep ", " expectedOutputs} - however ${attrs.name} only has the outputs: ${builtins.concatStringsSep ", " actualOutputs} + however ${getName attrs} only has the outputs: ${builtins.concatStringsSep ", " actualOutputs} and is missing the following ouputs: @@ -146,9 +147,9 @@ let handleEvalIssue = { meta, attrs }: { reason , errormsg ? "" }: let msg = if inHydra - then "Failed to evaluate ${attrs.name or "«name-missing»"}: «${reason}»: ${errormsg}" + then "Failed to evaluate ${getName attrs}: «${reason}»: ${errormsg}" else '' - Package ‘${attrs.name or "«name-missing»"}’ in ${pos_str meta} ${errormsg}, refusing to evaluate. + Package ‘${getName attrs}’ in ${pos_str meta} ${errormsg}, refusing to evaluate. '' + (builtins.getAttr reason remediation) attrs; diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index be79e7626c5..a11b280b047 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -246,7 +246,7 @@ in rec { (/**/ if lib.isString cmakeFlags then [cmakeFlags] else if cmakeFlags == null then [] else cmakeFlags) - ++ lib.optional (stdenv.hostPlatform.uname.system != null) "-DCMAKE_SYSTEM_NAME=${stdenv.hostPlatform.uname.system}" + ++ [ "-DCMAKE_SYSTEM_NAME=${lib.findFirst lib.isString "Generic" [ stdenv.hostPlatform.uname.system ]}" ] ++ lib.optional (stdenv.hostPlatform.uname.processor != null) "-DCMAKE_SYSTEM_PROCESSOR=${stdenv.hostPlatform.uname.processor}" ++ lib.optional (stdenv.hostPlatform.uname.release != null) "-DCMAKE_SYSTEM_VERSION=${stdenv.hostPlatform.release}" ++ lib.optional (stdenv.buildPlatform.uname.system != null) "-DCMAKE_HOST_SYSTEM_NAME=${stdenv.buildPlatform.uname.system}" diff --git a/pkgs/tools/X11/ckbcomp/default.nix b/pkgs/tools/X11/ckbcomp/default.nix index 1b6c540b3d8..173963135f8 100644 --- a/pkgs/tools/X11/ckbcomp/default.nix +++ b/pkgs/tools/X11/ckbcomp/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "ckbcomp-${version}"; - version = "1.192"; + version = "1.193"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "installer-team"; repo = "console-setup"; rev = version; - sha256 = "1s570y8qwwy71ag9wgpznrhakps6rmw6j7p05hibns1spn2mxd5x"; + sha256 = "107nl6vpy4036km3gr9z5f3mq1i6x169v0z0a0ywavj3zjqy23rp"; }; buildInputs = [ perl ]; diff --git a/pkgs/tools/X11/xkbvalidate/default.nix b/pkgs/tools/X11/xkbvalidate/default.nix index f5a26410835..92a47aa6563 100644 --- a/pkgs/tools/X11/xkbvalidate/default.nix +++ b/pkgs/tools/X11/xkbvalidate/default.nix @@ -5,11 +5,11 @@ runCommandCC "xkbvalidate" { meta = { description = "NixOS tool to validate X keyboard configuration"; license = lib.licenses.mit; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; maintainers = [ lib.maintainers.aszlig ]; }; } '' mkdir -p "$out/bin" - gcc -std=gnu11 -Wall -pedantic -lxkbcommon ${./xkbvalidate.c} \ - -o "$out/bin/validate" + $CC -std=c11 -Wall -pedantic -lxkbcommon ${./xkbvalidate.c} \ + -o "$out/bin/xkbvalidate" '' diff --git a/pkgs/tools/X11/xkbvalidate/xkbvalidate.c b/pkgs/tools/X11/xkbvalidate/xkbvalidate.c index d9c9042467c..d25eef154b3 100644 --- a/pkgs/tools/X11/xkbvalidate/xkbvalidate.c +++ b/pkgs/tools/X11/xkbvalidate/xkbvalidate.c @@ -1,4 +1,3 @@ -#define _GNU_SOURCE #include <stdarg.h> #include <stdbool.h> #include <stdio.h> @@ -14,6 +13,9 @@ static bool log_alloc_success = true; static void add_log(struct xkb_context *ctx, enum xkb_log_level level, const char *fmt, va_list args) { + size_t buflen; + va_list tmpargs; + log_buffer_size++; if (log_buffer == NULL) @@ -28,11 +30,24 @@ static void add_log(struct xkb_context *ctx, enum xkb_log_level level, return; } - if (vasprintf(&log_buffer[log_buffer_size - 1], fmt, args) == -1) { + /* Unfortunately, vasprintf() is a GNU extension and thus not very + * portable, so let's first get the required buffer size using a dummy + * vsnprintf and afterwards allocate the returned amount of bytes. + * + * We also need to make a copy of the args, because the value of the args + * will be indeterminate after the return. + */ + va_copy(tmpargs, args); + buflen = vsnprintf(NULL, 0, fmt, tmpargs); + va_end(tmpargs); + + log_buffer[log_buffer_size - 1] = malloc(++buflen); + + if (vsnprintf(log_buffer[log_buffer_size - 1], buflen, fmt, args) == -1) { perror("log line alloc"); log_alloc_success = false; - return; } + va_end(args); } static void print_logs(void) diff --git a/pkgs/tools/admin/analog/default.nix b/pkgs/tools/admin/analog/default.nix index d0731c1f599..68046be2eee 100644 --- a/pkgs/tools/admin/analog/default.nix +++ b/pkgs/tools/admin/analog/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "analog"; - version = "6.0.15"; + version = "6.0.16"; src = fetchFromGitHub { owner = "c-amie"; repo = "analog-ce"; rev = version; - sha256 = "1clrx2xr3n5zh6gaavvdxkc127hayssxrplrd2qvw70givywza0m"; + sha256 = "15hi8kfknldwpvm885r9s7zd5h7cirs7x0zazx2nnz62xvz3iymk"; }; configurePhase = '' diff --git a/pkgs/tools/admin/aws-google-auth/default.nix b/pkgs/tools/admin/aws-google-auth/default.nix index 5d4ba0bfbc8..0fc001d5a19 100644 --- a/pkgs/tools/admin/aws-google-auth/default.nix +++ b/pkgs/tools/admin/aws-google-auth/default.nix @@ -19,7 +19,7 @@ buildPythonApplication rec { pname = "aws-google-auth"; - version = "0.0.29"; + version = "0.0.32"; # Pypi doesn't ship the tests, so we fetch directly from GitHub # https://github.com/cevoaustralia/aws-google-auth/issues/120 @@ -27,7 +27,7 @@ buildPythonApplication rec { owner = "cevoaustralia"; repo = "aws-google-auth"; rev = version; - sha256 = "06dalrwjy1sbc5wvj5ip4h999izlb0j5g6b6f3l5znnsm0vfvfia"; + sha256 = "0blsvdkb28g1s3c7f8brjjai7lq9ij76xqr5z6zlxxafc4qqwhh3"; }; propagatedBuildInputs = [ diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 8de71ce1256..a5e2df9ad21 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,24 +2,20 @@ buildGoModule rec { pname = "eksctl"; - version = "0.2.1"; + version = "0.3.1"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "0f8rj7jw8ym97bjqaxzn1rnhp5nfx3jf5f51jwczljvr67ik9q75"; + sha256 = "1xinkr9xnbfbr58ci7hprabqv0p292x016knbb7fqxzb8043f9lh"; }; - modSha256 = "1lmkwx0r19c2wg9nm85k92nlxjzr8q917jf3f333yf3csfyiix2f"; + modSha256 = "1y0pkd588wsqhqywlv1yd5mlr4limybfpdj2g3pbxw09hv18ysa4"; subPackages = [ "cmd/eksctl" ]; - buildFlags = - '' - -tags netgo - -tags release - ''; + buildFlags = [ "-tags netgo" "-tags release" ]; postInstall = '' diff --git a/pkgs/tools/admin/pulumi/default.nix b/pkgs/tools/admin/pulumi/default.nix index 12734cdcf9a..ebdf6b17ed6 100644 --- a/pkgs/tools/admin/pulumi/default.nix +++ b/pkgs/tools/admin/pulumi/default.nix @@ -4,17 +4,17 @@ with lib; let - version = "0.17.17"; + version = "0.17.27"; # switch the dropdown to “manual” on https://pulumi.io/quickstart/install.html # TODO: update script pulumiArchPackage = { "x86_64-linux" = { url = "https://get.pulumi.com/releases/sdk/pulumi-v${version}-linux-x64.tar.gz"; - sha256 = "1h1z8bngix1gvma3hahfyprrx3af5yncgvrsvr1cdsaa79bzvc5c"; + sha256 = "13ajgc8x5l3s93hmz6jg88if10bvd319jmkljy4n26zdp30vfqmw"; }; "x86_64-darwin" = { url = "https://get.pulumi.com/releases/sdk/pulumi-v${version}-darwin-x64.tar.gz"; - sha256 = "0pipykwpqqnhqg28s27lnkbrm55rshf25ikil7ycwq05p9ynf5gq"; + sha256 = "0chpbnz2s4icwgmfq6kl8blz5mg4lpdqg061w3nh0p04adpgrn48"; }; }; diff --git a/pkgs/tools/archivers/ctrtool/default.nix b/pkgs/tools/archivers/ctrtool/default.nix index 288a2a31ed0..97abeadffc0 100644 --- a/pkgs/tools/archivers/ctrtool/default.nix +++ b/pkgs/tools/archivers/ctrtool/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ctrtool"; - version = "0.15"; + version = "0.16"; src = fetchFromGitHub { - owner = "profi200"; + owner = "jakcron"; repo = "Project_CTR"; - rev = version; - sha256 = "1l6z05x18s1crvb283yvynlwsrpa1pdx1nbijp99plw06p88h4va"; + rev = "v${version}"; + sha256 = "1n3j3fd1bqd39v5bdl9mhq4qdrcl1k4ib1yzl3qfckaz3y8bkrap"; }; sourceRoot = "source/ctrtool"; diff --git a/pkgs/tools/audio/abcm2ps/default.nix b/pkgs/tools/audio/abcm2ps/default.nix index 584a2dc46f7..6c587f5cc5c 100644 --- a/pkgs/tools/audio/abcm2ps/default.nix +++ b/pkgs/tools/audio/abcm2ps/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "abcm2ps-${version}"; - version = "8.14.4"; + version = "8.14.5"; src = fetchFromGitHub { owner = "leesavide"; repo = "abcm2ps"; rev = "v${version}"; - sha256 = "0k53yf8plkkwsgg2vk468fkhvvwxnz5jk77n1159l0g362k36p0n"; + sha256 = "1i6db49khqy8bqg21cn90b1fvyw8mh1asdswzssr6dr2g8bhdwmq"; }; configureFlags = [ diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index e9727e101a0..4bb9dd88574 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "abcMIDI-${version}"; - version = "2019.06.14"; + version = "2019.08.11"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${name}.zip"; - sha256 = "1z503k2j6504h4p205q7wjrvh5x9jhkvsapfz322m3r905l2vc2b"; + sha256 = "0rkqmavg7iv9080jdqs0qz80nanhizv6jk0fg9d5xvq3gnmfvnj1"; }; # There is also a file called "makefile" which seems to be preferred by the standard build phase diff --git a/pkgs/tools/backup/bacula/default.nix b/pkgs/tools/backup/bacula/default.nix index 02b37784eaa..e5e26169b74 100644 --- a/pkgs/tools/backup/bacula/default.nix +++ b/pkgs/tools/backup/bacula/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { "--with-logdir=/var/log/bacula" "--with-working-dir=/var/lib/bacula" "--mandir=\${out}/share/man" - ]; + ] ++ stdenv.lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "ac_cv_func_setpgrp_void=yes"; installFlags = [ "logdir=\${out}/logdir" diff --git a/pkgs/tools/backup/bdsync/default.nix b/pkgs/tools/backup/bdsync/default.nix index 2fd67765aaf..be8746932ca 100644 --- a/pkgs/tools/backup/bdsync/default.nix +++ b/pkgs/tools/backup/bdsync/default.nix @@ -1,35 +1,33 @@ -{ stdenv, fetchFromGitHub, openssl, coreutils, which }: +{ stdenv, fetchFromGitHub +, openssl +, pandoc +, which +}: stdenv.mkDerivation rec { - - name = "${pname}-${version}"; pname = "bdsync"; - version = "0.10.1"; + version = "0.11.1"; src = fetchFromGitHub { owner = "TargetHolding"; repo = pname; rev = "v${version}"; - sha256 = "144hlbk3k29l7sja6piwhd2jsnzzsak13fcjbahd6m8yimxyb2nf"; + sha256 = "11grdyc6fgw93jvj965awsycqw5qbzsdys7n8farqnmya8qv8gac"; }; + nativeBuildInputs = [ pandoc which ]; + buildInputs = [ openssl ]; + postPatch = '' patchShebangs ./tests.sh patchShebangs ./tests/ ''; - buildInputs = [ openssl coreutils which ]; - doCheck = true; - checkPhase = '' - make test - ''; installPhase = '' - mkdir -p $out/bin - mkdir -p $out/share/man/man1 - cp bdsync $out/bin/ - cp bdsync.1 $out/share/man/man1/ + install -Dm755 bdsync -t $out/bin/ + install -Dm644 bdsync.1 -t $out/share/man/man1/ ''; meta = with stdenv.lib; { @@ -39,5 +37,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = with maintainers; [ jluttine ]; }; - } diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix index dfa28203dbf..91809af415a 100644 --- a/pkgs/tools/backup/btrbk/default.nix +++ b/pkgs/tools/backup/btrbk/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, coreutils, bash, btrfs-progs, openssh, perl, perlPackages -, utillinux, asciidoc, makeWrapper }: +, utillinux, asciidoc, asciidoctor, makeWrapper }: stdenv.mkDerivation rec { name = "btrbk-${version}"; - version = "0.28.0"; + version = "0.28.3"; src = fetchurl { url = "https://digint.ch/download/btrbk/releases/${name}.tar.xz"; - sha256 = "1bqgcbkdd5s3l3ba1ifa9l523r8cr5y3arjdy9f6rmm840kn7xzf"; + sha256 = "0s69pcjkjxg77cgyjahwyg2w81ckgzwz1ds4ifjw7z0zhjxy7miz"; }; - nativeBuildInputs = [ asciidoc makeWrapper ]; + nativeBuildInputs = [ asciidoc asciidoctor makeWrapper ]; buildInputs = with perlPackages; [ perl DateCalc ]; diff --git a/pkgs/tools/backup/s3ql/default.nix b/pkgs/tools/backup/s3ql/default.nix index 1bd8ebfd44b..b71f032bd7a 100644 --- a/pkgs/tools/backup/s3ql/default.nix +++ b/pkgs/tools/backup/s3ql/default.nix @@ -1,33 +1,35 @@ -{ stdenv, fetchurl, python3Packages, sqlite, which }: +{ stdenv, fetchFromGitHub, python3Packages, sqlite, which }: python3Packages.buildPythonApplication rec { - name = "${pname}-${version}"; pname = "s3ql"; - version = "2.26"; + version = "3.2"; - src = fetchurl { - url = "https://bitbucket.org/nikratio/${pname}/downloads/${name}.tar.bz2"; - sha256 = "0xs1jbak51zwjrd6jmd96xl3a3jpw0p1s05f7sw5wipvvg0xnmfn"; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "release-${version}"; + sha256 = "01ky0jc1s3w9dry5siz9b69jf2maiargz99axgxvyihap0d7qs52"; }; - buildInputs = [ which ]; # tests will fail without which + checkInputs = [ which ] ++ (with python3Packages; [ cython pytest ]); propagatedBuildInputs = with python3Packages; [ sqlite apsw pycrypto requests defusedxml dugong llfuse - cython pytest pytest-catchlog + cython pytest pytest-catchlog google_auth google-auth-oauthlib ]; preBuild = '' - # https://bitbucket.org/nikratio/s3ql/issues/118/no-module-named-s3qldeltadump-running#comment-16951851 ${python3Packages.python.interpreter} ./setup.py build_cython build_ext --inplace ''; checkPhase = '' + # Removing integration tests + rm tests/t{4,5,6}_* pytest tests ''; meta = with stdenv.lib; { description = "A full-featured file system for online data storage"; - homepage = https://bitbucket.org/nikratio/s3ql; + homepage = "https://github.com/s3ql/s3ql/"; license = licenses.gpl3; maintainers = with maintainers; [ rushmorem ]; platforms = platforms.linux; diff --git a/pkgs/tools/compression/zsync/default.nix b/pkgs/tools/compression/zsync/default.nix index 89016b3ff40..830e5f10ef6 100644 --- a/pkgs/tools/compression/zsync/default.nix +++ b/pkgs/tools/compression/zsync/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1wjslvfy76szf0mgg2i9y9q30858xyjn6v2acc24zal76d1m778b"; }; + makeFlags = [ "AR=${stdenv.cc.bintools.targetPrefix}ar" ]; + meta = { homepage = http://zsync.moria.org.uk/; description = "File distribution system using the rsync algorithm"; diff --git a/pkgs/tools/filesystems/apfs-fuse/default.nix b/pkgs/tools/filesystems/apfs-fuse/default.nix new file mode 100644 index 00000000000..9ee0b813326 --- /dev/null +++ b/pkgs/tools/filesystems/apfs-fuse/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, fuse3, bzip2, zlib, attr, cmake }: + +stdenv.mkDerivation rec { + pname = "apfs-fuse-unstable"; + version = "2019-07-23"; + + src = fetchFromGitHub { + owner = "sgan81"; + repo = "apfs-fuse"; + rev = "309ecb030f38edac4c10fa741a004c5eb7a23e15"; + sha256 = "0wq6rlqi00m5dp5gbzy65i1plm40j6nsm7938zvfgx5laal4wzr2"; + fetchSubmodules = true; + }; + + buildInputs = [ fuse3 bzip2 zlib attr ]; + nativeBuildInputs = [ cmake ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/sgan81/apfs-fuse"; + description = "FUSE driver for APFS (Apple File System)"; + license = licenses.gpl2; + maintainers = with maintainers; [ ealasu ]; + platforms = platforms.linux; + }; + +} diff --git a/pkgs/tools/filesystems/avfs/default.nix b/pkgs/tools/filesystems/avfs/default.nix index 5fc614de4a7..35e26828176 100644 --- a/pkgs/tools/filesystems/avfs/default.nix +++ b/pkgs/tools/filesystems/avfs/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "avfs-${version}"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { url = "mirror://sourceforge/avf/${version}/${name}.tar.bz2"; - sha256 = "19rk2c0xd3mi66kr88ykrcn81fv09c09md0gf6mnm9z1bd7p7wx7"; + sha256 = "0fxzigpyi08ipqz30ihjcpqmmx8g7r1kqdqq1bnnznvnhrzyygn8"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index 168542f57df..2ef70ca7847 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "btrfs-progs-${version}"; - version = "5.1.1"; + version = "5.2.1"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "06xybs7rglxjqkbzl2409acb3rgmnc5zc0xhyaxsc2p1x5yipfcw"; + sha256 = "0crjv3i20nyj2dagfw6q7byshscpn6j7wlqch3apkzzzk00lmb1n"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/filesystems/moosefs/default.nix b/pkgs/tools/filesystems/moosefs/default.nix index 73227b3d9f0..1e89b5729c7 100644 --- a/pkgs/tools/filesystems/moosefs/default.nix +++ b/pkgs/tools/filesystems/moosefs/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "moosefs"; - version = "3.0.104"; + version = "3.0.105"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "057xg7zy872w4hczk9b9ckmqyah3qhgysvxddqizr204cyadicxh"; + sha256 = "0wphpdll0j4i6d4yxykaz2bamv83y0sj7j3cfv4br1zamdyprfwx"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; diff --git a/pkgs/tools/graphics/argyllcms/default.nix b/pkgs/tools/graphics/argyllcms/default.nix index 679704197c6..b66257f442e 100644 --- a/pkgs/tools/graphics/argyllcms/default.nix +++ b/pkgs/tools/graphics/argyllcms/default.nix @@ -2,7 +2,7 @@ , libXrender, libXext, libtiff, libjpeg, libpng, libXScrnSaver, writeText , libXdmcp, libXau, lib, openssl }: let - version = "2.1.0"; + version = "2.1.1"; in stdenv.mkDerivation rec { name = "argyllcms-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { # Kind of flacky URL, it was reaturning 406 and inconsistent binaries for a # while on me. It might be good to find a mirror url = "https://www.argyllcms.com/Argyll_V${version}_src.zip"; - sha256 = "02zxy6ipp84hrd1p5nspp3f9dzphr0qwlq8s557jn746cf866bv3"; + sha256 = "0zq3fipky44xg536kdhg9bchi6s9ka7n1q73fwf9ja766s8rj99m"; # The argyllcms web server doesn't like curl ... curlOpts = "--user-agent 'Mozilla/5.0'"; diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix index ad5b4669498..3fd1efcc343 100644 --- a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix +++ b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix @@ -21,15 +21,15 @@ mkDerivation rec { buildInputs = [ fcitx qtbase ]; - preInstall = '' - substituteInPlace platforminputcontext/cmake_install.cmake \ - --replace ${qtbase.bin} $out - substituteInPlace quickphrase-editor/cmake_install.cmake \ - --replace ${fcitx} $out + preConfigure = '' + substituteInPlace platforminputcontext/CMakeLists.txt \ + --replace \$"{CMAKE_INSTALL_QTPLUGINDIR}" $out/${qtbase.qtPluginPrefix} + substituteInPlace quickphrase-editor/CMakeLists.txt \ + --replace \$"{FCITX4_ADDON_INSTALL_DIR}" $out/lib/fcitx ''; meta = with lib; { - homepage = https://gitlab.com/fcitx/fcitx-qt5; + homepage = "https://gitlab.com/fcitx/fcitx-qt5"; description = "Qt5 IM Module for Fcitx"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix index 2b2cc1a3499..2ee6944eeb3 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix @@ -12,14 +12,14 @@ let in stdenv.mkDerivation rec { - name = "ibus-typing-booster-${version}"; - version = "2.6.2"; + pname = "ibus-typing-booster"; + version = "2.6.4"; src = fetchFromGitHub { owner = "mike-fabian"; repo = "ibus-typing-booster"; rev = version; - sha256 = "0013njl539knp78iciv860fkpl15bkwarjwd2vjrmr5dbb0h15yc"; + sha256 = "1k074y9439w8v6s71i7hhmkq9bgkl836y2a409rx3mb73vidadjr"; }; patches = [ ./hunspell-dirs.patch ]; diff --git a/pkgs/tools/misc/bonfire/default.nix b/pkgs/tools/misc/bonfire/default.nix index 2bde876c68c..930d4dfaaba 100644 --- a/pkgs/tools/misc/bonfire/default.nix +++ b/pkgs/tools/misc/bonfire/default.nix @@ -30,7 +30,12 @@ buildPythonApplication rec { --replace "data_files = *.rst, *.txt" "" ''; - buildInputs = [ httpretty pytest_3 pytestcov ]; + buildInputs = [ httpretty pytest pytestcov ]; + + preCheck = '' + # fix compatibility with pytest 4 + substituteInPlace setup.cfg --replace "[pytest]" "[tool:pytest]" + ''; propagatedBuildInputs = [ arrow click keyring parsedatetime requests six termcolor ]; diff --git a/pkgs/tools/misc/chafa/default.nix b/pkgs/tools/misc/chafa/default.nix index 00ab4cd75d0..5055ce67d30 100644 --- a/pkgs/tools/misc/chafa/default.nix +++ b/pkgs/tools/misc/chafa/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec{ - version = "1.0.1"; + version = "1.2.1"; pname = "chafa"; src = fetchFromGitHub { owner = "hpjansson"; repo = "chafa"; rev = version; - sha256 = "1i1cnzmb12pxldc7y4q1xdmybv9xkhzrjyhdvmk3qsn02p859q04"; + sha256 = "19dck47v4hd07q9742mgb928h7y1y9638qlh2rzsvqsfqvqmxh85"; }; nativeBuildInputs = [ autoconf diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index f15dfc2adba..4eb6f302f1b 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "chezmoi-${version}"; - version = "1.3.0"; + version = "1.5.5"; goPackagePath = "github.com/twpayne/chezmoi"; @@ -10,13 +10,13 @@ buildGoPackage rec { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "0dvdjx5khpw62lprn06k271xfc9fdrw4c1q74vd1vffaz60yfd8d"; + sha256 = "18kc3b2ncjzxivycx3mhqw9kbqp0sxmlgc2ddvhgj2vpvlkayzkh"; }; goDeps = ./deps.nix; buildFlagsArray = [ - "-ldflags=-s -w -X ${goPackagePath}/cmd.version=${version}" + "-ldflags=-s -w -X ${goPackagePath}/cmd.VersionStr=${version}" ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/chezmoi/deps.nix b/pkgs/tools/misc/chezmoi/deps.nix index 4fb1bd53552..6641a58931d 100644 --- a/pkgs/tools/misc/chezmoi/deps.nix +++ b/pkgs/tools/misc/chezmoi/deps.nix @@ -46,15 +46,6 @@ }; } { - goPackagePath = "github.com/blang/semver"; - fetch = { - type = "git"; - url = "https://github.com/blang/semver"; - rev = "v3.5.1"; - sha256 = "13ws259bwcibkclbr82ilhk6zadm63kxklxhk12wayklj8ghhsmy"; - }; - } - { goPackagePath = "github.com/coreos/etcd"; fetch = { type = "git"; @@ -82,15 +73,6 @@ }; } { - goPackagePath = "github.com/d4l3k/messagediff"; - fetch = { - type = "git"; - url = "https://github.com/d4l3k/messagediff"; - rev = "v1.2.1"; - sha256 = "104hl8x57ciaz7mzafg1vp9qggxcyfm8hsv9bmlihbz9ml3nyr8v"; - }; - } - { goPackagePath = "github.com/danieljoos/wincred"; fetch = { type = "git"; @@ -127,6 +109,33 @@ }; } { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "v1.2.0"; + sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab"; + }; + } + { + goPackagePath = "github.com/google/go-github"; + fetch = { + type = "git"; + url = "https://github.com/google/go-github"; + rev = "v25.0.1"; + sha256 = "1wggj64dm73zmav64qfgw8v3pkzxxmlaqrccvs5rf66j0wij9g20"; + }; + } + { + goPackagePath = "github.com/google/go-querystring"; + fetch = { + type = "git"; + url = "https://github.com/google/go-querystring"; + rev = "v1.0.0"; + sha256 = "0xl12bqyvmn4xcnf8p9ksj9rmnr7s40pvppsdmy8n9bzw1db0iwz"; + }; + } + { goPackagePath = "github.com/google/renameio"; fetch = { type = "git"; @@ -181,6 +190,24 @@ }; } { + goPackagePath = "github.com/kr/pty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pty"; + rev = "v1.1.1"; + sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6"; + }; + } + { + goPackagePath = "github.com/kr/text"; + fetch = { + type = "git"; + url = "https://github.com/kr/text"; + rev = "v0.1.0"; + sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; + }; + } + { goPackagePath = "github.com/magiconair/properties"; fetch = { type = "git"; @@ -190,12 +217,12 @@ }; } { - goPackagePath = "github.com/mitchellh/go-homedir"; + goPackagePath = "github.com/mattn/go-isatty"; fetch = { type = "git"; - url = "https://github.com/mitchellh/go-homedir"; - rev = "v1.0.0"; - sha256 = "0f0z0aa4wivk4z1y503dmnw0k0g0g403dly8i4q263gfshs82sbq"; + url = "https://github.com/mattn/go-isatty"; + rev = "v0.0.7"; + sha256 = "1i77aq4gf9as03m8fpfh8fq49n4z9j7548blrcsidm1xhslzk5xd"; }; } { @@ -226,12 +253,30 @@ }; } { + goPackagePath = "github.com/russross/blackfriday"; + fetch = { + type = "git"; + url = "https://github.com/russross/blackfriday"; + rev = "v2.0.1"; + sha256 = "0nlz7isdd4rgnwzs68499hlwicxz34j2k2a0b8jy0y7ycd2bcr5j"; + }; + } + { + goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; + fetch = { + type = "git"; + url = "https://github.com/shurcooL/sanitized_anchor_name"; + rev = "v1.0.0"; + sha256 = "1gv9p2nr46z80dnfjsklc6zxbgk96349sdsxjz05f3z6wb6m5l8f"; + }; + } + { goPackagePath = "github.com/spf13/afero"; fetch = { type = "git"; url = "https://github.com/spf13/afero"; - rev = "v1.1.2"; - sha256 = "0miv4faf5ihjfifb1zv6aia6f6ik7h1s4954kcb8n6ixzhx9ck6k"; + rev = "v1.2.2"; + sha256 = "0j9r65qgd58324m85lkl49vk9dgwd62g7dwvkfcm3k6i9dc555a9"; }; } { @@ -284,8 +329,8 @@ fetch = { type = "git"; url = "https://github.com/stretchr/objx"; - rev = "v0.1.1"; - sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; + rev = "v0.2.0"; + sha256 = "0pcdvakxgddaiwcdj73ra4da05a3q4cgwbpm2w75ycq4kzv8ij8k"; }; } { @@ -293,8 +338,17 @@ fetch = { type = "git"; url = "https://github.com/stretchr/testify"; - rev = "v1.2.2"; - sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; + rev = "v1.3.0"; + sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy"; + }; + } + { + goPackagePath = "github.com/twpayne/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/twpayne/go-difflib"; + rev = "v1.3.0"; + sha256 = "01lidr7brrdv4xqx87n6c2ppyaj8rdf9lqj85qhbbalwy6z34fj8"; }; } { @@ -311,8 +365,17 @@ fetch = { type = "git"; url = "https://github.com/twpayne/go-vfs"; - rev = "v1.0.3"; - sha256 = "138ykzmb4994qwbv3m99536p75804ap15c2drvz6d3k0v95rbw38"; + rev = "v1.0.6"; + sha256 = "0sqjng5qm4s7crq9s1f5y5niq4wss6dizip62zx37iyvws1yngjd"; + }; + } + { + goPackagePath = "github.com/twpayne/go-vfsafero"; + fetch = { + type = "git"; + url = "https://github.com/twpayne/go-vfsafero"; + rev = "v1.0.0"; + sha256 = "18jwxhlrjd06z8xzg9ij0irl4f79jfy5jpwiz6xqlhzb1fja19pw"; }; } { @@ -320,8 +383,8 @@ fetch = { type = "git"; url = "https://github.com/twpayne/go-xdg"; - rev = "v1.0.0"; - sha256 = "06np468cl8bbpal6x0mf8q6jzlkz65rzma5y65n7wfmrg2k7yn72"; + rev = "v3.1.0"; + sha256 = "0j8q7yzixs6jlaad0lpa8hs6b240gm2cmy0yxgnprrbpa0y2r7ln"; }; } { @@ -352,12 +415,48 @@ }; } { + goPackagePath = "go.etcd.io/bbolt"; + fetch = { + type = "git"; + url = "https://github.com/etcd-io/bbolt"; + rev = "4af6cfab7010"; + sha256 = "1zgirl82lph606vw39wj4mvk8bkq2bakvnx49dpq7l5dsdhiydpv"; + }; + } + { goPackagePath = "golang.org/x/crypto"; fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "505ab145d0a9"; - sha256 = "1vbsvcvmjz6c00p5vf8ls533p52fx2y3gy6v4k5qrdlzl4wf0i5s"; + rev = "c2843e01d9a2"; + sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "d8887717615a"; + sha256 = "1wfm6ngxjyj7v5a2dqib6lw8bb2rdnf1kl48diykxjrsddn0s163"; + }; + } + { + goPackagePath = "golang.org/x/oauth2"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/oauth2"; + rev = "d2e6202438be"; + sha256 = "0wbn75fd10485nb93bm4kqldqifdim5xqy4v7r5sdvimvf3fyhn7"; + }; + } + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "e225da77a7e6"; + sha256 = "0bh3583smcfw6jw3w6lp0za93rz7hpxfdz8vhxng75b7a6vdlw4p"; }; } { @@ -365,8 +464,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "a5c9d58dba9a"; - sha256 = "02qv5i7yps35p7fa81345qz7k8i73gkigj69anwmpw9rhpmzayf9"; + rev = "10058d7d4faa"; + sha256 = "0y83433yjgsr7057h99g5ayljzlivx2bnkcp01xnzqz8lppv8fql"; }; } { @@ -379,6 +478,15 @@ }; } { + goPackagePath = "google.golang.org/appengine"; + fetch = { + type = "git"; + url = "https://github.com/golang/appengine"; + rev = "v1.1.0"; + sha256 = "1pz202zszg8f35dk5pfhwgcdi3r6dx1l4yk6x6ly7nb4j45zi96x"; + }; + } + { goPackagePath = "gopkg.in/check.v1"; fetch = { type = "git"; diff --git a/pkgs/tools/misc/cht.sh/default.nix b/pkgs/tools/misc/cht.sh/default.nix index 837bc0e9ed7..48ce782536f 100644 --- a/pkgs/tools/misc/cht.sh/default.nix +++ b/pkgs/tools/misc/cht.sh/default.nix @@ -9,15 +9,15 @@ stdenv.mkDerivation rec { name = "cht.sh-${version}"; - version = "unstable-2018-11-02"; + version = "unstable-2019-08-06"; nativeBuildInputs = [ makeWrapper ]; src = fetchFromGitHub { owner = "chubin"; repo = "cheat.sh"; - rev = "9595805ac68b3c096f7c51fa024dcb97a7dfac44"; - sha256 = "11g8say5fksg0zg0bqrgl92rprn4lwp20g9rz1i0r38f0jy3nyrf"; + rev = "f507ba51d6bc1ae6c7df808cadbe4f8603951b6b"; + sha256 = "0r7x9a3qzzkbd1m5zdlkpmhx0p7b7ja42190s7fidls3dsm710g0"; }; # Fix ".cht.sh-wrapped" in the help message @@ -25,6 +25,12 @@ stdenv.mkDerivation rec { installPhase = '' install -m755 -D share/cht.sh.txt "$out/bin/cht.sh" + + # install shell completion files + mkdir -p $out/share/bash-completion/completions $out/share/zsh/site-functions + mv share/bash_completion.txt $out/share/bash-completion/completions/cht.sh + cp share/zsh.txt $out/share/zsh/site-functions/_cht + wrapProgram "$out/bin/cht.sh" \ --prefix PATH : "${stdenv.lib.makeBinPath [ curl rlwrap ncurses xsel ]}" ''; @@ -32,7 +38,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "CLI client for cheat.sh, a community driven cheat sheet"; license = licenses.mit; - maintainers = with maintainers; [ fgaz ]; + maintainers = with maintainers; [ fgaz evanjs ]; homepage = https://github.com/chubin/cheat.sh; }; } diff --git a/pkgs/tools/misc/coreutils/avoid-false-positive-in-date-debug-test.patch b/pkgs/tools/misc/coreutils/avoid-false-positive-in-date-debug-test.patch new file mode 100644 index 00000000000..ae1a02d4d20 --- /dev/null +++ b/pkgs/tools/misc/coreutils/avoid-false-positive-in-date-debug-test.patch @@ -0,0 +1,52 @@ +From 0251229bfd9617e8a35cf9dd7d338d63fff74a0c Mon Sep 17 00:00:00 2001 +From: Assaf Gordon <assafgordon@gmail.com> +Date: Mon, 13 May 2019 16:37:40 -0600 +Subject: [PATCH] tests: avoid false-positive in date-debug test +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When debugging an invalid date due to DST switching, the intermediate +'normalized time' should not be checked - its value can differ between +systems (e.g. glibc vs musl). + +Reported by Niklas Hambüchen in +https://lists.gnu.org/r/coreutils/2019-05/msg00031.html +Analyzed by Rich Felker in +https://lists.gnu.org/r/coreutils/2019-05/msg00039.html + +* tests/misc/date-debug.sh: Replace the exact normalized time +with 'XX:XX:XX' so different values would not trigger test failure. +--- + tests/misc/date-debug.sh | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +diff --git a/tests/misc/date-debug.sh b/tests/misc/date-debug.sh +index aa47f1abb..2ce6f4ce8 100755 +--- a/tests/misc/date-debug.sh ++++ b/tests/misc/date-debug.sh +@@ -71,7 +71,7 @@ date: input timezone: TZ="America/Edmonton" in date string + date: using specified time as starting value: '02:30:00' + date: error: invalid date/time value: + date: user provided time: '(Y-M-D) 2006-04-02 02:30:00' +-date: normalized time: '(Y-M-D) 2006-04-02 03:30:00' ++date: normalized time: '(Y-M-D) 2006-04-02 XX:XX:XX' + date: -- + date: possible reasons: + date: non-existing due to daylight-saving time; +@@ -81,7 +81,14 @@ date: invalid date 'TZ="America/Edmonton" 2006-04-02 02:30:00' + EOF + + # date should return 1 (error) for invalid date +-returns_ 1 date --debug -d "$in2" >out2 2>&1 || fail=1 ++returns_ 1 date --debug -d "$in2" >out2-t 2>&1 || fail=1 ++ ++# The output line of "normalized time" can differ between systems ++# (e.g. glibc vs musl) and should not be checked. ++# See: https://lists.gnu.org/archive/html/coreutils/2019-05/msg00039.html ++sed '/normalized time:/s/ [0-9][0-9]:[0-9][0-9]:[0-9][0-9]/ XX:XX:XX/' \ ++ out2-t > out2 || framework_failure_ ++ + compare exp2 out2 || fail=1 + + ## diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index c80bb64d0bb..cbe97dda9e5 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -25,6 +25,9 @@ stdenv.mkDerivation rec { }; patches = optional stdenv.hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch + # Fix failing test with musl. See https://lists.gnu.org/r/coreutils/2019-05/msg00031.html + # To be removed in coreutils-8.32. + ++ optional stdenv.hostPlatform.isMusl ./avoid-false-positive-in-date-debug-test.patch # Fix compilation in musl-cross environments. To be removed in coreutils-8.32. ++ optional stdenv.hostPlatform.isMusl ./coreutils-8.31-musl-cross.patch; @@ -54,10 +57,12 @@ stdenv.mkDerivation rec { for f in gnulib-tests/{test-chown.c,test-fchownat.c,test-lchown.c}; do echo "int main() { return 77; }" > "$f" done - '' + optionalString (stdenv.hostPlatform.libc == "musl") '' - echo "int main() { return 77; }" > gnulib-tests/test-parse-datetime.c - echo "int main() { return 77; }" > gnulib-tests/test-getlogin.c - ''; + '' + optionalString (stdenv.hostPlatform.libc == "musl") (lib.concatStringsSep "\n" [ + '' + echo "int main() { return 77; }" > gnulib-tests/test-parse-datetime.c + echo "int main() { return 77; }" > gnulib-tests/test-getlogin.c + '' + ]); outputs = [ "out" "info" ]; diff --git a/pkgs/tools/misc/fffuu/default.nix b/pkgs/tools/misc/fffuu/default.nix new file mode 100644 index 00000000000..7b275220c19 --- /dev/null +++ b/pkgs/tools/misc/fffuu/default.nix @@ -0,0 +1,51 @@ +{ mkDerivation, haskellPackages, fetchFromGitHub, lib }: + +mkDerivation rec { + pname = "fffuu"; + version = "unstable-2018-05-26"; + + src = fetchFromGitHub { + owner = "diekmann"; + repo = "Iptables_Semantics"; + rev = "e0a2516bd885708fce875023b474ae341cbdee29"; + sha256 = "1qc7p44dqja6qrjbjdc2xn7n9v41j5v59sgjnxjj5k0mxp58y1ch"; + }; + + postPatch = '' + substituteInPlace haskell_tool/fffuu.cabal \ + --replace "containers >=0.5 && <0.6" "containers >= 0.6" \ + --replace "optparse-generic >= 1.2.3 && < 1.3" "optparse-generic >= 1.2.3" + ''; + + preCompileBuildDriver = '' + cd haskell_tool + ''; + + isLibrary = false; + + isExecutable = true; + + # fails with sandbox + doCheck = false; + + libraryHaskellDepends = with haskellPackages; [ + base + containers + split + parsec + optparse-generic + ]; + + executableHaskellDepends = with haskellPackages; [ base ]; + + testHaskellDepends = with haskellPackages; [ + tasty + tasty-hunit + tasty-golden + ]; + + description = "Fancy Formal Firewall Universal Understander"; + homepage = https://github.com/diekmann/Iptables_Semantics/tree/master/haskell_tool; + license = lib.licenses.bsd2; + maintainers = [ lib.maintainers.marsam ]; +} diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index 6834a555e4d..49a2809b604 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, intltool, gettext, makeWrapper -, parted, glib, libuuid, pkgconfig, gtkmm3, libxml2, hicolor-icon-theme -, gpart, hdparm, procps, utillinux +{ stdenv, fetchurl, intltool, gettext, makeWrapper, coreutils, gnused, gnome3 +, gnugrep, parted, glib, libuuid, pkgconfig, gtkmm3, libxml2, hicolor-icon-theme +, gpart, hdparm, procps, utillinux, polkit, wrapGAppsHook, substituteAll }: stdenv.mkDerivation rec { @@ -11,16 +11,31 @@ stdenv.mkDerivation rec { sha256 = "0mdvn85jvy72ff7nds3dakx9kzknh8gx1z8i0w2sf970q03qp2z4"; }; + # Tries to run `pkexec --version` to get version. + # however the binary won't be suid so it returns + # an error preventing the program from detection + patches = [ + (substituteAll { + src = ./polkit.patch; + polkit_version = polkit.version; + }) + ]; + configureFlags = [ "--disable-doc" ]; - buildInputs = [ parted glib libuuid gtkmm3 libxml2 hicolor-icon-theme ]; - nativeBuildInputs = [ intltool gettext makeWrapper pkgconfig ]; + buildInputs = [ parted glib libuuid gtkmm3 libxml2 hicolor-icon-theme polkit.bin gnome3.adwaita-icon-theme ]; + nativeBuildInputs = [ intltool gettext pkgconfig wrapGAppsHook ]; + + preFixup = '' + gappsWrapperArgs+=( + --prefix PATH : "${stdenv.lib.makeBinPath [ gpart hdparm utillinux procps coreutils gnused gnugrep ]}" + ) + ''; + # Doesn't get installed automaticallly if PREFIX != /usr postInstall = '' - wrapProgram $out/bin/gparted \ - --prefix PATH : "${procps}/bin" - wrapProgram $out/sbin/gpartedbin \ - --prefix PATH : "${stdenv.lib.makeBinPath [ gpart hdparm utillinux ]}" + install -D -m0644 org.gnome.gparted.policy \ + $out/share/polkit-1/actions/org.gnome.gparted.policy ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/gparted/polkit.patch b/pkgs/tools/misc/gparted/polkit.patch new file mode 100644 index 00000000000..a42ed785de9 --- /dev/null +++ b/pkgs/tools/misc/gparted/polkit.patch @@ -0,0 +1,12 @@ +diff -ru old/gparted-1.0.0/configure gparted-1.0.0/configure +--- old/gparted-1.0.0/configure 2019-05-29 12:02:13.000000000 -0400 ++++ gparted-1.0.0/configure 2019-08-08 18:09:52.792795781 -0400 +@@ -16145,7 +16145,7 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pkexec >= $PKEXEC_REQUIRED_VERSION" >&5 + $as_echo_n "checking for pkexec >= $PKEXEC_REQUIRED_VERSION... " >&6; } + PKEXEC_REQUIRED_INT=`echo "$PKEXEC_REQUIRED_VERSION" | $AWK -F. '{print $1 * 10000 + $2}'` +-PKEXEC_VERSION_OUTPUT=`pkexec --version 2> /dev/null` || ++PKEXEC_VERSION_OUTPUT='pkexec version @polkit_version@' || + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 + $as_echo "not found" >&6; } + if test "x$PKEXEC_VERSION_OUTPUT" != 'x'; then diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix index bdb919006fd..59ac70a8162 100644 --- a/pkgs/tools/misc/graylog/default.nix +++ b/pkgs/tools/misc/graylog/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre_headless }: stdenv.mkDerivation rec { - version = "3.0.2"; + version = "3.1.0"; name = "graylog-${version}"; src = fetchurl { url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz"; - sha256 = "1xw9fxdb3n9h595sw1imns6g5a5339ppn2plx8qw4ngnkzd9pvhj"; + sha256 = "0zv64cnd5nrn2hgbjmcwjam8dx5y2a7gz5x7xb9kr134132dm0yd"; }; dontBuild = true; diff --git a/pkgs/tools/misc/hashit/default.nix b/pkgs/tools/misc/hashit/default.nix index b773fc5d680..6d928524713 100644 --- a/pkgs/tools/misc/hashit/default.nix +++ b/pkgs/tools/misc/hashit/default.nix @@ -1,32 +1,31 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, pantheon, python3, gnome3, gtk3, gobject-introspection, desktop-file-utils, wrapGAppsHook }: +{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, pantheon, python3, libgee, gtk3, desktop-file-utils, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "hashit"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "artemanufrij"; repo = pname; rev = version; - sha256 = "1ba38qmwdk7vkarsxqn89irbymzx52gbks4isx0klg880xm2z4dv"; + sha256 = "1s8fbzg1z2ypn55xg1pfm5xh15waq55fkp49j8rsqiq8flvg6ybf"; }; nativeBuildInputs = [ desktop-file-utils - gobject-introspection meson ninja + pantheon.vala pkgconfig python3 - pantheon.vala wrapGAppsHook ]; buildInputs = [ + gtk3 + libgee pantheon.elementary-icon-theme - gnome3.libgee pantheon.granite - gtk3 ]; postPatch = '' @@ -35,10 +34,10 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "A simple app for checking usual checksums"; + description = "A simple app for checking usual checksums - Designed for elementary OS"; homepage = https://github.com/artemanufrij/hashit; license = licenses.gpl2Plus; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = pantheon.maintainers; platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/html-proofer/Gemfile.lock b/pkgs/tools/misc/html-proofer/Gemfile.lock index 5080203d515..6b0d5d3387c 100644 --- a/pkgs/tools/misc/html-proofer/Gemfile.lock +++ b/pkgs/tools/misc/html-proofer/Gemfile.lock @@ -26,7 +26,7 @@ GEM mercenary (0.3.6) mini_portile2 (2.4.0) minitest (5.11.3) - nokogiri (1.10.3) + nokogiri (1.10.4) mini_portile2 (~> 2.4.0) parallel (1.17.0) public_suffix (3.1.1) @@ -45,4 +45,4 @@ DEPENDENCIES html-proofer BUNDLED WITH - 1.14.6 + 1.17.2 diff --git a/pkgs/tools/misc/html-proofer/gemset.nix b/pkgs/tools/misc/html-proofer/gemset.nix index 4777d5d53e6..256243f3d5d 100644 --- a/pkgs/tools/misc/html-proofer/gemset.nix +++ b/pkgs/tools/misc/html-proofer/gemset.nix @@ -1,6 +1,8 @@ { activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "110vp4frgkw3mpzlmshg2f2ig09cknls2w68ym1r1s39d01v0mi8"; @@ -10,6 +12,8 @@ }; addressable = { dependencies = ["public_suffix"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0bcm2hchn897xjhqj9zzsxf3n9xhddymj4lsclz508f4vw3av46l"; @@ -18,6 +22,8 @@ version = "2.6.0"; }; concurrent-ruby = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an"; @@ -27,6 +33,8 @@ }; ethon = { dependencies = ["ffi"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0gggrgkcq839mamx7a8jbnp2h7x2ykfn34ixwskwb0lzx2ak17g9"; @@ -35,6 +43,8 @@ version = "0.12.0"; }; ffi = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "06mvxpjply8qh4j3fj9wh08kdzwkbnvsiysh0vrhlk5cwxzjmblh"; @@ -44,6 +54,8 @@ }; html-proofer = { dependencies = ["activesupport" "addressable" "mercenary" "nokogiri" "parallel" "rainbow" "typhoeus" "yell"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0kpcz7p0yjr1y9fs8gila2bkgb8y6qkyqv5a8yymw0hkvddnqig4"; @@ -53,6 +65,8 @@ }; i18n = { dependencies = ["concurrent-ruby"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1hfxnlyr618s25xpafw9mypa82qppjccbh292c4l3bj36az7f6wl"; @@ -61,6 +75,8 @@ version = "1.6.0"; }; mercenary = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "10la0xw82dh5mqab8bl0dk21zld63cqxb1g16fk8cb39ylc4n21a"; @@ -69,6 +85,8 @@ version = "0.3.6"; }; mini_portile2 = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy"; @@ -77,6 +95,8 @@ version = "2.4.0"; }; minitest = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0icglrhghgwdlnzzp4jf76b0mbc71s80njn5afyfjn4wqji8mqbq"; @@ -86,14 +106,18 @@ }; nokogiri = { dependencies = ["mini_portile2"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02bjydih0j515szfv9mls195cvpyidh6ixm7dwbl3s2sbaxxk5s4"; + sha256 = "0nmdrqqz1gs0fwkgzxjl4wr554gr8dc1fkrqjc2jpsvwgm41rygv"; type = "gem"; }; - version = "1.10.3"; + version = "1.10.4"; }; parallel = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1x1gzgjrdlkm1aw0hfpyphsxcx90qgs3y4gmp9km3dvf4hc4qm8r"; @@ -102,6 +126,8 @@ version = "1.17.0"; }; public_suffix = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0g9ds2ffzljl6jjmkjffwxc1z6lh5nkqqmhhkxjk71q5ggv0rkpm"; @@ -110,6 +136,8 @@ version = "3.1.1"; }; rainbow = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0bb2fpjspydr6x0s8pn1pqkzmxszvkfapv0p4627mywl7ky4zkhk"; @@ -118,6 +146,8 @@ version = "3.0.0"; }; thread_safe = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; @@ -127,6 +157,8 @@ }; typhoeus = { dependencies = ["ethon"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0cni8b1idcp0dk8kybmxydadhfpaj3lbs99w5kjibv8bsmip2zi5"; @@ -136,6 +168,8 @@ }; tzinfo = { dependencies = ["thread_safe"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z"; @@ -144,6 +178,8 @@ version = "1.2.5"; }; yell = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1394pf8wsv4wx2lf1d9iqqx6lcww9bgmgh9sms3dbga804cns0n8"; diff --git a/pkgs/tools/misc/idevicerestore/default.nix b/pkgs/tools/misc/idevicerestore/default.nix new file mode 100644 index 00000000000..a12fa04c5fc --- /dev/null +++ b/pkgs/tools/misc/idevicerestore/default.nix @@ -0,0 +1,58 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +, curl +, libimobiledevice +, libirecovery +, libzip +, libusbmuxd +}: + +stdenv.mkDerivation rec { + pname = "idevicerestore"; + version = "2019-02-14"; + + src = fetchFromGitHub { + owner = "libimobiledevice"; + repo = pname; + rev = "8a882038b2b1e022fbd19eaf8bea51006a373c06"; + sha256 = "17lisl7ll43ixl1zqwchn7jljrdyl2p9q99w30i6qaci71mas37m"; + }; + + nativeBuildInputs = [ + autoreconfHook + pkgconfig + ]; + + buildInputs = [ + curl + libimobiledevice + libirecovery + libzip + libusbmuxd + # Not listing other dependencies specified in + # https://github.com/libimobiledevice/idevicerestore/blob/8a882038b2b1e022fbd19eaf8bea51006a373c06/README#L20 + # because they are inherited `libimobiledevice`. + ]; + + meta = with stdenv.lib; { + homepage = https://github.com/libimobiledevice/idevicerestore; + description = "Restore/upgrade firmware of iOS devices"; + longDescription = '' + The idevicerestore tool allows to restore firmware files to iOS devices. + + It is a full reimplementation of all granular steps which are performed during + restore of a firmware to a device. + + In general, upgrades and downgrades are possible, however subject to + availability of SHSH blobs from Apple for signing the firmare files. + + To restore a device to some firmware, simply run the following: + $ sudo idevicerestore -l + + This will download and restore a device to the latest firmware available. + ''; + license = licenses.lgpl21Plus; + # configure.ac suggests it should work for darwin and mingw as well but not tried yet + platforms = platforms.linux; + maintainers = with maintainers; [ nh2 ]; + }; +} diff --git a/pkgs/tools/misc/mbuffer/default.nix b/pkgs/tools/misc/mbuffer/default.nix index 6cf8de2fea0..59ed474e9bc 100644 --- a/pkgs/tools/misc/mbuffer/default.nix +++ b/pkgs/tools/misc/mbuffer/default.nix @@ -3,12 +3,12 @@ } : stdenv.mkDerivation rec { - version = "20190127"; + version = "20190725"; name = "mbuffer-${version}"; src = fetchurl { url = "http://www.maier-komor.de/software/mbuffer/mbuffer-${version}.tgz"; - sha256 = "1p7d9jaiyqcg5q14hlcji6llhjqkg6izc9cfz23jwgq8z2a6zjy5"; + sha256 = "1hjhyh3q0q22czq3s2wk5mcky1jrq9xw8fppw6r7cix1riq74m91"; }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/misc/noti/default.nix b/pkgs/tools/misc/noti/default.nix index 23646abe787..74b1f96fad8 100644 --- a/pkgs/tools/misc/noti/default.nix +++ b/pkgs/tools/misc/noti/default.nix @@ -1,19 +1,20 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, Cocoa }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub +, Cocoa ? null }: buildGoPackage rec { - name = "noti-${version}"; - version = "3.1.0"; + pname = "noti"; + version = "3.2.0"; src = fetchFromGitHub { owner = "variadico"; repo = "noti"; - rev = "${version}"; - sha256 = "1chsqfqk0pnhx5k2nr4c16cpb8m6zv69l1jvv4v4903zgfzcm823"; + rev = version; + sha256 = "1lw1wmw2m83m0s5znb4gliywjpg74qrhrj6rwpcb5p352c4vbwxs"; }; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Cocoa ]; + buildInputs = lib.optional stdenv.isDarwin Cocoa; # TODO: Remove this when we update apple_sdk - NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.isDarwin [ "-fno-objc-arc" ]; + NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin "-fno-objc-arc"; goPackagePath = "github.com/variadico/noti"; @@ -22,12 +23,11 @@ buildGoPackage rec { ''; postInstall = '' - mkdir -p $out/share/man/man{1,5}/ - cp $src/docs/man/noti.1 $out/share/man/man1/ - cp $src/docs/man/noti.yaml.5 $out/share/man/man5/ + install -Dm444 -t $out/share/man/man1 $src/docs/man/*.1 + install -Dm444 -t $out/share/man/man5 $src/docs/man/*.5 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Monitor a process and trigger a notification."; longDescription = '' Monitor a process and trigger a notification. @@ -36,7 +36,7 @@ buildGoPackage rec { ''; homepage = https://github.com/variadico/noti; license = licenses.mit; - maintainers = [ maintainers.stites ]; + maintainers = with maintainers; [ stites ]; platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/ostree/01-Drop-ostree-trivial-httpd-CLI-move-to-tests-director.patch b/pkgs/tools/misc/ostree/01-Drop-ostree-trivial-httpd-CLI-move-to-tests-director.patch new file mode 100644 index 00000000000..9c334436162 --- /dev/null +++ b/pkgs/tools/misc/ostree/01-Drop-ostree-trivial-httpd-CLI-move-to-tests-director.patch @@ -0,0 +1,271 @@ +From a9a62d7c7adf6fc0237c7d04937b538a4cea87ad Mon Sep 17 00:00:00 2001 +From: Colin Walters <walters@verbum.org> +Date: Tue, 19 Jun 2018 09:34:18 -0400 +Subject: [PATCH] Drop "ostree trivial-httpd" CLI, move to tests directory + +See https://github.com/ostreedev/ostree/issues/1593 + +Basically this makes it easier for people packaging, as the trivial-httpd +is only for tests, and this way the binary will live with the tests. + +Also at this point nothing should depend on `ostree trivial-httpd`. +--- + Makefile-man.am | 6 -- + Makefile-ostree.am | 7 --- + Makefile-tests.am | 7 +++ + configure.ac | 10 --- + man/ostree-trivial-httpd.xml | 118 ----------------------------------- + src/ostree/main.c | 5 -- + tests/libtest.sh | 13 ++-- + 7 files changed, 12 insertions(+), 154 deletions(-) + delete mode 100644 man/ostree-trivial-httpd.xml + +diff --git a/Makefile-man.am b/Makefile-man.am +index 8ccbba8c..d204aa3e 100644 +--- a/Makefile-man.am ++++ b/Makefile-man.am +@@ -34,12 +34,6 @@ ostree-init.1 ostree-log.1 ostree-ls.1 ostree-prune.1 ostree-pull-local.1 \ + ostree-pull.1 ostree-refs.1 ostree-remote.1 ostree-reset.1 \ + ostree-rev-parse.1 ostree-show.1 ostree-summary.1 \ + ostree-static-delta.1 +-if BUILDOPT_TRIVIAL_HTTPD +-man1_files += ostree-trivial-httpd.1 +-else +-# We still want to distribute the source, even if we are not building it +-EXTRA_DIST += man/ostree-trivial-httpd.xml +-endif + + if BUILDOPT_FUSE + man1_files += rofiles-fuse.1 +diff --git a/Makefile-ostree.am b/Makefile-ostree.am +index 8d352e38..1471b3e5 100644 +--- a/Makefile-ostree.am ++++ b/Makefile-ostree.am +@@ -133,13 +133,6 @@ ostree_SOURCES += src/ostree/ot-builtin-pull.c + endif + + if USE_LIBSOUP +-# Eventually once we stop things from using this, we should support disabling this +-ostree_SOURCES += src/ostree/ot-builtin-trivial-httpd.c +-pkglibexec_PROGRAMS += ostree-trivial-httpd +-ostree_trivial_httpd_SOURCES = src/ostree/ostree-trivial-httpd.c +-ostree_trivial_httpd_CFLAGS = $(ostree_bin_shared_cflags) $(OT_INTERNAL_SOUP_CFLAGS) +-ostree_trivial_httpd_LDADD = $(ostree_bin_shared_ldadd) $(OT_INTERNAL_SOUP_LIBS) +- + if !USE_CURL + # This is necessary for the cookie jar bits + ostree_CFLAGS += $(OT_INTERNAL_SOUP_CFLAGS) +diff --git a/Makefile-tests.am b/Makefile-tests.am +index 2c0916f6..b11fde89 100644 +--- a/Makefile-tests.am ++++ b/Makefile-tests.am +@@ -248,6 +248,13 @@ _installed_or_uninstalled_test_programs = tests/test-varint tests/test-ot-unix-u + tests/test-gpg-verify-result tests/test-checksum tests/test-lzma tests/test-rollsum \ + tests/test-basic-c tests/test-sysroot-c tests/test-pull-c tests/test-repo tests/test-include-ostree-h + ++if USE_LIBSOUP ++test_extra_programs += ostree-trivial-httpd ++ostree_trivial_httpd_SOURCES = src/ostree/ostree-trivial-httpd.c ++ostree_trivial_httpd_CFLAGS = $(common_tests_cflags) $(OT_INTERNAL_SOUP_CFLAGS) ++ostree_trivial_httpd_LDADD = $(common_tests_ldadd) $(OT_INTERNAL_SOUP_LIBS) ++endif ++ + if USE_AVAHI + test_programs += tests/test-repo-finder-avahi + endif +diff --git a/configure.ac b/configure.ac +index e6e145db..1e36e6a0 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -187,15 +187,6 @@ if test x$with_soup != xno; then OSTREE_FEATURES="$OSTREE_FEATURES libsoup"; fi + AM_CONDITIONAL(USE_LIBSOUP, test x$with_soup != xno) + AM_CONDITIONAL(HAVE_LIBSOUP_CLIENT_CERTS, test x$have_libsoup_client_certs = xyes) + +-AC_ARG_ENABLE(trivial-httpd-cmdline, +- [AS_HELP_STRING([--enable-trivial-httpd-cmdline], +- [Continue to support "ostree trivial-httpd" [default=no]])],, +- enable_trivial_httpd_cmdline=no) +-AM_CONDITIONAL(BUILDOPT_TRIVIAL_HTTPD, test x$enable_trivial_httpd_cmdline = xyes) +-AM_COND_IF(BUILDOPT_TRIVIAL_HTTPD, +- [AC_DEFINE([BUILDOPT_ENABLE_TRIVIAL_HTTPD_CMDLINE], 1, [Define if we are enabling ostree trivial-httpd entrypoint])] +-) +- + AS_IF([test x$with_curl = xyes && test x$with_soup = xno], [ + AC_MSG_WARN([Curl enabled, but libsoup is not; libsoup is needed for tests (make check, etc.)]) + ]) +@@ -602,7 +593,6 @@ echo " + Rust (internal oxidation): $rust_debug_release + rofiles-fuse: $enable_rofiles_fuse + HTTP backend: $fetcher_backend +- \"ostree trivial-httpd\": $enable_trivial_httpd_cmdline + SELinux: $with_selinux + cryptographic checksums: $with_crypto + systemd: $have_libsystemd +diff --git a/man/ostree-trivial-httpd.xml b/man/ostree-trivial-httpd.xml +deleted file mode 100644 +index d03c12be..00000000 +--- a/man/ostree-trivial-httpd.xml ++++ /dev/null +@@ -1,118 +0,0 @@ +-<?xml version='1.0'?> <!--*-nxml-*--> +-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" +- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> +- +-<!-- +-Copyright 2011,2013 Colin Walters <walters@verbum.org> +- +-SPDX-License-Identifier: LGPL-2.0+ +- +-This library is free software; you can redistribute it and/or +-modify it under the terms of the GNU Lesser General Public +-License as published by the Free Software Foundation; either +-version 2 of the License, or (at your option) any later version. +- +-This library is distributed in the hope that it will be useful, +-but WITHOUT ANY WARRANTY; without even the implied warranty of +-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +-Lesser General Public License for more details. +- +-You should have received a copy of the GNU Lesser General Public +-License along with this library; if not, write to the +-Free Software Foundation, Inc., 59 Temple Place - Suite 330, +-Boston, MA 02111-1307, USA. +---> +- +-<refentry id="ostree"> +- +- <refentryinfo> +- <title>ostree trivial-httpd</title> +- <productname>OSTree</productname> +- +- <authorgroup> +- <author> +- <contrib>Developer</contrib> +- <firstname>Colin</firstname> +- <surname>Walters</surname> +- <email>walters@verbum.org</email> +- </author> +- </authorgroup> +- </refentryinfo> +- +- <refmeta> +- <refentrytitle>ostree trivial-httpd</refentrytitle> +- <manvolnum>1</manvolnum> +- </refmeta> +- +- <refnamediv> +- <refname>ostree-trivial-httpd</refname> +- <refpurpose>Simple webserver</refpurpose> +- </refnamediv> +- +- <refsynopsisdiv> +- <cmdsynopsis> +- <command>ostree trivial-httpd</command> <arg choice="opt" rep="repeat">OPTIONS</arg> <arg choice="opt">DIR</arg> +- </cmdsynopsis> +- </refsynopsisdiv> +- +-<!-- Don't entirely understand this command. Needs details, better content--> +- <refsect1> +- <title>Description</title> +- +- <para> +- This runs a simple webserver and keeps it running until killed. If DIR is not specified, it defaults to the current directory. +- </para> +- </refsect1> +- +- <refsect1> +- <title>Options</title> +- +- <variablelist> +- <varlistentry> +- <term><option>--daemonize</option>,<option>-d</option></term> +- +- <listitem><para> +- Fork into background when ready. +- </para></listitem> +- </varlistentry> +- +- <varlistentry> +- <term><option>--autoexit</option></term> +- +- <listitem><para> +- Automatically exit when directory is deleted. +- </para></listitem> +- </varlistentry> +- +- <varlistentry> +- <term><option>--port-file</option>,<option>-p</option>="PATH"</term> +- +- <listitem><para> +- Write port number to PATH (- for standard output). +- </para></listitem> +- </varlistentry> +- +- <varlistentry> +- <term><option>--port</option>,<option>-P</option></term> +- +- <listitem><para> +- Use the specified TCP port to listen on. +- </para></listitem> +- </varlistentry> +- +- <varlistentry> +- <term><option>--force-range-requests</option></term> +- +- <listitem><para> +- Force range requests by only serving half of files. +- </para></listitem> +- </varlistentry> +- </variablelist> +- </refsect1> +- +-<!-- NEED EXAMPLE OUTPUT HERE!--> +- <refsect1> +- <title>Example</title> +- <para><command>$ ostree trivial-httpd</command></para> +- </refsect1> +-</refentry> +diff --git a/src/ostree/main.c b/src/ostree/main.c +index c5b45012..6478a62b 100644 +--- a/src/ostree/main.c ++++ b/src/ostree/main.c +@@ -116,11 +116,6 @@ static OstreeCommand commands[] = { + { "summary", OSTREE_BUILTIN_FLAG_NONE, + ostree_builtin_summary, + "Manage summary metadata" }, +-#if defined(HAVE_LIBSOUP) && defined(BUILDOPT_ENABLE_TRIVIAL_HTTPD_CMDLINE) +- { "trivial-httpd", OSTREE_BUILTIN_FLAG_NONE, +- ostree_builtin_trivial_httpd, +- NULL }, +-#endif + { NULL } + }; + +diff --git a/tests/libtest.sh b/tests/libtest.sh +index e0022512..b07dc962 100755 +--- a/tests/libtest.sh ++++ b/tests/libtest.sh +@@ -149,15 +149,12 @@ fi + if test -n "${OSTREE_UNINSTALLED:-}"; then + OSTREE_HTTPD=${OSTREE_UNINSTALLED}/ostree-trivial-httpd + else +- # trivial-httpd is now in $libexecdir by default, which we don't +- # know at this point. Fortunately, libtest.sh is also in +- # $libexecdir, so make an educated guess. If it's not found, assume +- # it's still runnable as "ostree trivial-httpd". +- if [ -x "${test_srcdir}/../../libostree/ostree-trivial-httpd" ]; then +- OSTREE_HTTPD="${CMD_PREFIX} ${test_srcdir}/../../libostree/ostree-trivial-httpd" +- else +- OSTREE_HTTPD="${CMD_PREFIX} ostree trivial-httpd" ++ # trivial-httpd is now the test directory. ++ OSTREE_HTTPD="${G_TEST_BUILDDIR}/ostree-trivial-httpd" ++ if ! [ -x "${OSTREE_HTTPD}" ]; then ++ fatal "Failed to find ${OSTREE_HTTPD}" + fi ++ OSTREE_HTTPD="${CMD_PREFIX} ${OSTREE_HTTPD}" + fi + + files_are_hardlinked() { +-- +2.22.0 + diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix index 0054e38ed2d..9f423cf6a4d 100644 --- a/pkgs/tools/misc/ostree/default.nix +++ b/pkgs/tools/misc/ostree/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "ostree"; - version = "2019.1"; + version = "2019.2"; outputs = [ "out" "dev" "man" "installedTests" ]; src = fetchurl { url = "https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz"; - sha256 = "08y7nsxl305dnlfak4kyj88lld848y4kg6bvjqngcxaqqvkk9xqm"; + sha256 = "0nbbrz3p4ms6vpl272q6fimqvizryw2a8mnfqcn69xf03sz5204y"; }; patches = [ @@ -22,10 +22,7 @@ stdenv.mkDerivation rec { ./disable-test-gpg-verify-result.patch # Tests access the helper using relative path # https://github.com/ostreedev/ostree/issues/1593 - (fetchpatch { - url = https://github.com/ostreedev/ostree/pull/1633.patch; - sha256 = "07xiw1dr7j4yw3w92qhw37f9crlglibflcqj2kf0v5gfrl9i6g4j"; - }) + ./01-Drop-ostree-trivial-httpd-CLI-move-to-tests-director.patch ]; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/ostree/disable-test-gpg-verify-result.patch b/pkgs/tools/misc/ostree/disable-test-gpg-verify-result.patch index d3ef7e08357..8da2fb82dd0 100644 --- a/pkgs/tools/misc/ostree/disable-test-gpg-verify-result.patch +++ b/pkgs/tools/misc/ostree/disable-test-gpg-verify-result.patch @@ -1,12 +1,12 @@ -diff -aur --no-dereference a/Makefile-tests.am b/Makefile-tests.am ---- a/Makefile-tests.am 1970-01-01 01:00:01.000000000 +0100 -+++ b/Makefile-tests.am 2018-09-17 00:24:11.977841113 +0200 -@@ -243,7 +243,7 @@ +diff --git a/Makefile-tests.am b/Makefile-tests.am +index b11fde89..82937a67 100644 +--- a/Makefile-tests.am ++++ b/Makefile-tests.am +@@ -245,7 +245,6 @@ endif _installed_or_uninstalled_test_programs = tests/test-varint tests/test-ot-unix-utils tests/test-bsdiff tests/test-mutable-tree \ tests/test-keyfile-utils tests/test-ot-opt-utils tests/test-ot-tool-util \ - tests/test-gpg-verify-result tests/test-checksum tests/test-lzma tests/test-rollsum \ -+ tests/test-checksum tests/test-lzma tests/test-rollsum \ tests/test-basic-c tests/test-sysroot-c tests/test-pull-c tests/test-repo tests/test-include-ostree-h - if USE_AVAHI + if USE_LIBSOUP diff --git a/pkgs/tools/misc/ostree/fix-1592.patch b/pkgs/tools/misc/ostree/fix-1592.patch index f26a924c0d8..1eccd74bfa7 100644 --- a/pkgs/tools/misc/ostree/fix-1592.patch +++ b/pkgs/tools/misc/ostree/fix-1592.patch @@ -1,6 +1,7 @@ -diff -aur --no-dereference a/tests/pull-test.sh b/tests/pull-test.sh ---- a/tests/pull-test.sh 1970-01-01 01:00:01.000000000 +0100 -+++ b/tests/pull-test.sh 2018-09-16 23:55:44.214593856 +0200 +diff --git a/tests/pull-test.sh b/tests/pull-test.sh +index a8bc49a9..4a08ebb5 100644 +--- a/tests/pull-test.sh ++++ b/tests/pull-test.sh @@ -275,7 +275,7 @@ if ${CMD_PREFIX} ostree --repo=mirrorrepo-local pull-local otherrepo 2>err.txt; then fatal "pull with mixed refs succeeded?" @@ -19,23 +20,62 @@ diff -aur --no-dereference a/tests/pull-test.sh b/tests/pull-test.sh echo "ok pull-local nonexistent branch" cd ${test_tmpdir} -@@ -587,5 +587,5 @@ +@@ -593,5 +593,5 @@ if ${CMD_PREFIX} ostree --repo=repo pull origin main 2>err.txt; then fatal "pull of invalid ref succeeded" fi -assert_file_has_content_literal err.txt 'error: Fetching checksum for ref ((empty), main): Invalid rev lots of html here lots of html here lots of html here lots of' +assert_file_has_content_literal err.txt 'Fetching checksum for ref ((empty), main): Invalid rev lots of html here lots of html here lots of html here lots of' echo "ok pull got HTML for a ref" -diff -aur --no-dereference a/tests/test-fsck-collections.sh b/tests/test-fsck-collections.sh ---- a/tests/test-fsck-collections.sh 1970-01-01 01:00:01.000000000 +0100 -+++ b/tests/test-fsck-collections.sh 2018-09-17 02:22:48.922502037 +0200 +diff --git a/tests/test-config.sh b/tests/test-config.sh +index 7e913d32..69d1675d 100755 +--- a/tests/test-config.sh ++++ b/tests/test-config.sh +@@ -46,7 +46,7 @@ + if ${CMD_PREFIX} ostree config --repo=repo get --group=core lock-timeout-secs extra 2>err.txt; then + assert_not_reached "ostree config get should error out if too many arguments are given" + fi +-assert_file_has_content err.txt "error: Too many arguments given" ++assert_file_has_content err.txt "Too many arguments given" + echo "ok config get" + + ${CMD_PREFIX} ostree config --repo=repo set core.mode bare-user-only +@@ -63,7 +63,7 @@ + if ${CMD_PREFIX} ostree config --repo=repo set --group=core lock-timeout-secs 120 extra 2>err.txt; then + assert_not_reached "ostree config set should error out if too many arguments are given" + fi +-assert_file_has_content err.txt "error: Too many arguments given" ++assert_file_has_content err.txt "Too many arguments given" + echo "ok config set" + + # Check that "ostree config unset" works +@@ -78,7 +78,7 @@ + fi + # Check for any character where quotation marks would be as they appear differently in the Fedora and Debian + # test suites (“” and '' respectively). See: https://github.com/ostreedev/ostree/pull/1839 +-assert_file_has_content err.txt "error: Key file does not have key .lock-timeout-secs. in group .core." ++assert_file_has_content err.txt "Key file does not have key .lock-timeout-secs. in group .core." + + # Check that it's idempotent + ${CMD_PREFIX} ostree config --repo=repo unset core.lock-timeout-secs +@@ -95,5 +95,5 @@ + if ${CMD_PREFIX} ostree config --repo=repo unset core.lock-timeout-secs extra 2>err.txt; then + assert_not_reached "ostree config unset should error out if too many arguments are given" + fi +-assert_file_has_content err.txt "error: Too many arguments given" ++assert_file_has_content err.txt "Too many arguments given" + echo "ok config unset" +diff --git a/tests/test-fsck-collections.sh b/tests/test-fsck-collections.sh +index dc6bcfeb..4a5eef55 100755 +--- a/tests/test-fsck-collections.sh ++++ b/tests/test-fsck-collections.sh @@ -100,7 +100,7 @@ if ${CMD_PREFIX} ostree fsck --repo=repo --verify-bindings > fsck 2> fsck-error; then assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!" fi -assert_file_has_content fsck-error "Commit has no requested ref ‘new-ref’ in ref binding metadata (‘ref1’)" +assert_file_has_content fsck-error "Commit has no requested ref .new-ref. in ref binding metadata (.ref1.)" - assert_file_has_content fsck "^Validating refs...$" + assert_file_has_content fsck "^Validating refs\.\.\.$" echo "ok 3 fsck detects missing ref bindings" @@ -113,7 +113,7 @@ @@ -44,26 +84,26 @@ diff -aur --no-dereference a/tests/test-fsck-collections.sh b/tests/test-fsck-co fi -assert_file_has_content fsck-error "Commit has no requested ref ‘new-ref’ in ref binding metadata (‘ref1’)" +assert_file_has_content fsck-error "Commit has no requested ref .new-ref. in ref binding metadata (.ref1.)" - assert_file_has_content fsck "^Validating refs...$" - assert_file_has_content fsck "^Validating refs in collections...$" + assert_file_has_content fsck "^Validating refs\.\.\.$" + assert_file_has_content fsck "^Validating refs in collections\.\.\.$" @@ -127,7 +127,7 @@ if ${CMD_PREFIX} ostree fsck --repo=repo --verify-bindings > fsck 2> fsck-error; then assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!" fi --assert_file_has_content fsck-error "Commit has collection ID ‘org.example.Collection’ in collection binding metadata, while the remote it came from has collection ID ‘org.example.Collection2’" -+assert_file_has_content fsck-error "Commit has collection ID .org.example.Collection. in collection binding metadata, while the remote it came from has collection ID .org.example.Collection2." - assert_file_has_content fsck "^Validating refs...$" - assert_file_has_content fsck "^Validating refs in collections...$" +-assert_file_has_content fsck-error "Commit has collection ID ‘org\.example\.Collection’ in collection binding metadata, while the remote it came from has collection ID ‘org\.example\.Collection2’" ++assert_file_has_content fsck-error "Commit has collection ID .org\.example\.Collection. in collection binding metadata, while the remote it came from has collection ID .org\.example\.Collection2." + assert_file_has_content fsck "^Validating refs\.\.\.$" + assert_file_has_content fsck "^Validating refs in collections\.\.\.$" @@ -147,7 +147,7 @@ if ${CMD_PREFIX} ostree fsck --repo=repo --verify-back-refs > fsck 2> fsck-error; then assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!" fi --assert_file_has_content fsck-error "Collection–ref (org.example.Collection, ref1) in bindings for commit .* does not exist" -+assert_file_has_content fsck-error 'Collection.ref (org.example.Collection, ref1) in bindings for commit .* does not exist' - assert_file_has_content fsck "^Validating refs...$" - assert_file_has_content fsck "^Validating refs in collections...$" +-assert_file_has_content fsck-error "Collection–ref (org\.example\.Collection, ref1) in bindings for commit .* does not exist" ++assert_file_has_content fsck-error 'Collection.ref (org\.example\.Collection, ref1) in bindings for commit .* does not exist' + assert_file_has_content fsck "^Validating refs\.\.\.$" + assert_file_has_content fsck "^Validating refs in collections\.\.\.$" @@ -186,7 +186,7 @@ if ${CMD_PREFIX} ostree fsck --repo=repo --verify-bindings > fsck 2> fsck-error; then @@ -71,7 +111,7 @@ diff -aur --no-dereference a/tests/test-fsck-collections.sh b/tests/test-fsck-co fi -assert_file_has_content fsck-error "Commit has no requested ref ‘new-ref’ in ref binding metadata (‘ref3’, ‘ref4’)" +assert_file_has_content fsck-error "Commit has no requested ref .new-ref. in ref binding metadata (.ref3., .ref4.)" - assert_file_has_content fsck "^Validating refs...$" + assert_file_has_content fsck "^Validating refs\.\.\.$" echo "ok 9 fsck detects missing ref bindings" @@ -205,7 +205,7 @@ @@ -80,12 +120,13 @@ diff -aur --no-dereference a/tests/test-fsck-collections.sh b/tests/test-fsck-co fi -assert_file_has_content fsck-error "Ref ‘ref3’ in bindings for commit .* does not exist" +assert_file_has_content fsck-error 'Ref .ref3. in bindings for commit .* does not exist' - assert_file_has_content fsck "^Validating refs...$" + assert_file_has_content fsck "^Validating refs\.\.\.$" echo "ok 11 fsck ignores unreferenced ref bindings" -diff -aur --no-dereference a/tests/test-remote-add.sh b/tests/test-remote-add.sh ---- a/tests/test-remote-add.sh 1970-01-01 01:00:01.000000000 +0100 -+++ b/tests/test-remote-add.sh 2018-09-17 00:14:16.486788225 +0200 +diff --git a/tests/test-remote-add.sh b/tests/test-remote-add.sh +index bb7eae89..62a3bcd7 100755 +--- a/tests/test-remote-add.sh ++++ b/tests/test-remote-add.sh @@ -83,7 +83,7 @@ if $OSTREE remote delete nosuchremote 2>err.txt; then assert_not_reached "Deleting remote unexpectedly succeeded" diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 49611aa0c3f..06ae22c86ff 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl, makeWrapper, procps }: stdenv.mkDerivation rec { - name = "parallel-20190622"; + name = "parallel-20190722"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "1v5fbrxw9l1navmvxapb1raa2jr19vfjw3i28h7fgdqd8n6gs79z"; + sha256 = "19xwdkmia2dw2hry9sbaq0ln79qy9dsqx11hq2s9dcyvhhqqdl0f"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/pazi/cargo-lock.patch b/pkgs/tools/misc/pazi/cargo-lock.patch index 4be7aa44c9c..3abc3f0a2f8 100644 --- a/pkgs/tools/misc/pazi/cargo-lock.patch +++ b/pkgs/tools/misc/pazi/cargo-lock.patch @@ -6,8 +6,8 @@ index 074b0ca..22f3bc5 100644 [[package]] name = "pazi" --version = "0.1.0" -+version = "0.2.0" +-version = "0.2.0" ++version = "0.3.0" dependencies = [ - "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)", - "crossbeam-channel 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", + "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/pkgs/tools/misc/pazi/default.nix b/pkgs/tools/misc/pazi/default.nix index 48c248ad205..325ac044552 100644 --- a/pkgs/tools/misc/pazi/default.nix +++ b/pkgs/tools/misc/pazi/default.nix @@ -1,17 +1,19 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: +{ stdenv, fetchFromGitHub, rustPlatform, darwin }: rustPlatform.buildRustPackage rec { pname = "pazi"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "euank"; repo = pname; rev = "v${version}"; - sha256 = "12z2vyzmyxfq1krbbrjar7c2gvyq1969v16pb2pm7f4g4k24g0c8"; + sha256 = "1gnh6047hacavcb9bhps9d1zjns66rdbd158fw20kjp1lln5srrn"; }; - cargoSha256 = "1w97jvlamxlxkqpim5iyayhbsqvg3rqds2nxq1fk5imj4hbi3681"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + + cargoSha256 = "15s03vwgl6562n5h9r4d5kp2r168jakn5nwnyibmrs8r5q0idmjs"; cargoPatches = [ ./cargo-lock.patch ]; diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/tools/misc/pspg/default.nix index ea304d2aa89..1aaed4feafe 100644 --- a/pkgs/tools/misc/pspg/default.nix +++ b/pkgs/tools/misc/pspg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pspg-${version}"; - version = "1.6.5"; + version = "1.6.8"; src = fetchFromGitHub { owner = "okbob"; repo = "pspg"; rev = "${version}"; - sha256 = "0zz924fl0b99a09gi5l3vxv9dmxnkv1v679w6k9zf365b44z91ki"; + sha256 = "1lwzyimn28a7q8k2c8z7and4qhrdil0za8lixh96z6x4lcb0rz5q"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/misc/rpm-ostree/default.nix b/pkgs/tools/misc/rpm-ostree/default.nix index 0680f360209..409e65dff77 100644 --- a/pkgs/tools/misc/rpm-ostree/default.nix +++ b/pkgs/tools/misc/rpm-ostree/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, ostree, rpm, which, autoconf, automake, libtool, pkgconfig, cargo, rustc, gobject-introspection, gtk-doc, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_43, gperf, cmake, libcap, glib, systemd, json-glib, libarchive, libsolv, librepo, polkit, - bubblewrap, pcre, check, python }: + bubblewrap, pcre, check, python, json_c, libmodulemd_1, utillinux, sqlite, cppunit }: stdenv.mkDerivation rec { pname = "rpm-ostree"; - version = "2019.2"; + version = "2019.5"; src = fetchurl { url = "https://github.com/projectatomic/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "0sxjlcq15avb0fv6v89z2xrqv095dck4k5s9f0pk6y7sm063n2pk"; + sha256 = "0innbrjj086mslbf55bcvs9a3rv9hg1y2nhzxdjy3nhpqxqlzdnn"; }; patches = [ @@ -28,6 +28,8 @@ stdenv.mkDerivation rec { libcap ostree rpm glib systemd polkit bubblewrap json-glib libarchive libsolv librepo pcre check python + # libdnf + json_c libmodulemd_1 utillinux sqlite cppunit ]; configureFlags = [ diff --git a/pkgs/tools/misc/tmate/default.nix b/pkgs/tools/misc/tmate/default.nix index f5e1d69a039..c87fe8bf446 100644 --- a/pkgs/tools/misc/tmate/default.nix +++ b/pkgs/tools/misc/tmate/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "tmate-${version}"; - version = "2.2.1"; + version = "2.3.0"; src = fetchFromGitHub { owner = "tmate-io"; repo = "tmate"; rev = version; - sha256 = "0pfl9vrswzim9ydi1n652h3rax2zrmy6sqkp0r09yy3lw83h4y1r"; + sha256 = "0fwqhmkp1jfp8qk7497ws3nzvly7p06mv04z8z0qicn6a961v1sa"; }; dontUseCmakeConfigure = true; diff --git a/pkgs/tools/misc/tmpwatch/default.nix b/pkgs/tools/misc/tmpwatch/default.nix index 760f56726fa..d79e480327c 100644 --- a/pkgs/tools/misc/tmpwatch/default.nix +++ b/pkgs/tools/misc/tmpwatch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, psmisc }: stdenv.mkDerivation rec { name = "tmpwatch-2.11"; @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1m5859ngwx61l1i4s6fja2avf1hyv6w170by273w8nsin89825lk"; }; + configureFlags="--with-fuser=${psmisc}/bin/fuser"; + meta = with stdenv.lib; { homepage = https://fedorahosted.org/tmpwatch/; description = "Recursively searches through specified directories and removes files which have not been accessed in a specified period of time"; diff --git a/pkgs/tools/misc/watchexec/default.nix b/pkgs/tools/misc/watchexec/default.nix index d15bfb3887a..848a5858b91 100644 --- a/pkgs/tools/misc/watchexec/default.nix +++ b/pkgs/tools/misc/watchexec/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "watchexec"; - version = "1.10.2"; + version = "1.10.3"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "10h9g6r5zkm71zpr33imh49187xx1wcv9sw7bf5dllgnxabd0lql"; + sha256 = "0iaxicghvfy85hrxn151hz8frgfknk3s1z0ngjn7cv5x5zvfxspf"; }; cargoSha256 = "1sqwplvpg0n9j0h9j94m7a6ylgqi4y4wyx489y09z9gm7aqgrsjc"; diff --git a/pkgs/tools/misc/you-get/default.nix b/pkgs/tools/misc/you-get/default.nix index c00b832b961..a900e26019c 100644 --- a/pkgs/tools/misc/you-get/default.nix +++ b/pkgs/tools/misc/you-get/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "you-get"; - version = "0.4.1314"; + version = "0.4.1328"; # Tests aren't packaged, but they all hit the real network so # probably aren't suitable for a build environment anyway. @@ -10,7 +10,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "1pbyhk3078va7435bsvysy34bvx0zvwd2gk28cvqyn62vwkcjyig"; + sha256 = "1rbsf7dphvlzahrzgdj1bq62mqhp2fmr61lckcyzq6jdq3vsf0w8"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index e571f533399..1fe58f94504 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { # The websites youtube-dl deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2019.08.02"; + version = "2019.08.13"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "101b6jrf6ckbxrn76ppvgdyrb25p7d247kn8qgq7n476sfnkfg2p"; + sha256 = "0b94hrhbqa7jhn91pxsbphg2ylwkpkknb2y4v4sczp7rjvgmjgdj"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/zabbix-cli/default.nix b/pkgs/tools/misc/zabbix-cli/default.nix index 2218bb5a57a..a8b621e32ac 100644 --- a/pkgs/tools/misc/zabbix-cli/default.nix +++ b/pkgs/tools/misc/zabbix-cli/default.nix @@ -4,7 +4,7 @@ let in pythonPackages.buildPythonApplication rec { name = "zabbix-cli-${version}"; - version = "2.0.1"; + version = "2.1.1"; propagatedBuildInputs = with pythonPackages; [ ipaddr requests ]; @@ -17,7 +17,7 @@ in pythonPackages.buildPythonApplication rec { owner = "usit-gd"; repo = "zabbix-cli"; rev = version; - sha256 = "0kwrfgq6h26dajll11f21c8b799bsfl1axmk2fdghl1gclxra7ry"; + sha256 = "10a1cvjqwlqqfz52ajv9i53h6v95w8y7xmgqr79q2c4v1nz5bfks"; }; meta = with lib; { diff --git a/pkgs/tools/networking/axel/default.nix b/pkgs/tools/networking/axel/default.nix index 6aa357dacb6..afa6cef1524 100644 --- a/pkgs/tools/networking/axel/default.nix +++ b/pkgs/tools/networking/axel/default.nix @@ -1,22 +1,22 @@ { stdenv, fetchFromGitHub, autoreconfHook, autoconf-archive -, pkgconfig, gettext, libssl }: +, pkgconfig, gettext, libssl, txt2man }: stdenv.mkDerivation rec { pname = "axel"; - version = "2.17.3"; + version = "2.17.5"; src = fetchFromGitHub { owner = "axel-download-accelerator"; repo = pname; rev = "v${version}"; - sha256 = "0kdd2y92plv240ba2j3xrm0f8xygvm1ijghnric4whsnxvmgym7h"; + sha256 = "0kwfbwh9g2227icgykgwa057vll5rkgac3df0pby530bivqzzzlw"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig autoconf-archive ]; + nativeBuildInputs = [ autoreconfHook pkgconfig autoconf-archive txt2man ]; buildInputs = [ gettext libssl ]; - installFlags = [ "ETCDIR=$(out)/etc" ]; + installFlags = [ "ETCDIR=${placeholder "out"}/etc" ]; meta = with stdenv.lib; { description = "Console downloading program with some features for parallel connections for faster downloading"; diff --git a/pkgs/tools/networking/babeld/default.nix b/pkgs/tools/networking/babeld/default.nix index ce372f6b752..e593bccbd1d 100644 --- a/pkgs/tools/networking/babeld/default.nix +++ b/pkgs/tools/networking/babeld/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "babeld-1.8.5"; + name = "babeld-1.9.0"; src = fetchurl { url = "http://www.pps.univ-paris-diderot.fr/~jch/software/files/${name}.tar.gz"; - sha256 = "1i2v7npl9aykq8d6zhkinqnbdpqx5x910dqkrv30fib0fp19jb90"; + sha256 = "0g7nhvd0hhb3jxdzpbqdxnb68375vm6apj2wslkxb70ip6rkk2hj"; }; preBuild = '' diff --git a/pkgs/tools/networking/curlie/default.nix b/pkgs/tools/networking/curlie/default.nix new file mode 100644 index 00000000000..2073c0b8497 --- /dev/null +++ b/pkgs/tools/networking/curlie/default.nix @@ -0,0 +1,22 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "curlie"; + version = "1.2.0"; + + src= fetchFromGitHub { + owner = "rs"; + repo = pname; + rev = "v${version}"; + sha256 = "0jgwd1amwjpmfgg08j9m9i15rpxijhmld9najzqb2gf8c1n5d8cf"; + }; + + modSha256 = "18nwq99vv3nbdwfilfn8v64mn58jviwybi93li0lcg7779nxab3d"; + + meta = with lib; { + description = "Curlie is a frontend to curl that adds the ease of use of httpie, without compromising on features and performance"; + homepage = https://curlie.io/; + maintainers = with maintainers; [ ma27 ]; + license = licenses.mit; + }; +} diff --git a/pkgs/tools/networking/dd-agent/datadog-agent.nix b/pkgs/tools/networking/dd-agent/datadog-agent.nix index fbf7efb6933..d2ae24c8a71 100644 --- a/pkgs/tools/networking/dd-agent/datadog-agent.nix +++ b/pkgs/tools/networking/dd-agent/datadog-agent.nix @@ -3,6 +3,7 @@ let # keep this in sync with github.com/DataDog/agent-payload dependency payloadVersion = "4.7.1"; + python = pythonPackages.python; in buildGoPackage rec { name = "datadog-agent-${version}"; @@ -26,8 +27,6 @@ in buildGoPackage rec { goDeps = ./datadog-agent-deps.nix; goPackagePath = "github.com/${owner}/${repo}"; - # Explicitly set this here to allow it to be overridden. - python = pythonPackages.python; nativeBuildInputs = [ pkgconfig makeWrapper ]; buildInputs = [ systemd ]; diff --git a/pkgs/tools/networking/http-prompt/default.nix b/pkgs/tools/networking/http-prompt/default.nix index 78dc52905d8..cfd4658f63f 100644 --- a/pkgs/tools/networking/http-prompt/default.nix +++ b/pkgs/tools/networking/http-prompt/default.nix @@ -30,6 +30,6 @@ pythonPackages.buildPythonApplication rec { homepage = https://github.com/eliangcs/http-prompt; license = licenses.mit; maintainers = with maintainers; [ matthiasbeyer ]; - platforms = platforms.linux; # can only test on linux + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/tools/networking/httplz/cargo-lock.patch b/pkgs/tools/networking/httplz/cargo-lock.patch index d1640ebc43d..aa161460904 100644 --- a/pkgs/tools/networking/httplz/cargo-lock.patch +++ b/pkgs/tools/networking/httplz/cargo-lock.patch @@ -1,9 +1,11 @@ diff --git a/Cargo.lock b/Cargo.lock new file mode 100644 -index 0000000..ff2d50d +index 0000000..09a545a --- /dev/null +++ b/Cargo.lock -@@ -0,0 +1,1205 @@ +@@ -0,0 +1,1174 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. +[[package]] +name = "adler32" +version = "1.0.3" @@ -11,10 +13,10 @@ index 0000000..ff2d50d + +[[package]] +name = "aho-corasick" -+version = "0.7.3" ++version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -32,17 +34,16 @@ index 0000000..ff2d50d + +[[package]] +name = "atty" -+version = "0.2.11" ++version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", -+ "termion 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "autocfg" -+version = "0.1.2" ++version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -50,8 +51,8 @@ index 0000000..ff2d50d +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "safemem 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "safemem 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -59,17 +60,12 @@ index 0000000..ff2d50d +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "bitflags" -+version = "0.9.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "bitflags" -+version = "1.0.4" ++version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -77,8 +73,8 @@ index 0000000..ff2d50d +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -87,17 +83,12 @@ index 0000000..ff2d50d +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "brotli-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] -+name = "build_const" -+version = "0.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] +name = "byteorder" -+version = "1.3.1" ++version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -106,7 +97,7 @@ index 0000000..ff2d50d +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "bzip2-sys 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -114,18 +105,27 @@ index 0000000..ff2d50d +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "c2-chacha" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "cc" -+version = "1.0.35" ++version = "1.0.40" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "cfg-if" -+version = "0.1.7" ++version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -134,8 +134,8 @@ index 0000000..ff2d50d +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -147,59 +147,48 @@ index 0000000..ff2d50d +version = "0.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "core-foundation" -+version = "0.2.3" ++version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "core-foundation-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", ++ "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "core-foundation-sys" -+version = "0.2.3" ++version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "crc" -+version = "1.8.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "build_const 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+] + +[[package]] +name = "crc32fast" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "ctrlc" -+version = "3.1.2" ++version = "3.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "nix 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "nix 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "dtoa" -+version = "0.4.3" ++version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "embed-resource" -+version = "1.2.0" ++version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "vswhom 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -208,13 +197,13 @@ index 0000000..ff2d50d + +[[package]] +name = "flate2" -+version = "1.0.7" ++version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", -+ "miniz-sys 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", -+ "miniz_oxide_c_api 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "miniz-sys 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "miniz_oxide 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -241,37 +230,47 @@ index 0000000..ff2d50d +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] ++name = "getrandom" ++version = "0.1.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasi 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] +name = "httparse" -+version = "1.3.3" ++version = "1.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "https" -+version = "1.5.0" ++version = "1.5.1" +dependencies = [ + "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "brotli2 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "bzip2 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", + "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "ctrlc 3.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "embed-resource 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "flate2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "hyper-native-tls 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "iron 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ctrlc 3.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "embed-resource 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "flate2 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hyper-native-tls 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "iron 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazysort 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "md6 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "mime_guess 1.8.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "mime_guess 1.8.7 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rfsapi 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", + "trivial_colours 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicase 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicase 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -281,11 +280,11 @@ index 0000000..ff2d50d +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "httparse 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", + "language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", + "mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", + "traitobject 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -295,12 +294,12 @@ index 0000000..ff2d50d + +[[package]] +name = "hyper-native-tls" -+version = "0.2.4" ++version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "antidote 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.10.16 (registry+https://github.com/rust-lang/crates.io-index)", -+ "native-tls 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -315,15 +314,15 @@ index 0000000..ff2d50d + +[[package]] +name = "iron" -+version = "0.6.0" ++version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "hyper 0.10.16 (registry+https://github.com/rust-lang/crates.io-index)", -+ "hyper-native-tls 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hyper-native-tls 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "mime_guess 1.8.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "mime_guess 1.8.7 (registry+https://github.com/rust-lang/crates.io-index)", + "modifier 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "plugin 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", + "typemap 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -341,11 +340,6 @@ index 0000000..ff2d50d + +[[package]] +name = "lazy_static" -+version = "0.2.11" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "lazy_static" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + @@ -356,7 +350,7 @@ index 0000000..ff2d50d + +[[package]] +name = "libc" -+version = "0.2.53" ++version = "0.2.62" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -364,15 +358,15 @@ index 0000000..ff2d50d +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "log" -+version = "0.4.6" ++version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -386,12 +380,12 @@ index 0000000..ff2d50d +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "memchr" -+version = "2.2.0" ++version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -404,7 +398,7 @@ index 0000000..ff2d50d + +[[package]] +name = "mime_guess" -+version = "1.8.6" ++version = "1.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -415,60 +409,52 @@ index 0000000..ff2d50d + +[[package]] +name = "miniz-sys" -+version = "0.1.11" ++version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "miniz_oxide" -+version = "0.2.1" ++version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] -+name = "miniz_oxide_c_api" -+version = "0.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crc 1.8.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", -+ "miniz_oxide 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] +name = "modifier" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "native-tls" -+version = "0.1.5" ++version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", -+ "openssl 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl 0.10.24 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl-sys 0.9.49 (registry+https://github.com/rust-lang/crates.io-index)", + "schannel 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", -+ "security-framework 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", -+ "security-framework-sys 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", -+ "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "security-framework 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "security-framework-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "nix" -+version = "0.13.0" ++version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -477,49 +463,53 @@ index 0000000..ff2d50d +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "num-traits" -+version = "0.2.6" ++version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] + +[[package]] +name = "num_cpus" -+version = "1.10.0" ++version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] -+name = "numtoa" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] +name = "openssl" -+version = "0.9.24" ++version = "0.10.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", -+ "openssl-sys 0.9.43 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl-sys 0.9.49 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] ++name = "openssl-probe" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] +name = "openssl-sys" -+version = "0.9.43" ++version = "0.9.49" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", -+ "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "vcpkg 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pkg-config 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -564,7 +554,7 @@ index 0000000..ff2d50d + +[[package]] +name = "pkg-config" -+version = "0.3.14" ++version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -576,34 +566,27 @@ index 0000000..ff2d50d +] + +[[package]] -+name = "quote" -+version = "0.3.15" ++name = "ppv-lite86" ++version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] -+name = "rand" -+version = "0.4.6" ++name = "quote" ++version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", -+] + +[[package]] +name = "rand" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_jitter 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -611,28 +594,57 @@ index 0000000..ff2d50d +] + +[[package]] ++name = "rand" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "getrandom 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] +name = "rand_chacha" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] ++name = "rand_chacha" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] +name = "rand_core" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "rand_core" -+version = "0.4.0" ++version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] ++name = "rand_core" ++version = "0.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "getrandom 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] +name = "rand_hc" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -641,6 +653,14 @@ index 0000000..ff2d50d +] + +[[package]] ++name = "rand_hc" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] +name = "rand_isaac" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -650,11 +670,11 @@ index 0000000..ff2d50d + +[[package]] +name = "rand_jitter" -+version = "0.1.3" ++version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -665,8 +685,8 @@ index 0000000..ff2d50d +dependencies = [ + "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", + "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", +] @@ -676,8 +696,8 @@ index 0000000..ff2d50d +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -698,40 +718,28 @@ index 0000000..ff2d50d + +[[package]] +name = "redox_syscall" -+version = "0.1.54" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "redox_termios" -+version = "0.1.1" ++version = "0.1.56" +source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)", -+] + +[[package]] +name = "regex" -+version = "1.1.6" ++version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "aho-corasick 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "regex-syntax 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex-syntax 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)", + "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "regex-syntax" -+version = "0.6.6" ++version = "0.6.11" +source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", -+] + +[[package]] +name = "remove_dir_all" -+version = "0.5.1" ++version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -750,16 +758,8 @@ index 0000000..ff2d50d +] + +[[package]] -+name = "rustc_version" -+version = "0.2.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] +name = "safemem" -+version = "0.3.0" ++version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -773,38 +773,24 @@ index 0000000..ff2d50d + +[[package]] +name = "security-framework" -+version = "0.1.16" ++version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "core-foundation 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "core-foundation-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", -+ "security-framework-sys 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", ++ "core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "security-framework-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "security-framework-sys" -+version = "0.1.16" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "core-foundation-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "semver" -+version = "0.9.0" ++version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] -+name = "semver-parser" -+version = "0.7.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] +name = "serde" +version = "0.9.15" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -832,7 +818,7 @@ index 0000000..ff2d50d +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "dtoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", + "itoa 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", + "num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", @@ -845,7 +831,7 @@ index 0000000..ff2d50d + +[[package]] +name = "smallvec" -+version = "0.6.9" ++version = "0.6.10" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -872,23 +858,16 @@ index 0000000..ff2d50d +] + +[[package]] -+name = "tempdir" -+version = "0.3.7" ++name = "tempfile" ++version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "termion" -+version = "1.5.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", -+ "numtoa 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)", -+ "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", ++ "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -912,8 +891,8 @@ index 0000000..ff2d50d +version = "0.1.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", -+ "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -941,11 +920,6 @@ index 0000000..ff2d50d +] + +[[package]] -+name = "ucd-util" -+version = "0.1.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] +name = "unicase" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -955,7 +929,7 @@ index 0000000..ff2d50d + +[[package]] +name = "unicase" -+version = "2.3.0" ++version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -974,7 +948,7 @@ index 0000000..ff2d50d +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -1006,13 +980,8 @@ index 0000000..ff2d50d +] + +[[package]] -+name = "utf8-ranges" -+version = "1.0.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] +name = "vcpkg" -+version = "0.2.6" ++version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -1035,7 +1004,7 @@ index 0000000..ff2d50d +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "vswhom-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -1044,11 +1013,16 @@ index 0000000..ff2d50d +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] ++name = "wasi" ++version = "0.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] +name = "winapi" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1077,111 +1051,107 @@ index 0000000..ff2d50d + +[metadata] +"checksum adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7e522997b529f05601e05166c07ed17789691f562762c7f3b987263d2dedee5c" -+"checksum aho-corasick 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e6f484ae0c99fec2e858eb6134949117399f222608d84cadb3f58c1f97c2364c" ++"checksum aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d" +"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" +"checksum antidote 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "34fde25430d87a9388dadbe6e34d7f72a462c8b43ac8d309b42b0a8505d7e2a5" -+"checksum atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9a7d5b8723950951411ee34d271d99dddcc2035a16ab25310ea2c8cfd4369652" -+"checksum autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a6d640bee2da49f60a4068a7fae53acde8982514ab7bae8b8cea9e88cbcfd799" ++"checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90" ++"checksum autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "22130e92352b948e7e82a49cdb0aa94f2211761117f29e052dd397c1ac33542b" +"checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" +"checksum base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643" -+"checksum bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4efd02e230a02e18f92fc2735f44597385ed02ad8f831e7c1c1156ee5e1ab3a5" -+"checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12" ++"checksum bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3d155346769a6855b86399e9bc3814ab343cd3d62c7e985113d46a0ec3c281fd" +"checksum brotli-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4445dea95f4c2b41cde57cc9fee236ae4dbae88d8fcbdb4750fc1bb5d86aaecd" +"checksum brotli2 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0cb036c3eade309815c15ddbacec5b22c4d1f3983a774ab2eac2e3e9ea85568e" -+"checksum build_const 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "39092a32794787acd8525ee150305ff051b0aa6cc2abaf193924f5ab05425f39" -+"checksum byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a019b10a2a7cdeb292db131fc8113e57ea2a908f6e7894b0c3c671893b65dbeb" ++"checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5" +"checksum bzip2 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "42b7c3cbf0fa9c1b82308d57191728ca0256cb821220f4e2fd410a72ade26e3b" +"checksum bzip2-sys 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6584aa36f5ad4c9247f5323b0a42f37802b37a836f0ad87084d7a33961abe25f" -+"checksum cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)" = "5e5f3fee5eeb60324c2781f1e41286bdee933850fff9b3c672587fed5ec58c83" -+"checksum cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "11d43355396e872eefb45ce6342e4374ed7bc2b3a502d1b28e36d6e23c05d1f4" ++"checksum c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7d64d04786e0f528460fc884753cf8dddcc466be308f6026f8e355c41a0e4101" ++"checksum cc 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)" = "b548a4ee81fccb95919d4e22cfea83c7693ebfd78f0495493178db20b3139da7" ++"checksum cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33" +"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" +"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" -+"checksum core-foundation 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "25bfd746d203017f7d5cbd31ee5d8e17f94b6521c7af77ece6c9e4b2d4b16c67" -+"checksum core-foundation-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "065a5d7ffdcbc8fa145d6f0746f3555025b9097a9e9cda59f7467abae670c78d" -+"checksum crc 1.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d663548de7f5cca343f1e0a48d14dcfb0e9eb4e079ec58883b7251539fa10aeb" ++"checksum core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d" ++"checksum core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" +"checksum crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1" -+"checksum ctrlc 3.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5531b7f0698d9220b4729f8811931dbe0e91a05be2f7b3245fdc50dd856bae26" -+"checksum dtoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6d301140eb411af13d3115f9a562c85cc6b541ade9dfa314132244aaee7489dd" -+"checksum embed-resource 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee11dd277e159f3a7845341f8c800899cf918a366956e31dd52f35eff638a403" -+"checksum flate2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f87e68aa82b2de08a6e037f1385455759df6e445a8df5e005b4297191dbf18aa" ++"checksum ctrlc 3.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c7dfd2d8b4c82121dfdff120f818e09fc4380b0b7e17a742081a89b94853e87f" ++"checksum dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ea57b42383d091c85abcc2706240b94ab2a8fa1fc81c10ff23c4de06e2a90b5e" ++"checksum embed-resource 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9e691c6cebf9fc63d525a8308df4094f07dc8b391dad7fafd09b3c96081f834d" ++"checksum flate2 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)" = "2adaffba6388640136149e18ed080b77a78611c1e1d6de75aedcdf78df5d4682" +"checksum foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +"checksum foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" +"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" +"checksum gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)" = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" -+"checksum httparse 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e8734b0cfd3bc3e101ec59100e101c2eecd19282202e87808b3037b442777a83" ++"checksum getrandom 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "2512b3191f22e2763a5db387f1c9409379772e2050841722eb4a8c4f497bf096" ++"checksum httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9" +"checksum hyper 0.10.16 (registry+https://github.com/rust-lang/crates.io-index)" = "0a0652d9a2609a968c14be1a9ea00bf4b1d64e2e1f53a1b51b6fff3a6e829273" -+"checksum hyper-native-tls 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "72332e4a35d3059583623b50e98e491b78f8b96c5521fcb3f428167955aa56e8" ++"checksum hyper-native-tls 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6d375598f442742b0e66208ee12501391f1c7ac0bafb90b4fe53018f81f06068" +"checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" -+"checksum iron 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d8e17268922834707e1c29e8badbf9c712c9c43378e1b6a3388946baff10be2" ++"checksum iron 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c6d308ca2d884650a8bf9ed2ff4cb13fbb2207b71f64cda11dc9b892067295e8" +"checksum itoa 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8324a32baf01e2ae060e9de58ed0bc2320c9a2833491ee36cd3b4c414de4db8c" +"checksum language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a" -+"checksum lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73" +"checksum lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14" +"checksum lazysort 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d0e22ff43b231e0e2f87d74984e53ebc73b90ae13397e041214fb07efc64168f" -+"checksum libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)" = "ec350a9417dfd244dc9a6c4a71e13895a4db6b92f0b106f07ebbc3f3bc580cee" ++"checksum libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)" = "34fcd2c08d2f832f376f4173a231990fa5aef4e99fb569867318a227ef4c06ba" +"checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" -+"checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6" ++"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" +"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" +"checksum md6 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "54e5826684849cecd3fa05a6a5052c50a3542f163a9917ff0b91379426a2e45d" -+"checksum memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2efc7bc57c883d4a4d6e3246905283d8dae951bb3bd32f49d6ef297f546e1c39" ++"checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e" +"checksum mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ba626b8a6de5da682e1caa06bdb42a335aee5a84db8e5046a3e8ab17ba0a3ae0" -+"checksum mime_guess 1.8.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2d4c0961143b8efdcfa29c3ae63281601b446a4a668165454b6c90f8024954c5" -+"checksum miniz-sys 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "0300eafb20369952951699b68243ab4334f4b10a88f411c221d444b36c40e649" -+"checksum miniz_oxide 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c468f2369f07d651a5d0bb2c9079f8488a66d5466efe42d0c5c6466edcb7f71e" -+"checksum miniz_oxide_c_api 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b7fe927a42e3807ef71defb191dc87d4e24479b221e67015fe38ae2b7b447bab" ++"checksum mime_guess 1.8.7 (registry+https://github.com/rust-lang/crates.io-index)" = "0d977de9ee851a0b16e932979515c0f3da82403183879811bc97d50bd9cc50f7" ++"checksum miniz-sys 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "1e9e3ae51cea1576ceba0dde3d484d30e6e5b86dee0b2d412fe3a16a15c98202" ++"checksum miniz_oxide 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7108aff85b876d06f22503dcce091e29f76733b2bfdd91eebce81f5e68203a10" +"checksum modifier 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "41f5c9112cb662acd3b204077e0de5bc66305fa8df65c8019d5adb10e9ab6e58" -+"checksum native-tls 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f74dbadc8b43df7864539cedb7bc91345e532fdd913cfdc23ad94f4d2d40fbc0" -+"checksum nix 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "46f0f3210768d796e8fa79ec70ee6af172dacbe7147f5e69be5240a47778302b" ++"checksum native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4b2df1a4c22fd44a62147fd8f13dd0f95c9d8ca7b2610299b2a2f9cf8964274e" ++"checksum nix 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6c722bee1037d430d0f8e687bbdbf222f27cc6e4e68d5caf630857bb2b6dbdce" +"checksum num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)" = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" -+"checksum num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0b3a5d7cc97d6d30d8b9bc8fa19bf45349ffe46241e8816f50f62f6d6aaabee1" -+"checksum num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1a23f0ed30a54abaa0c7e83b1d2d87ada7c3c23078d1d87815af3e3b6385fbba" -+"checksum numtoa 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef" -+"checksum openssl 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)" = "a3605c298474a3aa69de92d21139fb5e2a81688d308262359d85cdd0d12a7985" -+"checksum openssl-sys 0.9.43 (registry+https://github.com/rust-lang/crates.io-index)" = "33c86834957dd5b915623e94f2f4ab2c70dd8f6b70679824155d5ae21dbd495d" ++"checksum num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "6ba9a427cfca2be13aa6f6403b0b7e7368fe982bfa16fccc450ce74c46cd9b32" ++"checksum num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bcef43580c035376c0705c42792c294b66974abbfd2789b511784023f71f3273" ++"checksum openssl 0.10.24 (registry+https://github.com/rust-lang/crates.io-index)" = "8152bb5a9b5b721538462336e3bef9a539f892715e5037fda0f984577311af15" ++"checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" ++"checksum openssl-sys 0.9.49 (registry+https://github.com/rust-lang/crates.io-index)" = "f4fad9e54bd23bd4cbbe48fdc08a1b8091707ac869ef8508edea2fec77dcc884" +"checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" +"checksum phf 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18" +"checksum phf_codegen 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e" +"checksum phf_generator 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662" +"checksum phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0" -+"checksum pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)" = "676e8eb2b1b4c9043511a9b7bea0915320d7e502b0a079fb03f9635a5252b18c" ++"checksum pkg-config 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c1d2cfa5a714db3b5f24f0915e74fcdf91d09d496ba61329705dda7774d2af" +"checksum plugin 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "1a6a0dc3910bc8db877ffed8e457763b317cf880df4ae19109b9f77d277cf6e0" ++"checksum ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e3cbf9f658cdb5000fcf6f362b8ea2ba154b9f146a61c7a20d647034c6b6561b" +"checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a" -+"checksum rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" +"checksum rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" ++"checksum rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d47eab0e83d9693d40f825f86948aa16eff6750ead4bdffc4ab95b8b3a7f052c" +"checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" ++"checksum rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853" +"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" -+"checksum rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d0e7a549d590831370895ab7ba4ea0c1b6b011d106b5ff2da6eee112615e6dc0" ++"checksum rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" ++"checksum rand_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "615e683324e75af5d43d8f7a39ffe3ee4a9dc42c5c701167a71dc59c3a493aca" +"checksum rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" ++"checksum rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +"checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" -+"checksum rand_jitter 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b9ea758282efe12823e0d952ddb269d2e1897227e464919a554f2a03ef1b832" ++"checksum rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" +"checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" +"checksum rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" +"checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" +"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" -+"checksum redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)" = "12229c14a0f65c4f1cb046a3b52047cdd9da1f4b30f8a39c5063c8bae515e252" -+"checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76" -+"checksum regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "8f0a0bcab2fd7d1d7c54fa9eae6f43eddeb9ce2e7352f8518a814a4f65d60c58" -+"checksum regex-syntax 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "dcfd8681eebe297b81d98498869d4aae052137651ad7b96822f09ceb690d0a96" -+"checksum remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3488ba1b9a2084d38645c4c08276a1752dcbf2c7130d74f1569681ad5d2799c5" ++"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" ++"checksum regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88c3d9193984285d544df4a30c23a4e62ead42edf70a4452ceb76dac1ce05c26" ++"checksum regex-syntax 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)" = "b143cceb2ca5e56d5671988ef8b15615733e7ee16cd348e064333b251b89343f" ++"checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e" +"checksum rfsapi 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1b6fbc119d00459f80252adb96e554766d75de071ed5d3c49f46a000d137cd49" -+"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -+"checksum safemem 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8dca453248a96cb0749e36ccdfe2b0b4e54a61bfef89fb97ec621eb8e0a93dd9" ++"checksum safemem 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e133ccc4f4d1cd4f89cc8a7ff618287d56dc7f638b8e38fc32c5fdcadc339dd5" +"checksum schannel 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "f2f6abf258d99c3c1c5c2131d99d064e94b7b3dd5f416483057f308fea253339" -+"checksum security-framework 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "dfa44ee9c54ce5eecc9de7d5acbad112ee58755239381f687e564004ba4a2332" -+"checksum security-framework-sys 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "5421621e836278a0b139268f36eee0dc7e389b784dc3f79d8f11aabadf41bead" -+"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -+"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" ++"checksum security-framework 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "eee63d0f4a9ec776eeb30e220f0bc1e092c3ad744b2a379e3993070364d3adc2" ++"checksum security-framework-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9636f8989cbf61385ae4824b98c1aaa54c994d7d8b41f11c601ed799f0549a56" +"checksum serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)" = "34b623917345a631dc9608d5194cc206b3fe6c3554cd1c75b937e55e285254af" +"checksum serde_codegen_internals 0.14.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bc888bd283bd2420b16ad0d860e35ad8acb21941180a83a189bb2046f9d00400" +"checksum serde_derive 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)" = "978fd866f4d4872084a81ccc35e275158351d3b9fe620074e7d7504b816b74ba" +"checksum serde_json 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ad8bcf487be7d2e15d3d543f04312de991d631cfe1b43ea0ade69e6a8a5b16a1" +"checksum siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" -+"checksum smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)" = "c4488ae950c49d403731982257768f48fada354a5203fe81f9bb6f43ca9002be" ++"checksum smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ab606a9c5e214920bb66c458cd7be8ef094f813f20fe77a54cc7dbfff220d4b7" +"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" +"checksum syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad" +"checksum synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6" -+"checksum tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8" -+"checksum termion 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dde0593aeb8d47accea5392b39350015b5eccb12c0d98044d856983d89548dea" ++"checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" +"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" +"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" @@ -1189,22 +1159,21 @@ index 0000000..ff2d50d +"checksum trivial_colours 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7153365ea16c5a0ce2eebc4da1b33339a6b21d90c49f670e82130639656bb458" +"checksum typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1410f6f91f21d1612654e7cc69193b0334f909dcf2c790c4826254fbb86f8887" +"checksum typemap 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "653be63c80a3296da5551e1bfd2cca35227e13cdd08c6668903ae2f4f77aa1f6" -+"checksum ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "535c204ee4d8434478593480b8f86ab45ec9aae0e83c568ca81abf0fd0e88f86" +"checksum unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33" -+"checksum unicase 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "41d17211f887da8e4a70a45b9536f26fc5de166b81e2d5d80de4a17fd22553bd" ++"checksum unicase 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a84e5511b2a947f3ae965dcb29b13b7b1691b6e7332cf5dbc1744138d5acb7f6" +"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" +"checksum unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "141339a08b982d942be2ca06ff8b076563cbe223d1befd5450716790d44e2426" +"checksum unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526" +"checksum unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc" +"checksum unsafe-any 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f30360d7979f5e9c6e6cea48af192ea8fab4afb3cf72597154b8f08935bc9c7f" +"checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" -+"checksum utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "796f7e48bef87609f7ade7e06495a87d5cd06c7866e6a5cbfceffc558a243737" -+"checksum vcpkg 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "def296d3eb3b12371b2c7d0e83bfe1403e4db2d7a0bba324a12b21c4ee13143d" ++"checksum vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "33dd455d0f96e90a75803cfeb7f948768c08d70a6de9a8d2362461935698bf95" +"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" +"checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" +"checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" +"checksum vswhom 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b" +"checksum vswhom-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc2f5402d3d0e79a069714f7b48e3ecc60be7775a2c049cb839457457a239532" ++"checksum wasi 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fd5442abcac6525a045cc8c795aedb60da7a2e5e89c7bf18a0d5357849bb23c7" +"checksum winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770" +"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" +"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/pkgs/tools/networking/httplz/default.nix b/pkgs/tools/networking/httplz/default.nix index 21fc08a39a9..f8ea5f2dae6 100644 --- a/pkgs/tools/networking/httplz/default.nix +++ b/pkgs/tools/networking/httplz/default.nix @@ -1,21 +1,21 @@ -{ stdenv, fetchFromGitHub, rustPlatform, pkgs }: +{ stdenv, fetchFromGitHub, rustPlatform, pkgs, darwin }: rustPlatform.buildRustPackage rec { pname = "httplz"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "thecoshman"; repo = "http"; rev = "v${version}"; - sha256 = "0mb2wifz8pba03bdpiqadih33jimhg9crs4b72rcyfmj9l8fd1ba"; + sha256 = "00w8sy0m92by6lby1zb8hh36dnsrvwyyl56p6p7a1mf3iiq84r1y"; }; - buildInputs = with pkgs; [ openssl pkgconfig ]; + buildInputs = with pkgs; [ openssl pkgconfig ] ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; cargoBuildFlags = [ "--bin httplz" ]; cargoPatches = [ ./cargo-lock.patch ]; - cargoSha256 = "0cy23smal6y5qj6a202zf7l76vwkpzvcjmlbq0ffyph3gq07ps7b"; + cargoSha256 = "1axf15ma7fkbphjc6hjrbcj9rbd1x5i4kyz7fjrlqjgdsmvaqc93"; meta = with stdenv.lib; { description = "A basic http server for hosting a folder fast and simply"; diff --git a/pkgs/tools/networking/infiniband-diags/default.nix b/pkgs/tools/networking/infiniband-diags/default.nix deleted file mode 100644 index 81a43d672fd..00000000000 --- a/pkgs/tools/networking/infiniband-diags/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, rdma-core -, opensm, perl, makeWrapper }: - -stdenv.mkDerivation rec { - name = "infiniband-diags-${version}"; - version = "2.2.0"; - - src = fetchFromGitHub { - owner = "linux-rdma"; - repo = "infiniband-diags"; - rev = version; - sha256 = "0dhidwscvv8rffgjl6ygrz7daf61wbgabzhb6v8wh5kccml90mxi"; - }; - - nativeBuildInputs = [ autoconf automake libtool pkgconfig makeWrapper ]; - - buildInputs = [ rdma-core opensm perl ]; - - preConfigure = '' - export CFLAGS="-I${opensm}/include/infiniband" - ./autogen.sh - ''; - - configureFlags = [ "--with-perl-installdir=\${out}/${perl.libPrefix}" "--sbindir=\${out}/bin" ]; - - postInstall = '' - rmdir $out/var/run $out/var - ''; - - postFixup = '' - for pls in $out/bin/{ibfindnodesusing.pl,ibidsverify.pl}; do - echo "wrapping $pls" - wrapProgram $pls --prefix PERL5LIB : "$out/${perl.libPrefix}" - done - ''; - - meta = with stdenv.lib; { - description = "Utilities designed to help configure, debug, and maintain infiniband fabrics"; - homepage = http://linux-rdma.org/; - license = licenses.bsd2; # Or GPL 2 - maintainers = [ maintainers.aij ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/tools/networking/mcrcon/default.nix b/pkgs/tools/networking/mcrcon/default.nix index eda93c82cce..38b2aa531e6 100644 --- a/pkgs/tools/networking/mcrcon/default.nix +++ b/pkgs/tools/networking/mcrcon/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "mcrcon-${version}"; - version = "0.0.5"; + version = "0.6.1"; src = fetchFromGitHub { owner = "Tiiffi"; repo = "mcrcon"; rev = "v${version}"; - sha256 = "1pwr1cjldjy8bxqpp7w03nvdpw8l4vqfnk6w6b3mf0qpap1k700z"; + sha256 = "0as60cgl8sflykmwihc6axy1hzx6gjgjav6c7mvlbsc43dv8fs51"; }; buildPhase = '' diff --git a/pkgs/tools/networking/mtr/default.nix b/pkgs/tools/networking/mtr/default.nix index 59242551f92..d00e3737237 100644 --- a/pkgs/tools/networking/mtr/default.nix +++ b/pkgs/tools/networking/mtr/default.nix @@ -30,7 +30,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ libcap ncurses ] ++ stdenv.lib.optional withGtk gtk2; + buildInputs = [ ncurses ] + ++ stdenv.lib.optional withGtk gtk2 + ++ stdenv.lib.optional stdenv.isLinux libcap; enableParallelBuilding = true; diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index f2c83c661ae..c0e29c6538b 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -11,11 +11,11 @@ let pythonForDocs = python3.withPackages (pkgs: with pkgs; [ pygobject3 ]); in stdenv.mkDerivation rec { name = "network-manager-${version}"; - version = "1.18.1"; + version = "1.18.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "07vg2ryyjaxs5h8kmkwqhk4ki750c4di98g0i7h7zglfs16psiqd"; + sha256 = "1hx5dx5dgdqh3p8fq7q1pxy2bx2iymc74lj60ycrf7ydfjlprnad"; }; outputs = [ "out" "dev" "devdoc" "man" "doc" ]; @@ -28,6 +28,7 @@ in stdenv.mkDerivation rec { "-Ddnsmasq=${dnsmasq}/bin/dnsmasq" # Upstream prefers dhclient, so don't add dhcpcd to the closure "-Ddhcpcd=no" + "-Ddhcpcanon=no" "-Dpppd=${ppp}/bin/pppd" "-Diptables=${iptables}/bin/iptables" # to enable link-local connections @@ -49,6 +50,7 @@ in stdenv.mkDerivation rec { "-Dqt=false" # Allow using iwd when configured to do so "-Diwd=true" + "-Dlibaudit=yes-disabled-by-default" ]; patches = [ diff --git a/pkgs/tools/networking/ofono/default.nix b/pkgs/tools/networking/ofono/default.nix new file mode 100644 index 00000000000..1e5bd6b66f5 --- /dev/null +++ b/pkgs/tools/networking/ofono/default.nix @@ -0,0 +1,54 @@ +{ stdenv +, fetchgit +, autoreconfHook +, pkgconfig +, glib +, dbus +, ell +, systemd +, bluez +, mobile-broadband-provider-info +}: + +stdenv.mkDerivation rec { + pname = "ofono"; + version = "1.30"; + + outputs = [ "out" "dev" ]; + + src = fetchgit { + url = "git://git.kernel.org/pub/scm/network/ofono/ofono.git"; + rev = version; + sha256 = "1qzysmzpgbh6zc3x9xh931wxcazka9wwx727c2k66z9gal2n6n66"; + }; + + nativeBuildInputs = [ + autoreconfHook + pkgconfig + ]; + + buildInputs = [ + glib + dbus + ell + systemd + bluez + mobile-broadband-provider-info + ]; + + configureFlags = [ + "--with-dbusconfdir=${placeholder ''out''}/etc/dbus-1/system.d" + "--with-systemdunitdir=${placeholder ''out''}/lib/systemd/system" + "--enable-external-ell" + ]; + + doCheck = true; + + meta = with stdenv.lib; { + description = "Infrastructure for building mobile telephony (GSM/UMTS) applications"; + homepage = https://01.org/ofono; + license = licenses.gpl2; + maintainers = with maintainers; [ jtojnar ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/networking/openapi-generator-cli/default.nix b/pkgs/tools/networking/openapi-generator-cli/default.nix index 4f2a26de327..363963b1b14 100644 --- a/pkgs/tools/networking/openapi-generator-cli/default.nix +++ b/pkgs/tools/networking/openapi-generator-cli/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { - version = "4.0.1"; + version = "4.0.3"; pname = "openapi-generator-cli"; jarfilename = "${pname}-${version}.jar"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://central.maven.org/maven2/org/openapitools/${pname}/${version}/${jarfilename}"; - sha256 = "1fglvn6ricvb0csbrjkjfp902y6drjf6cby5fihmr5v9m7pjym1y"; + sha256 = "1x09db62i81gamj6pm9bng994z54y7gqc6wvj8hnn0j0ay9gkcf5"; }; phases = [ "installPhase" ]; diff --git a/pkgs/tools/networking/pptp/default.nix b/pkgs/tools/networking/pptp/default.nix index 03270ce8788..6a97abfab59 100644 --- a/pkgs/tools/networking/pptp/default.nix +++ b/pkgs/tools/networking/pptp/default.nix @@ -1,26 +1,29 @@ -{ stdenv, fetchurl, perl, ppp, iproute, which }: +{ stdenv, fetchurl, perl, ppp, iproute }: stdenv.mkDerivation rec { - name = "pptp-${version}"; + pname = "pptp"; version = "1.10.0"; src = fetchurl { - url = "mirror://sourceforge/pptpclient/${name}.tar.gz"; + url = "mirror://sourceforge/pptpclient/${pname}-${version}.tar.gz"; sha256 = "1x2szfp96w7cag2rcvkdqbsl836ja5148zzfhaqp7kl7wjw2sjc2"; }; - patchPhase = - '' - sed -e 's/install -o root/install/' -i Makefile - ''; - preConfigure = - '' - makeFlagsArray=( IP=${iproute}/bin/ip PPPD=${ppp}/sbin/pppd \ - BINDIR=$out/sbin MANDIR=$out/share/man/man8 \ - PPPDIR=$out/etc/ppp ) - ''; + prePatch = '' + substituteInPlace Makefile --replace 'install -o root' 'install' + ''; - nativeBuildInputs = [ perl which ]; + preConfigure = '' + makeFlagsArray=( IP=${iproute}/bin/ip PPPD=${ppp}/sbin/pppd \ + BINDIR=$out/sbin MANDIR=$out/share/man/man8 \ + PPPDIR=$out/etc/ppp ) + ''; + + buildInputs = [ perl ]; + + postFixup = '' + patchShebangs $out + ''; meta = with stdenv.lib; { description = "PPTP client for Linux"; diff --git a/pkgs/tools/networking/shadowsocks-libev/default.nix b/pkgs/tools/networking/shadowsocks-libev/default.nix index 26e932fc5d5..254e5d3e5d3 100644 --- a/pkgs/tools/networking/shadowsocks-libev/default.nix +++ b/pkgs/tools/networking/shadowsocks-libev/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "shadowsocks-libev"; - version = "3.3.0"; + version = "3.3.1"; # Git tag includes CMake build files which are much more convenient. src = fetchFromGitHub { owner = "shadowsocks"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "0f6fk7p49b1m78v4ipacbl522nma9b3qzrvihzp2mmsa6j3cysgr"; + sha256 = "0l15mbwlzx446rn5cix9f1726by62807bhnxkzknd41j7r937vyv"; fetchSubmodules = true; }; diff --git a/pkgs/tools/networking/tendermint/default.nix b/pkgs/tools/networking/tendermint/default.nix new file mode 100644 index 00000000000..a884ed0ccd4 --- /dev/null +++ b/pkgs/tools/networking/tendermint/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, buildGoModule }: + +buildGoModule rec { + pname = "tendermint"; + version = "0.32.2"; + + src = fetchFromGitHub { + owner = "tendermint"; + repo = pname; + rev = "d70135ec71979e7588c649c80f2acea65346a99a"; + sha256 = "062lzc1c96nwg22ql10mwjkxhq68lyak7s0id5y4f9mmj6d4rd69"; + }; + + modSha256 = "0hl8ly2qx0fv9diipqkcrlaz3ncsb2h81i0ccf5gn9cmyl37x0yk"; + + meta = with stdenv.lib; { + description = "Byzantine-Fault Tolerant State Machines. Or Blockchain, for short."; + homepage = https://tendermint.com/; + license = licenses.asl20; + maintainers = with maintainers; [ alexfmpe ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix index 5ec3199fb89..ddac709e577 100644 --- a/pkgs/tools/networking/whois/default.nix +++ b/pkgs/tools/networking/whois/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, perl, gettext, pkgconfig, libidn2, libiconv }: stdenv.mkDerivation rec { - version = "5.4.3"; + version = "5.5.0"; name = "whois-${version}"; src = fetchFromGitHub { owner = "rfc1036"; repo = "whois"; rev = "v${version}"; - sha256 = "0rf6ggk9y6gvhyj6zcjvjsbksal8pczlw905h70mgylq20qy3jr4"; + sha256 = "0h6lvsz868533irx68vd3hjhwcz93zh88axfq0qzji5ndc0ks4qb"; }; nativeBuildInputs = [ perl gettext pkgconfig ]; diff --git a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix index f75bf6bf162..3299ab8b63b 100644 --- a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix +++ b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, apacheAnt, jdk, axis2, dbus_java}: +{stdenv, fetchurl, apacheAnt, jdk, axis2, dbus_java, fetchpatch }: stdenv.mkDerivation { name = "DisnixWebService-0.8"; @@ -11,7 +11,14 @@ stdenv.mkDerivation { AXIS2_LIB = "${axis2}/lib"; AXIS2_WEBAPP = "${axis2}/webapps/axis2"; DBUS_JAVA_LIB = "${dbus_java}/share/java"; - patchPhase = '' + patches = [ + # Safe to remove once https://github.com/svanderburg/DisnixWebService/pull/1 is merged + (fetchpatch { + url = "https://github.com/mmahut/DisnixWebService/commit/cf07918b8c81b4ce01e0b489c1b5a3ef9c9a1cd6.patch"; + sha256 = "15zi1l69wzgwvvqx4492s7l444gfvc9vcm7ckgif4b6cvp837brn"; + }) + ]; + prePatch = '' sed -i -e "s|#JAVA_HOME=|JAVA_HOME=${jdk}|" \ -e "s|#AXIS2_LIB=|AXIS2_LIB=${axis2}/lib|" \ scripts/disnix-soap-client diff --git a/pkgs/tools/package-management/protontricks/default.nix b/pkgs/tools/package-management/protontricks/default.nix index ae8dfc59075..2683192c89e 100644 --- a/pkgs/tools/package-management/protontricks/default.nix +++ b/pkgs/tools/package-management/protontricks/default.nix @@ -4,13 +4,13 @@ buildPythonApplication rec { pname = "protontricks"; - version = "1.2.3"; + version = "1.2.4"; src = fetchFromGitHub { owner = "Matoking"; repo = pname; rev = version; - sha256 = "1v7bgr1rkm8j99s5bv45cslw01qcx8i8zb6ysfrb53qz86zgkgsn"; + sha256 = "0kwf2m62v4w7ds9y2fpcb8scazirkj114rn8y0ak62ph7lav8ma4"; }; propagatedBuildInputs = [ vdf ]; diff --git a/pkgs/tools/package-management/reuse/default.nix b/pkgs/tools/package-management/reuse/default.nix index 4e2c8a7b3a7..9e5a3f4d697 100644 --- a/pkgs/tools/package-management/reuse/default.nix +++ b/pkgs/tools/package-management/reuse/default.nix @@ -1,30 +1,25 @@ -{ lib, python3Packages, fetchFromGitLab }: +{ lib, python3Packages, fetchFromGitHub }: with python3Packages; buildPythonApplication rec { pname = "reuse"; - version = "0.3.4"; + version = "0.4.1"; - src = fetchFromGitLab { - owner = "reuse"; - repo = "reuse"; + src = fetchFromGitHub { + owner = "fsfe"; + repo = "reuse-tool"; rev = "v${version}"; - sha256 = "07acv02wignrsfhym2i3dhlcs501yj426lnff2cjampl6m5cgsk3"; + sha256 = "0gwipwikhxsk0p8wvdl90xm7chfi2jywb1namzznyymifl1vsbgh"; }; - propagatedBuildInputs = [ chardet debian pygit2 ]; + propagatedBuildInputs = [ debian license-expression requests ]; - checkInputs = [ pytest jinja2 ]; - - # Some path based tests are currently broken under nix - checkPhase = '' - pytest tests -k "not test_lint_none and not test_lint_ignore_debian and not test_lint_twice_path" - ''; + checkInputs = [ pytest ]; meta = with lib; { description = "A tool for compliance with the REUSE Initiative recommendations"; - license = with licenses; [ cc-by-sa-40 cc0 gpl3 ]; + license = with licenses; [ asl20 cc-by-sa-40 cc0 gpl3 ]; maintainers = [ maintainers.FlorianFranzen ]; }; } diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix new file mode 100644 index 00000000000..e6874d085d2 --- /dev/null +++ b/pkgs/tools/security/bitwarden/default.nix @@ -0,0 +1,87 @@ +{ atomEnv +, autoPatchelfHook +, dpkg +, fetchurl +, libsecret +, makeDesktopItem +, makeWrapper +, stdenv +, udev +, wrapGAppsHook +}: + +let + inherit (stdenv.hostPlatform) system; + + pname = "bitwarden"; + + version = { + "x86_64-linux" = "1.15.2"; + }.${system} or ""; + + sha256 = { + "x86_64-linux" = "0yz4hkqqwq2zrdjfxk5kybhs90n80k6bkn0625m47b09lwl2di4f"; + }.${system} or ""; + + meta = with stdenv.lib; { + description = "A secure and free password manager for all of your devices"; + homepage = "https://bitwarden.com"; + license = licenses.gpl3; + maintainers = with maintainers; [ kiwi ]; + platforms = [ "x86_64-linux" ]; + }; + + linux = stdenv.mkDerivation rec { + inherit pname version meta; + + src = fetchurl { + url = "https://github.com/bitwarden/desktop/releases/download/" + + "v${version}/Bitwarden-${version}-amd64.deb"; + inherit sha256; + }; + + desktopItem = makeDesktopItem { + name = "bitwarden"; + exec = "bitwarden %U"; + icon = "bitwarden"; + comment = "A secure and free password manager for all of your devices"; + desktopName = "Bitwarden"; + categories = "Utility"; + }; + + dontBuild = true; + dontConfigure = true; + dontPatchElf = true; + dontWrapGApps = true; + + buildInputs = [ libsecret ] ++ atomEnv.packages; + + nativeBuildInputs = [ dpkg makeWrapper autoPatchelfHook wrapGAppsHook ]; + + unpackPhase = "dpkg-deb -x $src ."; + + installPhase = '' + mkdir -p "$out/bin" + cp -R "opt" "$out" + cp -R "usr/share" "$out/share" + chmod -R g-w "$out" + + # Desktop file + mkdir -p "$out/share/applications" + cp "${desktopItem}/share/applications/"* "$out/share/applications" + ''; + + runtimeDependencies = [ + udev.lib + ]; + + postFixup = '' + makeWrapper $out/opt/Bitwarden/bitwarden $out/bin/bitwarden \ + --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libsecret stdenv.cc.cc ] }" \ + "''${gappsWrapperArgs[@]}" + ''; + }; + +in if stdenv.isDarwin +then throw "Bitwarden has not been packaged for macOS yet" +else linux diff --git a/pkgs/tools/security/ccid/default.nix b/pkgs/tools/security/ccid/default.nix index 6fbcffdae29..654d2dd6a7a 100644 --- a/pkgs/tools/security/ccid/default.nix +++ b/pkgs/tools/security/ccid/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pcsclite, pkgconfig, libusb1, perl }: stdenv.mkDerivation rec { - version = "1.4.30"; + version = "1.4.31"; name = "ccid-${version}"; src = fetchurl { url = "https://ccid.apdu.fr/files/${name}.tar.bz2"; - sha256 = "0z7zafdg75fr1adlv2x0zz34s07gljcjg2lsz76s1048w1xhh5xc"; + sha256 = "1xz8ikr6vk73w3xnwb931yq8lqc1zrj8c3v34n6h63irwjvdfj3b"; }; postPatch = '' diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix index 6b1d8e6c4f8..296080cbd8e 100644 --- a/pkgs/tools/security/fail2ban/default.nix +++ b/pkgs/tools/security/fail2ban/default.nix @@ -21,6 +21,9 @@ pythonPackages.buildPythonApplication { --replace /usr/sbin/sendmail sendmail \ --replace /usr/bin/whois whois done + + substituteInPlace config/filter.d/dovecot.conf \ + --replace dovecot.service dovecot2.service ''; doCheck = false; diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index a0b1f28854b..41a0d6eb7a5 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -15,12 +15,11 @@ buildGoPackage rec { sha256 = "0v3sx9hb03bdn4rvsv2r0jzif6p1rx47hrkpsbnwva31k396mck2"; }; - wrapperPath = with stdenv.lib; makeBinPath ([ + wrapperPath = stdenv.lib.makeBinPath ([ git gnupg xclip - wl-clipboard - ]); + ] ++ stdenv.lib.optional stdenv.isLinux wl-clipboard); postInstall = '' mkdir -p \ diff --git a/pkgs/tools/security/sequoia-tool/default.nix b/pkgs/tools/security/sequoia-tool/default.nix deleted file mode 100644 index 00472c1a3aa..00000000000 --- a/pkgs/tools/security/sequoia-tool/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchFromGitLab, rustPlatform, darwin -, pkgconfig, capnproto, clang, libclang, nettle, openssl, sqlite }: - -rustPlatform.buildRustPackage rec { - pname = "sequoia-tool"; - version = "0.9.0"; - - src = fetchFromGitLab { - owner = "sequoia-pgp"; - repo = "sequoia"; - rev = "v${version}"; - sha256 = "13dzwdzz33dy2lgnznsv8wqnw2501f2ggrkfwpqy5x6d1kgms8rj"; - }; - - nativeBuildInputs = [ pkgconfig clang libclang ]; - buildInputs = [ capnproto nettle openssl sqlite ] - ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; - - LIBCLANG_PATH = libclang + "/lib"; - - cargoBuildFlags = [ "--package=sequoia-tool" ]; - - cargoSha256 = "1zcnkpzcar3a2fk2rn3i3nb70b59ds9fpfa44f15r3aaxajsdhdi"; - - meta = with stdenv.lib; { - description = "A command-line frontend for Sequoia, an implementation of OpenPGP"; - homepage = https://sequoia-pgp.org/; - license = licenses.gpl3; - maintainers = with maintainers; [ minijackson ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/tools/security/sequoia/default.nix b/pkgs/tools/security/sequoia/default.nix new file mode 100644 index 00000000000..5d9ffca6937 --- /dev/null +++ b/pkgs/tools/security/sequoia/default.nix @@ -0,0 +1,91 @@ +{ stdenv, fetchFromGitLab, lib, darwin +, git, nettle, llvmPackages, cargo, rustc +, rustPlatform, pkgconfig, glib +, openssl, sqlite, capnproto +, ensureNewerSourcesForZipFilesHook, pythonSupport ? true, pythonPackages ? null +}: + +assert pythonSupport -> pythonPackages != null; + +rustPlatform.buildRustPackage rec { + pname = "sequoia"; + version = "0.9.0"; + + src = fetchFromGitLab { + owner = "sequoia-pgp"; + repo = pname; + rev = "v${version}"; + sha256 = "13dzwdzz33dy2lgnznsv8wqnw2501f2ggrkfwpqy5x6d1kgms8rj"; + }; + + cargoSha256 = "1zcnkpzcar3a2fk2rn3i3nb70b59ds9fpfa44f15r3aaxajsdhdi"; + + nativeBuildInputs = [ + pkgconfig + cargo + rustc + git + llvmPackages.libclang + llvmPackages.clang + ensureNewerSourcesForZipFilesHook + ] ++ + lib.optionals pythonSupport [ pythonPackages.setuptools ] + ; + + checkInputs = lib.optionals pythonSupport [ + pythonPackages.pytest + pythonPackages.pytestrunner + ]; + + buildInputs = [ + openssl + sqlite + nettle + capnproto + ] + ++ lib.optionals pythonSupport [ pythonPackages.python pythonPackages.cffi ] + ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ] + ; + + makeFlags = [ + "PREFIX=${placeholder ''out''}" + ]; + + buildFlags = [ + "build-release" + ]; + + LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; + + postPatch = '' + # otherwise, the check fails because we delete the `.git` in the unpack phase + substituteInPlace openpgp-ffi/Makefile \ + --replace 'git grep' 'grep -R' + # Without this, the check fails + substituteInPlace openpgp-ffi/examples/Makefile \ + --replace '-O0 -g -Wall -Werror' '-g' + substituteInPlace ffi/examples/Makefile \ + --replace '-O0 -g -Wall -Werror' '-g' + ''; + + preInstall = lib.optionalString pythonSupport '' + export installFlags="PYTHONPATH=$PYTHONPATH:$out/${pythonPackages.python.sitePackages}" + '' + lib.optionalString (!pythonSupport) '' + export installFlags="PYTHON=disable" + ''; + + # Don't use buildRustPackage phases, only use it for rust deps setup + configurePhase = null; + buildPhase = null; + doCheck = true; + checkPhase = null; + installPhase = null; + + meta = with stdenv.lib; { + description = "A cool new OpenPGP implementation"; + homepage = "https://sequoia-pgp.org/"; + license = licenses.gpl3; + maintainers = with maintainers; [ minijackson doronbehar ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/system/efivar/default.nix b/pkgs/tools/system/efivar/default.nix index e77d4487582..5c9b0292e5c 100644 --- a/pkgs/tools/system/efivar/default.nix +++ b/pkgs/tools/system/efivar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages, fetchFromGitHub, pkgconfig, popt }: +{ stdenv, buildPackages, fetchFromGitHub, fetchurl, pkgconfig, popt }: stdenv.mkDerivation rec { name = "efivar-${version}"; @@ -12,6 +12,13 @@ stdenv.mkDerivation rec { rev = version; sha256 = "1z2dw5x74wgvqgd8jvibfff0qhwkc53kxg54v12pzymyibagwf09"; }; + patches = [ + (fetchurl { + name = "r13y.patch"; + url = "https://patch-diff.githubusercontent.com/raw/rhboot/efivar/pull/133.patch"; + sha256 = "038cwldb8sqnal5l6mhys92cqv8x7j8rgsl8i4fiv9ih9znw26i6"; + }) + ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ popt ]; diff --git a/pkgs/tools/system/inxi/default.nix b/pkgs/tools/system/inxi/default.nix index c869c4b11a5..ee9554cc09f 100644 --- a/pkgs/tools/system/inxi/default.nix +++ b/pkgs/tools/system/inxi/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "inxi-${version}"; - version = "3.0.35-1"; + version = "3.0.36-1"; src = fetchFromGitHub { owner = "smxi"; repo = "inxi"; rev = version; - sha256 = "1rvidz2b9zp3ikkcjf8zr5r8r9mxnw3zgly2pvlim11kkp76zdl9"; + sha256 = "04134l323vwd0g2bffj11rnpw2jgs9la6aqrmv8vh7w9mq5nd57y"; }; buildInputs = [ perl ]; diff --git a/pkgs/tools/text/coloursum/default.nix b/pkgs/tools/text/coloursum/default.nix new file mode 100644 index 00000000000..49db5e13d72 --- /dev/null +++ b/pkgs/tools/text/coloursum/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + name = "coloursum-${version}"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "ticky"; + repo = "coloursum"; + rev = "v${version}"; + sha256 = "18ikwi0ihn0vadazrkh85jfz8a2f0dkfb3zns5jzh7p7mb0ylrr2"; + }; + + cargoSha256 = "0f73vqa82w4ccr0cc95mxga3r8jgd92jnksshxzaffbpx4s334p3"; + + meta = with stdenv.lib; { + description = "Colourise your checksum output"; + homepage = "https://github.com/ticky/coloursum"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ fgaz ]; + }; +} diff --git a/pkgs/tools/text/fanficfare/default.nix b/pkgs/tools/text/fanficfare/default.nix index c1345fc9537..87306a61e0d 100644 --- a/pkgs/tools/text/fanficfare/default.nix +++ b/pkgs/tools/text/fanficfare/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "FanFicFare"; - version = "3.9.0"; + version = "3.10.5"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0326fh72nihq4svgw7zvacij193ya66p102y1c7glpjq75kcx6a1"; + sha256 = "0bxz1a0ak6b6zj5xpkzwy8ikxf45kkxdj64sf4ilj43yaqicm0bw"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/text/mdbook/default.nix b/pkgs/tools/text/mdbook/default.nix index 52d197759ea..de395f183d1 100644 --- a/pkgs/tools/text/mdbook/default.nix +++ b/pkgs/tools/text/mdbook/default.nix @@ -2,23 +2,23 @@ rustPlatform.buildRustPackage rec { name = "mdbook-${version}"; - version = "0.1.8"; + version = "0.3.1"; src = fetchFromGitHub { owner = "rust-lang-nursery"; repo = "mdBook"; rev = "v${version}"; - sha256 = "1xmw4v19ff6mvimwk5l437wslzw5npy60zdb8r4319bjf32pw9pn"; + sha256 = "0py69267jbs6b7zw191hcs011cm1v58jz8mglqx3ajkffdfl3ghw"; }; - cargoSha256 = "1xpsc4qff2lrq15mz1gvmw6n5vl88sfwpjbsnp5ja5k1im156lam"; + cargoSha256 = "0qwhc42a86jpvjcaysmfcw8kmwa150lmz01flmlg74g6qnimff5m"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; meta = with stdenv.lib; { description = "Create books from MarkDown"; homepage = https://github.com/rust-lang-nursery/mdbook; - license = [ licenses.asl20 licenses.mit ]; + license = [ licenses.mpl20 ]; maintainers = [ maintainers.havvy ]; platforms = platforms.all; }; diff --git a/pkgs/tools/text/ocrmypdf/default.nix b/pkgs/tools/text/ocrmypdf/default.nix new file mode 100644 index 00000000000..514f3f67539 --- /dev/null +++ b/pkgs/tools/text/ocrmypdf/default.nix @@ -0,0 +1,103 @@ +{ fetchFromGitHub +, ghostscript +, img2pdf +, jbig2enc +, leptonica +, pngquant +, python3 +, python3Packages +, qpdf +, stdenv +, tesseract4 +, unpaper +}: + +let + inherit (python3Packages) buildPythonApplication; + + runtimeDeps = with python3Packages; [ + ghostscript + jbig2enc + leptonica + pngquant + qpdf + tesseract4 + unpaper + pillow + ]; + +in buildPythonApplication rec { + pname = "ocrmypdf"; + version = "8.2.3"; + disabled = ! python3Packages.isPy3k; + + src = fetchFromGitHub { + owner = "jbarlow83"; + repo = "OCRmyPDF"; + rev = "v${version}"; + sha256 = "1ldlyhxkav34y9d7g2kx3d4p26c2b82vnwi0ywnfynb16sav36d5"; + }; + + nativeBuildInputs = with python3Packages; [ + pytestrunner + setuptools + setuptools-scm-git-archive + setuptools_scm + ]; + + propagatedBuildInputs = with python3Packages; [ + cffi + chardet + img2pdf + pdfminer + pikepdf + reportlab + ruffus + ]; + + checkInputs = with python3Packages; [ + hocr-tools + pypdf2 + pytest + pytest-helpers-namespace + pytest_xdist + pytestcov + pytestrunner + python-xmp-toolkit + setuptools + ] ++ runtimeDeps; + + + postPatch = '' + substituteInPlace src/ocrmypdf/leptonica.py \ + --replace "ffi.dlopen(find_library('lept'))" \ + 'ffi.dlopen("${stdenv.lib.makeLibraryPath [leptonica]}/liblept${stdenv.hostPlatform.extensions.sharedLibrary}")' + ''; + + # The tests take potentially 20+ minutes, depending on machine + doCheck = false; + + # These tests fail and it might be upstream problem... or packaging. :) + # development is happening on macos and the pinned test versions are + # significantly newer than nixpkgs has. Program still works... + # (to the extent I've used it) -- Kiwi + checkPhase = '' + export HOME=$TMPDIR + pytest -k 'not test_force_ocr_on_pdf_with_no_images \ + and not test_tesseract_crash \ + and not test_tesseract_crash_autorotate \ + and not test_ghostscript_pdfa_failure \ + and not test_gs_render_failure \ + and not test_gs_raster_failure \ + and not test_bad_utf8 \ + and not test_old_unpaper' + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/jbarlow83/OCRmyPDF"; + description = "Adds an OCR text layer to scanned PDF files, allowing them to be searched"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.kiwi ]; + }; +} diff --git a/pkgs/tools/text/ripgrep-all/default.nix b/pkgs/tools/text/ripgrep-all/default.nix new file mode 100644 index 00000000000..a9253b02ddd --- /dev/null +++ b/pkgs/tools/text/ripgrep-all/default.nix @@ -0,0 +1,39 @@ +{ stdenv, lib, fetchFromGitHub, rustPlatform, makeWrapper, ffmpeg +, pandoc, poppler_utils, ripgrep, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "ripgrep-all"; + version = "0.9.2"; + + src = fetchFromGitHub { + owner = "phiresky"; + repo = pname; + rev = version; + sha256 = "1knv0gpanrid9i9mxg7zwqh9igdksp1623wl9iwmysiyaajlbif2"; + }; + + cargoSha256 = "0xwsx0x9n766bxamhnpzibrnvnqsxz3wh1f0rj29kbl32xl8yyfg"; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = lib.optional stdenv.isDarwin Security; + + postInstall = '' + wrapProgram $out/bin/rga \ + --prefix PATH ":" "${lib.makeBinPath [ ffmpeg pandoc poppler_utils ripgrep ]}" + ''; + + meta = with stdenv.lib; { + description = "Ripgrep, but also search in PDFs, E-Books, Office documents, zip, tar.gz, and more"; + longDescription = '' + Ripgrep, but also search in PDFs, E-Books, Office documents, zip, tar.gz, etc. + + rga is a line-oriented search tool that allows you to look for a regex in + a multitude of file types. rga wraps the awesome ripgrep and enables it + to search in pdf, docx, sqlite, jpg, movie subtitles (mkv, mp4), etc. + ''; + homepage = https://github.com/phiresky/ripgrep-all; + license = with licenses; [ agpl3Plus ]; + maintainers = with maintainers; [ zaninime ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/text/xml/xmloscopy/default.nix b/pkgs/tools/text/xml/xmloscopy/default.nix index 9703bd1ecea..5d085e41196 100644 --- a/pkgs/tools/text/xml/xmloscopy/default.nix +++ b/pkgs/tools/text/xml/xmloscopy/default.nix @@ -5,10 +5,10 @@ fzf, coreutils, libxml2, libxslt, jing, findutils, gnugrep, gnused, docbook5 }: stdenv.mkDerivation rec { - name = "xmloscopy-${version}"; - version = "0.1.2"; + pname = "xmloscopy"; + version = "0.1.3"; - buildInputs = [ + nativeBuildInputs = [ makeWrapper dev_only_shellcheck ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { owner = "grahamc"; repo = "xmloscopy"; rev = "v${version}"; - sha256 = "07fcnf1vv0x72lksl1v0frmlh73gca199ldqqbgdjpybjdffz456"; + sha256 = "06y5bckrmnq7b5ny2hfvlmdws910jw3xbw5nzy3bcpqsccqnjxrc"; }; installPhase = '' @@ -43,10 +43,11 @@ stdenv.mkDerivation rec { --set PATH "${spath}" ''; - meta = { + meta = with stdenv.lib; { description = "wtf is my docbook broken?"; homepage = https://github.com/grahamc/xmloscopy; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.all; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ grahamc ]; }; } diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index 23aca98ec81..a3b58e7274d 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -170,7 +170,7 @@ in platforms = lib.platforms.all; hydraPlatforms = lib.optionals (lib.elem pname ["scheme-small" "scheme-basic"]) platforms; - maintainers = with lib.maintainers; [ vcunat veprbl ]; + maintainers = with lib.maintainers; [ veprbl ]; } (combine { ${pname} = attrs; diff --git a/pkgs/tools/virtualization/cri-tools/default.nix b/pkgs/tools/virtualization/cri-tools/default.nix index 1435fd2bde0..e8e6a76a7a2 100644 --- a/pkgs/tools/virtualization/cri-tools/default.nix +++ b/pkgs/tools/virtualization/cri-tools/default.nix @@ -1,23 +1,26 @@ { buildGoPackage, fetchFromGitHub, lib }: -buildGoPackage -rec { +buildGoPackage rec { pname = "cri-tools"; - version = "1.14.0"; + version = "1.15.0"; src = fetchFromGitHub { - owner = "kubernetes-incubator"; + owner = "kubernetes-sigs"; repo = pname; rev = "v${version}"; - sha256 = "0v5i7shbn7b6av1d2z6r5czyjdll9i7xim9975lpnz1136xb6li7"; + sha256 = "03fhddncwqrdyxz43m3bak9dlrsqzibqqja3p94nic4ydk2hry62"; }; - goPackagePath = "github.com/kubernetes-incubator/cri-tools"; - subPackages = [ "cmd/crictl" "cmd/critest" ]; + goPackagePath = "github.com/kubernetes-sigs/cri-tools"; - meta = { + buildPhase = '' + pushd go/src/${goPackagePath} + make + ''; + + meta = with lib; { description = "CLI and validation tools for Kubelet Container Runtime Interface (CRI)"; homepage = https://github.com/kubernetes-sigs/cri-tools; license = lib.licenses.asl20; + maintainers = with maintainers; [ saschagrunert ]; }; } - diff --git a/pkgs/tools/virtualization/mininet/default.nix b/pkgs/tools/virtualization/mininet/default.nix index a2f4b165087..0ee27d36e0a 100644 --- a/pkgs/tools/virtualization/mininet/default.nix +++ b/pkgs/tools/virtualization/mininet/default.nix @@ -8,8 +8,8 @@ let pyEnv = python.withPackages(ps: [ ps.setuptools ]); in stdenv.mkDerivation rec { - name = "mininet-${version}"; - version = "2.3.0d4"; + pname = "mininet"; + version = "2.3.0d6"; outputs = [ "out" "py" ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "mininet"; repo = "mininet"; rev = version; - sha256 = "02hsqa7r5ykj8m1ycl32xwn1agjrw78wkq87xif0dl2vkzln41i4"; + sha256 = "0wc6gni9dxj9jjnw66a28jdvcfm8bxv1i776m5dh002bn5wjcl6x"; }; buildFlags = [ "mnexec" ]; @@ -40,8 +40,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Emulator for rapid prototyping of Software Defined Networks"; license = { - fullName = "Mininet 2.3.0d4 License"; + fullName = "Mininet 2.3.0d6 License"; }; + platforms = platforms.linux; homepage = https://github.com/mininet/mininet; maintainers = with maintainers; [ teto ]; }; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a1ad553e048..8c2cc75dc1b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -145,10 +145,12 @@ mapAliases ({ gupnptools = gupnp-tools; # added 2015-12-19 gutenberg = zola; # added 2018-11-17 heimdalFull = heimdal; # added 2018-05-01 + hepmc = hepmc2; # added 2019-08-05 hicolor_icon_theme = hicolor-icon-theme; # added 2018-02-25 htmlTidy = html-tidy; # added 2014-12-06 iana_etc = iana-etc; # added 2017-03-08 idea = jetbrains; # added 2017-04-03 + infiniband-diags = rdma-core; # added 2019-08-09 inotifyTools = inotify-tools; jbuilder = dune; # added 2018-09-09 joseki = apache-jena-fuseki; # added 2016-02-28 @@ -230,6 +232,7 @@ mapAliases ({ nmap_graphical = nmap-graphical; # added 2017-01-19 nologin = shadow; # added 2018-04-25 nxproxy = nx-libs; # added 2019-02-15 + nylas-mail-bin = throw "deprecated in 2019-09-11: abandoned by upstream"; opencascade_oce = opencascade; # added 2018-04-25 opencl-icd = ocl-icd; # added 2017-01-20 openexr_ctl = ctl; # added 2018-04-25 @@ -362,6 +365,7 @@ mapAliases ({ ucsFonts = ucs-fonts; # added 2016-07-15 ultrastardx-beta = ultrastardx; # added 2017-08-12 usb_modeswitch = usb-modeswitch; # added 2016-05-10 + v4l_utils = v4l-utils; # added 2019-08-07 vimbWrapper = vimb; # added 2015-01 vimprobable2Wrapper = vimprobable2; # added 2015-01 virtviewer = virt-viewer; # added 2015-12-24 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 77563721c58..f3a40002f7c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -169,6 +169,10 @@ in demoit = callPackage ../servers/demoit { }; + deviceTree = callPackage ../os-specific/linux/device-tree {}; + + device-tree_rpi = callPackage ../os-specific/linux/device-tree/raspberrypi.nix {}; + diffPlugins = (callPackage ../build-support/plugins.nix {}).diffPlugins; dieHook = makeSetupHook {} ../build-support/setup-hooks/die.sh; @@ -273,9 +277,9 @@ in fetchhg = callPackage ../build-support/fetchhg { }; # `fetchurl' downloads a file from the network. - fetchurl = import ../build-support/fetchurl { + fetchurl = makeOverridable (import ../build-support/fetchurl) { inherit lib stdenvNoCC; - curl = buildPackages.curl.override rec { + curl = buildPackages.curl.override (old: rec { # break dependency cycles fetchurl = stdenv.fetchurlBoot; zlib = buildPackages.zlib.override { fetchurl = stdenv.fetchurlBoot; }; @@ -292,7 +296,12 @@ in }; # On darwin, libkrb5 needs bootstrap_cmds which would require # converting many packages to fetchurl_boot to avoid evaluation cycles. - gssSupport = !stdenv.isDarwin && !stdenv.hostPlatform.isWindows; + # So turn gssSupport off there, and on Windows. + # On other platforms, keep the previous value. + gssSupport = + if stdenv.isDarwin || stdenv.hostPlatform.isWindows + then false + else old.gssSupport or true; # `? true` is the default libkrb5 = buildPackages.libkrb5.override { fetchurl = stdenv.fetchurlBoot; inherit pkgconfig perl openssl; @@ -304,7 +313,7 @@ in c-ares = buildPackages.c-ares.override { fetchurl = stdenv.fetchurlBoot; }; libev = buildPackages.libev.override { fetchurl = stdenv.fetchurlBoot; }; }; - }; + }); }; fetchRepoProject = callPackage ../build-support/fetchrepoproject { }; @@ -555,6 +564,8 @@ in antora = callPackage ../development/tools/documentation/antora {}; + apfs-fuse = callPackage ../tools/filesystems/apfs-fuse { }; + apktool = callPackage ../development/tools/apktool { inherit (androidenv.androidPkgs_9_0) build-tools; }; @@ -573,7 +584,8 @@ in arandr = callPackage ../tools/X11/arandr { }; - arangodb = callPackage ../servers/nosql/arangodb { }; + inherit (callPackages ../servers/nosql/arangodb { }) arangodb_3_2 arangodb_3_3 arangodb_3_4 arangodb_3_5; + arangodb = arangodb_3_4; arcanist = callPackage ../development/tools/misc/arcanist {}; @@ -700,14 +712,16 @@ in bcachefs-tools = callPackage ../tools/filesystems/bcachefs-tools { }; + bitwarden = callPackage ../tools/security/bitwarden { }; + + bitwarden-cli = callPackage ../tools/security/bitwarden-cli { }; + bitwarden_rs = callPackage ../tools/security/bitwarden_rs { inherit (darwin.apple_sdk.frameworks) Security CoreServices; }; bitwarden_rs-vault = callPackage ../tools/security/bitwarden_rs/vault.nix { }; - bitwarden-cli = callPackage ../tools/security/bitwarden-cli { }; - bmap-tools = callPackage ../tools/misc/bmap-tools { }; bonnie = callPackage ../tools/filesystems/bonnie { }; @@ -744,12 +758,16 @@ in chkcrontab = callPackage ../tools/admin/chkcrontab { }; + codespell = with python3Packages; toPythonApplication codespell; + cozy = callPackage ../applications/audio/cozy-audiobooks { }; ctrtool = callPackage ../tools/archivers/ctrtool { }; crumbs = callPackage ../applications/misc/crumbs { }; + crc32c = callPackage ../development/libraries/crc32c { }; + cue = callPackage ../development/tools/cue { }; deskew = callPackage ../applications/graphics/deskew { }; @@ -798,10 +816,14 @@ in git-repo-updater = python3Packages.callPackage ../development/tools/git-repo-updater { }; + git-revise = with python3Packages; toPythonApplication git-revise; + git-town = callPackage ../tools/misc/git-town { }; github-changelog-generator = callPackage ../development/tools/github-changelog-generator { }; + github-commenter = callPackage ../development/tools/github-commenter { }; + gitless = callPackage ../applications/version-management/gitless { }; gitter = callPackage ../applications/networking/instant-messengers/gitter { }; @@ -1200,6 +1222,8 @@ in buildah = callPackage ../development/tools/buildah { }; + buildkit = callPackage ../development/tools/buildkit { }; + bukubrow = callPackage ../tools/networking/bukubrow { }; burpsuite = callPackage ../tools/networking/burpsuite {}; @@ -1367,6 +1391,8 @@ in colorls = callPackage ../tools/system/colorls { }; + coloursum = callPackage ../tools/text/coloursum { }; + compsize = callPackage ../os-specific/linux/compsize { }; coturn = callPackage ../servers/coturn { }; @@ -1570,6 +1596,8 @@ in firecracker = callPackage ../applications/virtualization/firecracker { }; + firestarter = callPackage ../applications/misc/firestarter { }; + fsmon = callPackage ../tools/misc/fsmon { }; fsql = callPackage ../tools/misc/fsql { }; @@ -1660,6 +1688,8 @@ in gscan2pdf = callPackage ../applications/graphics/gscan2pdf { }; + gsctl = callPackage ../applications/misc/gsctl { }; + gti = callPackage ../tools/misc/gti { }; hdate = callPackage ../applications/misc/hdate { }; @@ -1674,6 +1704,8 @@ in hid-listen = callPackage ../tools/misc/hid-listen { }; + hocr-tools = with python3Packages; toPythonApplication hocr-tools; + home-manager = callPackage ../tools/package-management/home-manager {}; hostsblock = callPackage ../tools/misc/hostsblock { }; @@ -1756,6 +1788,8 @@ in mkspiffs-presets = recurseIntoAttrs (callPackages ../tools/filesystems/mkspiffs/presets.nix { }); + mlarchive2maildir = callPackage ../applications/networking/mailreaders/mlarchive2maildir { }; + monetdb = callPackage ../servers/sql/monetdb { }; mousetweaks = callPackage ../applications/accessibility/mousetweaks { @@ -1796,6 +1830,8 @@ in nyx = callPackage ../tools/networking/nyx { }; + ocrmypdf = callPackage ../tools/text/ocrmypdf { }; + onboard = callPackage ../applications/misc/onboard { }; xkbd = callPackage ../applications/misc/xkbd { }; @@ -2441,6 +2477,8 @@ in curl_unix_socket = callPackage ../tools/networking/curl-unix-socket rec { }; + curlie = callPackage ../tools/networking/curlie { }; + cunit = callPackage ../tools/misc/cunit { }; bcunit = callPackage ../tools/misc/bcunit { }; @@ -3433,6 +3471,8 @@ in google-music-scripts = callPackage ../tools/audio/google-music-scripts { }; + google-cloud-cpp = callPackage ../development/libraries/google-cloud-cpp { }; + gopro = callPackage ../tools/video/gopro { }; gource = callPackage ../applications/version-management/gource { }; @@ -3485,6 +3525,10 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; + ripgrep-all = callPackage ../tools/text/ripgrep-all { + inherit (darwin.apple_sdk.frameworks) Security; + }; + grive2 = callPackage ../tools/filesystems/grive2 { }; groff = callPackage ../tools/text/groff { @@ -3815,6 +3859,7 @@ in ifuse = callPackage ../tools/filesystems/ifuse { }; ideviceinstaller = callPackage ../tools/misc/ideviceinstaller { }; + idevicerestore = callPackage ../tools/misc/idevicerestore { }; inherit (callPackages ../tools/filesystems/irods rec { stdenv = llvmPackages_38.libcxxStdenv; @@ -3863,8 +3908,6 @@ in inetutils = callPackage ../tools/networking/inetutils { }; - infiniband-diags = callPackage ../tools/networking/infiniband-diags { }; - inform7 = callPackage ../development/compilers/inform7 { }; infamousPlugins = callPackage ../applications/audio/infamousPlugins { }; @@ -4757,8 +4800,6 @@ in mosh = callPackage ../tools/networking/mosh { }; - motuclient = callPackage ../applications/science/misc/motu-client { }; - mpage = callPackage ../tools/text/mpage { }; mprime = callPackage ../tools/misc/mprime { }; @@ -5486,6 +5527,8 @@ in pptpd = callPackage ../tools/networking/pptpd {}; + pre-commit = gitAndTools.pre-commit; + prettyping = callPackage ../tools/networking/prettyping { }; prey-bash-client = callPackage ../tools/security/prey { }; @@ -5932,7 +5975,9 @@ in seqdiag = with python3Packages; toPythonApplication seqdiag; - sequoia-tool = callPackage ../tools/security/sequoia-tool { inherit (llvmPackages) libclang; }; + sequoia = callPackage ../tools/security/sequoia { + pythonPackages = python3Packages; + }; sewer = callPackage ../tools/admin/sewer { }; @@ -6093,6 +6138,8 @@ in stdman = callPackage ../data/documentation/stdman { }; + stm32loader = with python3Packages; toPythonApplication stm32loader; + storebrowse = callPackage ../tools/system/storebrowse { }; stubby = callPackage ../tools/networking/stubby { }; @@ -6121,6 +6168,8 @@ in srcml = callPackage ../applications/version-management/srcml { }; + sourcehut = callPackage ../applications/version-management/sourcehut { }; + sshfs-fuse = callPackage ../tools/filesystems/sshfs-fuse { }; sshfs = sshfs-fuse; # added 2017-08-14 @@ -6355,6 +6404,8 @@ in tinyemu = callPackage ../applications/virtualization/tinyemu { }; + tinyprog = callPackage ../development/tools/misc/tinyprog { }; + tinyproxy = callPackage ../tools/networking/tinyproxy {}; tio = callPackage ../tools/misc/tio { }; @@ -7803,6 +7854,7 @@ in openjdk = openjdk11; }; + /* legacy jdk for use as needed by older apps */ openjdk8 = if stdenv.isDarwin then callPackage ../development/compilers/openjdk/darwin/8.nix { } @@ -7812,6 +7864,7 @@ in inherit (gnome2) GConf gnome_vfs; }; + /* currently maintained LTS JDK */ openjdk11 = if stdenv.isDarwin then callPackage ../development/compilers/openjdk/darwin/11.nix { } @@ -7821,6 +7874,26 @@ in inherit (gnome2) GConf gnome_vfs; }; + openjfx12 = + if stdenv.isDarwin then + null + else + callPackage ../development/compilers/openjdk/openjfx/12.nix { + openjdk = openjdk12; + bootjdk = openjdk11; + }; + + /* current JDK */ + openjdk12 = + if stdenv.isDarwin then + callPackage ../development/compilers/openjdk/darwin/default.nix { } + else + callPackage ../development/compilers/openjdk/default.nix { + openjfx = openjfx12; + inherit (gnome2) GConf gnome_vfs; + bootjdk = openjdk11; + }; + openjdk = openjdk8; jdk8 = if stdenv.isAarch32 || stdenv.isAarch64 then oraclejdk8 else openjdk8 // { outputs = [ "out" ]; }; @@ -7846,6 +7919,15 @@ in (lib.addMetaAttrs {} ((openjdk11.override { minimal = true; }) // {})); + jdk12 = openjdk12 // { outputs = [ "out" ]; }; + jdk12_headless = + if stdenv.isDarwin then + jdk12 + else + lib.setName "openjdk-${lib.getVersion pkgs.openjdk12}-headless" + (lib.addMetaAttrs {} + ((openjdk12.override { minimal = true; }) // {})); + jdk = jdk8; jre = if stdenv.isAarch32 || stdenv.isAarch64 then adoptopenjdk-jre-bin else jre8; jre_headless = jre8_headless; @@ -8210,6 +8292,8 @@ in inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; + sagittarius-scheme = callPackage ../development/compilers/sagittarius-scheme {}; + sbclBootstrap = callPackage ../development/compilers/sbcl/bootstrap.nix {}; sbcl = callPackage ../development/compilers/sbcl {}; @@ -8651,7 +8735,7 @@ in python3 = python37; pypy = pypy2; pypy2 = pypy27; - pypy3 = pypy35; + pypy3 = pypy36; # Python interpreter that is build with all modules, including tkinter. # These are for compatibility and should not be used inside Nixpkgs. @@ -8670,7 +8754,7 @@ in python3Packages = python3.pkgs; pythonInterpreters = callPackage ./../development/interpreters/python {}; - inherit (pythonInterpreters) python27 python35 python36 python37 python38 pypy27 pypy35; + inherit (pythonInterpreters) python27 python35 python36 python37 python38 pypy27 pypy36; # Python package sets. python27Packages = lib.hiPrioSet (recurseIntoAttrs python27.pkgs); @@ -8964,6 +9048,8 @@ in awf = callPackage ../development/tools/misc/awf { }; + electron_6 = callPackage ../development/tools/electron/6.x.nix { }; + electron_5 = callPackage ../development/tools/electron/5.x.nix { }; electron_4 = callPackage ../development/tools/electron { }; @@ -9051,11 +9137,7 @@ in bison = bison3; yacc = bison; # TODO: move to aliases.nix - blackmagic = callPackage ../development/tools/misc/blackmagic { - stdenv = gcc6Stdenv; - gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc; - binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils; - }; + blackmagic = callPackage ../development/tools/misc/blackmagic { }; bloaty = callPackage ../development/tools/bloaty { }; @@ -9347,6 +9429,8 @@ in flootty = callPackage ../development/tools/flootty { }; + fffuu = haskell.lib.justStaticExecutables (haskellPackages.callPackage ../tools/misc/fffuu { }); + flow = callPackage ../development/tools/analysis/flow { inherit (darwin.apple_sdk.frameworks) CoreServices; }; @@ -9383,6 +9467,8 @@ in flex_2_5_35 = callPackage ../development/tools/parsing/flex/2.5.35.nix { }; flex = callPackage ../development/tools/parsing/flex { }; + flexibee = callPackage ../applications/office/flexibee { }; + flexcpp = callPackage ../development/tools/parsing/flexc++ { }; geis = callPackage ../development/libraries/geis { @@ -9419,12 +9505,18 @@ in gputils = callPackage ../development/tools/misc/gputils { }; - gradleGen = callPackage ../development/tools/build-managers/gradle { }; + gradleGen = callPackage ../development/tools/build-managers/gradle { + java = jdk; + }; gradle = res.gradleGen.gradle_latest; - gradle_2_14 = res.gradleGen.gradle_2_14; gradle_2_5 = res.gradleGen.gradle_2_5; + gradle_2_14 = res.gradleGen.gradle_2_14; gradle_3_5 = res.gradleGen.gradle_3_5; gradle_4_10 = res.gradleGen.gradle_4_10; + gradle_2 = gradle_2_14; + gradle_3 = gradle_3_5; + gradle_4 = gradle_4_10; + gradle_5 = res.gradleGen.gradle_5_3; gperf = callPackage ../development/tools/misc/gperf { }; # 3.1 changed some parameters from int to size_t, leading to mismatches. @@ -9643,7 +9735,9 @@ in gconf = pkgs.gnome2.GConf; }; + # NOTE: Override and set icon-lang = null to use Awk instead of Icon. noweb = callPackage ../development/tools/literate-programming/noweb { }; + nuweb = callPackage ../development/tools/literate-programming/nuweb { tex = texlive.combined.scheme-small; }; nrfutil = callPackage ../development/tools/misc/nrfutil { }; @@ -9704,7 +9798,7 @@ in pprof = callPackage ../development/tools/profiling/pprof { }; - pyprof2calltree = pythonPackages.callPackage ../development/tools/profiling/pyprof2calltree { }; + pyprof2calltree = with python3Packages; toPythonApplication pyprof2calltree; prelink = callPackage ../development/tools/misc/prelink { }; @@ -9851,6 +9945,8 @@ in spoofer-gui = callPackage ../tools/networking/spoofer { withGUI = true; }; + spooles = callPackage ../development/libraries/science/math/spooles {}; + sqlcheck = callPackage ../development/tools/database/sqlcheck { }; sqlitebrowser = libsForQt5.callPackage ../development/tools/database/sqlitebrowser { }; @@ -9868,6 +9964,7 @@ in swig1 = callPackage ../development/tools/misc/swig { }; swig2 = callPackage ../development/tools/misc/swig/2.x.nix { }; swig3 = callPackage ../development/tools/misc/swig/3.x.nix { }; + swig4 = callPackage ../development/tools/misc/swig/4.nix { }; swig = swig3; swigWithJava = swig; @@ -9883,6 +9980,8 @@ in teensy-loader-cli = callPackage ../development/tools/misc/teensy-loader-cli { }; + terracognita = callPackage ../development/tools/misc/terracognita { }; + terraform-lsp = callPackage ../development/tools/misc/terraform-lsp { }; texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { }; @@ -10192,7 +10291,7 @@ in c-blosc = callPackage ../development/libraries/c-blosc { }; - cachix = callPackage ../development/tools/cachix { }; + cachix = haskell.lib.justStaticExecutables haskellPackages.cachix; capnproto = callPackage ../development/libraries/capnproto { }; @@ -10204,9 +10303,7 @@ in cdk = callPackage ../development/libraries/cdk {}; - cdo = callPackage ../development/libraries/cdo { - stdenv = gccStdenv; - }; + cdo = callPackage ../development/libraries/cdo { }; cimg = callPackage ../development/libraries/cimg { }; @@ -10695,6 +10792,8 @@ in ghp-import = callPackage ../development/tools/ghp-import { }; + ghcid = haskellPackages.ghcid.bin; + icon-lang = callPackage ../development/interpreters/icon-lang { }; libgit2 = callPackage ../development/libraries/git2 { @@ -10966,7 +11065,7 @@ in gdk-pixbuf = callPackage ../development/libraries/gdk-pixbuf { }; - gnome-sharp = callPackage ../development/libraries/gnome-sharp { mono = mono4; }; + gnome-sharp = callPackage ../development/libraries/gnome-sharp { }; gnome-menus = callPackage ../development/libraries/gnome-menus { }; @@ -11649,6 +11748,8 @@ in inherit (darwin.apple_sdk.frameworks) AudioUnit; }; + libsystemtap = callPackage ../development/libraries/libsystemtap { }; + libgtop = callPackage ../development/libraries/libgtop {}; libLAS = callPackage ../development/libraries/libLAS { }; @@ -11767,6 +11868,8 @@ in inherit (darwin.apple_sdk.frameworks) Carbon; }; + libirecovery = callPackage ../development/libraries/libirecovery { }; + libivykis = callPackage ../development/libraries/libivykis { }; liblastfmSF = callPackage ../development/libraries/liblastfmSF { }; @@ -11825,10 +11928,6 @@ in libplist = callPackage ../development/libraries/libplist { }; - libqglviewer = callPackage ../development/libraries/libqglviewer { - inherit (darwin.apple_sdk.frameworks) AGL; - }; - libre = callPackage ../development/libraries/libre {}; librem = callPackage ../development/libraries/librem {}; @@ -11975,6 +12074,8 @@ in libmodplug = callPackage ../development/libraries/libmodplug {}; + libmodule = callPackage ../development/libraries/libmodule { }; + libmpcdec = callPackage ../development/libraries/libmpcdec { }; libmp3splt = callPackage ../development/libraries/libmp3splt { }; @@ -12234,7 +12335,7 @@ in inherit (darwin.apple_sdk.frameworks) ApplicationServices CoreServices; }; - libv4l = lowPrio (v4l_utils.override { + libv4l = lowPrio (v4l-utils.override { withUtils = false; }); @@ -12247,6 +12348,9 @@ in libvdpau = callPackage ../development/libraries/libvdpau { }; + libmodulemd = callPackage ../development/libraries/libmodulemd { }; + libmodulemd_1 = callPackage ../development/libraries/libmodulemd/1.nix { }; + libvdpau-va-gl = callPackage ../development/libraries/libvdpau-va-gl { }; libversion = callPackage ../development/libraries/libversion { }; @@ -12694,7 +12798,6 @@ in opensaml-cpp = callPackage ../development/libraries/opensaml-cpp { }; openscenegraph = callPackage ../development/libraries/openscenegraph { }; - openscenegraph_3_4 = callPackage ../development/libraries/openscenegraph/3.4.0.nix { }; openslp = callPackage ../development/libraries/openslp {}; @@ -13047,6 +13150,10 @@ in libopenshot-audio = callPackage ../applications/video/openshot-qt/libopenshot-audio.nix { }; + libqglviewer = callPackage ../development/libraries/libqglviewer { + inherit (darwin.apple_sdk.frameworks) AGL; + }; + libqtav = callPackage ../development/libraries/libqtav { }; kpmcore = callPackage ../development/libraries/kpmcore { }; @@ -13306,7 +13413,7 @@ in inherit (darwin.apple_sdk.frameworks) GLUT; }; - simgear = callPackage ../development/libraries/simgear { openscenegraph = openscenegraph_3_4; }; + simgear = callPackage ../development/libraries/simgear { }; simp_le = callPackage ../tools/admin/simp_le { }; @@ -13603,6 +13710,10 @@ in inherit (pythonPackages) twisted; }; + thrift-0_10 = callPackage ../development/libraries/thrift/0.10.nix { + inherit (pythonPackages) twisted; + }; + tidyp = callPackage ../development/libraries/tidyp { }; tinyxml = tinyxml2; @@ -14598,6 +14709,8 @@ in openxpki = callPackage ../servers/openxpki { }; + openxr-loader = callPackage ../development/libraries/openxr-loader { }; + osrm-backend = callPackage ../servers/osrm-backend { }; p910nd = callPackage ../servers/p910nd { }; @@ -14708,6 +14821,12 @@ in boost = boost159; }; + mysql80 = callPackage ../servers/sql/mysql/8.0.x.nix { + inherit (darwin) cctools developer_cmds; + inherit (darwin.apple_sdk.frameworks) CoreServices; + boost = boost169; # Configure checks for specific version. + }; + mysql_jdbc = callPackage ../servers/sql/mysql/jdbc { }; mssql_jdbc = callPackage ../servers/sql/mssql/jdbc { }; @@ -14790,6 +14909,7 @@ in ; postgresql = postgresql_9_6.override { this = postgresql; }; postgresqlPackages = recurseIntoAttrs postgresql.pkgs; + postgresql11Packages = recurseIntoAttrs postgresql_11.pkgs; postgresql_jdbc = callPackage ../development/java-modules/postgresql_jdbc { }; @@ -15990,6 +16110,8 @@ in ofp = callPackage ../os-specific/linux/ofp { }; + ofono = callPackage ../tools/networking/ofono { }; + openpam = callPackage ../development/libraries/openpam { }; openbsm = callPackage ../development/libraries/openbsm { }; @@ -16278,7 +16400,7 @@ in systemd = null; }) else utillinux; - v4l_utils = qt5.callPackage ../os-specific/linux/v4l-utils { }; + v4l-utils = qt5.callPackage ../os-specific/linux/v4l-utils { }; vndr = callPackage ../development/tools/vndr { }; @@ -17228,6 +17350,8 @@ in bitlbee-steam = callPackage ../applications/networking/instant-messengers/bitlbee-steam { }; + bitlbee-mastodon = callPackage ../applications/networking/instant-messengers/bitlbee-mastodon { }; + bitmeter = callPackage ../applications/audio/bitmeter { }; bitscope = recurseIntoAttrs @@ -17300,6 +17424,8 @@ in calcurse = callPackage ../applications/misc/calcurse { }; + calculix = callPackage ../applications/science/math/calculix {}; + calibre = libsForQt5.callPackage ../applications/misc/calibre { }; calligra = libsForQt5.callPackage ../applications/office/calligra { @@ -17385,6 +17511,10 @@ in cligh = python3Packages.callPackage ../development/tools/github/cligh {}; + clight = callPackage ../applications/misc/clight { }; + + clightd = callPackage ../applications/misc/clight/clightd.nix { }; + clipgrab = qt5.callPackage ../applications/video/clipgrab { }; clipmenu = callPackage ../applications/misc/clipmenu { }; @@ -17881,7 +18011,7 @@ in emacs26Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs26 pkgs.emacs26Packages); emacsPackagesNgFor = emacs: import ./emacs-packages.nix { - inherit lib newScope stdenv; + inherit lib newScope stdenv pkgs; inherit fetchFromGitHub fetchurl; inherit emacs texinfo makeWrapper runCommand writeText; inherit (xorg) lndir; @@ -17901,7 +18031,7 @@ in inherit autoconf automake editorconfig-core-c git libffi libpng pkgconfig poppler rtags w3m zlib substituteAll rustPlatform cmake llvmPackages - libtool zeromq; + libtool zeromq openssl; }; }; @@ -18288,7 +18418,7 @@ in fractal = callPackage ../applications/networking/instant-messengers/fractal { }; - freecad = callPackage ../applications/graphics/freecad { mpi = openmpi; }; + freecad = qt5.callPackage ../applications/graphics/freecad { mpi = openmpi; }; freemind = callPackage ../applications/misc/freemind { }; @@ -20020,6 +20150,10 @@ in qjackctl = libsForQt5.callPackage ../applications/audio/qjackctl { }; + qlandkartegt = libsForQt5.callPackage ../applications/misc/qlandkartegt {}; + + garmindev = callPackage ../applications/misc/qlandkartegt/garmindev.nix {}; + qmapshack = libsForQt5.callPackage ../applications/misc/qmapshack { }; qmediathekview = libsForQt5.callPackage ../applications/video/qmediathekview { }; @@ -20391,6 +20525,10 @@ in dropbox-cli = callPackage ../applications/networking/dropbox/cli.nix { }; + maestral = callPackage ../applications/networking/maestral { }; + + maestral-gui = libsForQt5.callPackage ../applications/networking/maestral { withGui = true; }; + insync = callPackage ../applications/networking/insync { }; libstrangle = callPackage ../tools/X11/libstrangle { @@ -20420,14 +20558,13 @@ in curaengine = curaengine_stable; }; - curaengine = callPackage ../applications/misc/curaengine { - inherit (python3.pkgs) libarcus; - }; + curaengine = callPackage ../applications/misc/curaengine { inherit (python3.pkgs) libarcus; }; + cura = qt5.callPackage ../applications/misc/cura { }; curaPlugins = callPackage ../applications/misc/cura/plugins.nix { }; - curaLulzbot = callPackage ../applications/misc/cura/lulzbot.nix { }; + curaLulzbot = qt5.callPackage ../applications/misc/cura/lulzbot/default.nix { }; curaByDagoma = callPackage ../applications/misc/curabydagoma { }; @@ -20557,6 +20694,8 @@ in surf = callPackage ../applications/networking/browsers/surf { gtk = gtk2; }; + surf-display = callPackage ../desktops/surf-display { }; + sunvox = callPackage ../applications/audio/sunvox { }; swh_lv2 = callPackage ../applications/audio/swh-lv2 { }; @@ -20650,6 +20789,8 @@ in telepathy-idle = callPackage ../applications/networking/instant-messengers/telepathy/idle {}; + tendermint = callPackage ../tools/networking/tendermint {}; + termdown = (newScope pythonPackages) ../applications/misc/termdown { }; terminal-notifier = callPackage ../applications/misc/terminal-notifier {}; @@ -20679,8 +20820,6 @@ in thinkingRock = callPackage ../applications/misc/thinking-rock { }; - nylas-mail-bin = callPackage ../applications/networking/mailreaders/nylas-mail-bin { }; - thonny = callPackage ../applications/editors/thonny { }; thunderbird = callPackage ../applications/networking/mailreaders/thunderbird { @@ -20823,6 +20962,8 @@ in unpaper = callPackage ../tools/graphics/unpaper { }; + unison-ucm = callPackage ../development/compilers/unison { }; + urh = callPackage ../applications/radio/urh { }; uuagc = haskell.lib.justStaticExecutables haskellPackages.uuagc; @@ -20928,7 +21069,7 @@ in virtscreen = callPackage ../tools/admin/virtscreen {}; - virtualbox = callPackage ../applications/virtualization/virtualbox { + virtualbox = libsForQt5.callPackage ../applications/virtualization/virtualbox { stdenv = stdenv_32bit; inherit (gnome2) libIDL; }; @@ -21683,6 +21824,8 @@ in cuyo = callPackage ../games/cuyo { }; + devilutionx = callPackage ../games/devilutionx {}; + dhewm3 = callPackage ../games/dhewm3 {}; digikam = libsForQt5.callPackage ../applications/graphics/digikam { @@ -21764,7 +21907,7 @@ in fish-fillets-ng = callPackage ../games/fish-fillets-ng {}; - flightgear = libsForQt5.callPackage ../games/flightgear { openscenegraph = openscenegraph_3_4; }; + flightgear = libsForQt5.callPackage ../games/flightgear { }; flock = callPackage ../development/tools/flock { }; @@ -21869,6 +22012,8 @@ in inherit (pythonPackages) rdflib; }; + ideogram = callPackage ../applications/graphics/ideogram { }; + instead = callPackage ../games/instead { lua = lua5; }; @@ -22242,7 +22387,6 @@ in # Torcs wants to make shared libraries linked with plib libraries (it provides static). # i686 is the only platform I know than can do that linking without plib built with -fPIC libpng = libpng12; - openscenegraph = openscenegraph_3_4; }; torcs = callPackage ../games/torcs { }; @@ -23334,7 +23478,7 @@ in g4py = callPackage ../development/libraries/physics/geant4/g4py { }; - hepmc = callPackage ../development/libraries/physics/hepmc { }; + hepmc2 = callPackage ../development/libraries/physics/hepmc2 { }; hepmc3 = callPackage ../development/libraries/physics/hepmc3 { }; @@ -23608,6 +23752,8 @@ in epkowa = callPackage ../misc/drivers/epkowa { }; + utsushi = callPackage ../misc/drivers/utsushi { }; + idsk = callPackage ../tools/filesystems/idsk { }; igraph = callPackage ../development/libraries/igraph { }; @@ -23635,7 +23781,12 @@ in kontemplate = callPackage ../applications/networking/cluster/kontemplate { }; - kops = callPackage ../applications/networking/cluster/kops { }; + inherit (callPackage ../applications/networking/cluster/kops {}) + mkKops + kops_1_12 + kops_1_13 + ; + kops = kops_1_13; lguf-brightness = callPackage ../misc/lguf-brightness { }; @@ -23817,6 +23968,10 @@ in in nixosTesting.makeTest calledTest; + nixosOptionsDoc = attrs: + (import ../../nixos/lib/make-options-doc/default.nix) + ({ inherit pkgs lib; } // attrs); + nixui = callPackage ../tools/package-management/nixui { node_webkit = nwjs_0_12; }; nixdoc = callPackage ../tools/nix/nixdoc {}; @@ -24063,6 +24218,10 @@ in sct = callPackage ../tools/X11/sct {}; + scylladb = callPackage ../servers/scylladb { + thrift = thrift-0_10; + }; + seafile-shared = callPackage ../misc/seafile-shared { }; serviio = callPackage ../servers/serviio {}; @@ -24100,6 +24259,8 @@ in jx = callPackage ../applications/networking/cluster/jx {}; + prow = callPackage ../applications/networking/cluster/prow {}; + inherit (callPackage ../applications/networking/cluster/terraform {}) terraform_0_11 terraform_0_11-full @@ -24218,7 +24379,9 @@ in vttest = callPackage ../tools/misc/vttest { }; - wasm-pack = callPackage ../development/tools/wasm-pack { }; + wasm-pack = callPackage ../development/tools/wasm-pack { + inherit (darwin.apple_sdk.frameworks) Security; + }; wavegain = callPackage ../applications/audio/wavegain { }; @@ -24579,4 +24742,6 @@ in kube3d = callPackage ../applications/networking/cluster/kube3d {}; zfs-replicate = python3Packages.callPackage ../tools/backup/zfs-replicate { }; + + runwayml = callPackage ../applications/graphics/runwayml {}; } diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 1cbdb6a9f21..3ac7b9413d9 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -16,6 +16,7 @@ let category-theory = callPackage ../development/coq-modules/category-theory { }; Cheerios = callPackage ../development/coq-modules/Cheerios {}; CoLoR = callPackage ../development/coq-modules/CoLoR {}; + coq-elpi = callPackage ../development/coq-modules/coq-elpi {}; coq-ext-lib = callPackage ../development/coq-modules/coq-ext-lib {}; coq-extensible-records = callPackage ../development/coq-modules/coq-extensible-records {}; coq-haskell = callPackage ../development/coq-modules/coq-haskell { }; diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index e1b93954448..0c85176acba 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -39,428 +39,48 @@ , melpaBuild , external +, pkgs }: -with lib.licenses; - let - elpaPackages = import ../applications/editors/emacs-modes/elpa-packages.nix { + mkElpaPackages = import ../applications/editors/emacs-modes/elpa-packages.nix { inherit lib stdenv texinfo; }; - melpaStablePackages = import ../applications/editors/emacs-modes/melpa-stable-packages.nix { - inherit external lib; + # Contains both melpa stable & unstable + melpaGeneric = import ../applications/editors/emacs-modes/melpa-packages.nix { + inherit external lib pkgs; }; + mkMelpaStablePackages = melpaGeneric "stable"; + mkMelpaPackages = melpaGeneric "unstable"; - melpaPackages = import ../applications/editors/emacs-modes/melpa-packages.nix { - inherit external lib; + mkOrgPackages = import ../applications/editors/emacs-modes/org-packages.nix { + inherit lib; }; - orgPackages = import ../applications/editors/emacs-modes/org-packages.nix { }; - emacsWithPackages = import ../build-support/emacs/wrapper.nix { inherit lib lndir makeWrapper stdenv runCommand; }; - packagesFun = self: with self; { - - inherit emacs melpaBuild trivialBuild; - - emacsWithPackages = emacsWithPackages self; - - ## START HERE - - pdf-tools = melpaBuild rec { - pname = "pdf-tools"; - version = "0.90"; - src = fetchFromGitHub { - owner = "politza"; - repo = "pdf-tools"; - rev = "v${version}"; - sha256 = "0iv2g5kd14zk3r5dzdw7b7hk4b5w7qpbilcqkja46jgxbb6xnpl9"; - }; - nativeBuildInputs = [ external.pkgconfig ]; - buildInputs = with external; [ autoconf automake libpng zlib poppler ]; - preBuild = "make server/epdfinfo"; - recipe = writeText "recipe" '' - (pdf-tools - :repo "politza/pdf-tools" :fetcher github - :files ("lisp/pdf-*.el" "server/epdfinfo")) - ''; - packageRequires = [ tablist let-alist ]; - meta = { - description = "Emacs support library for PDF files"; - license = gpl3; - }; - }; - - elisp-ffi = melpaBuild rec { - pname = "elisp-ffi"; - version = "1.0.0"; - src = fetchFromGitHub { - owner = "skeeto"; - repo = "elisp-ffi"; - rev = "${version}"; - sha256 = "0z2n3h5l5fj8wl8i1ilfzv11l3zba14sgph6gz7dx7q12cnp9j22"; - }; - buildInputs = [ external.libffi ]; - preBuild = "make"; - recipe = writeText "recipe" '' - (elisp-ffi - :repo "skeeto/elisp-ffi" - :fetcher github - :files ("ffi-glue" "ffi.el")) - ''; - meta = { - description = "Emacs Lisp Foreign Function Interface"; - longDescription = '' - This library provides an FFI for Emacs Lisp so that Emacs - programs can invoke functions in native libraries. It works by - driving a subprocess to do the heavy lifting, passing result - values on to Emacs. - ''; - license = publicDomain; - }; - }; - - agda2-mode = with external; trivialBuild { - pname = "agda-mode"; - version = Agda.version; - - phases = [ "buildPhase" "installPhase" ]; - - # already byte-compiled by Agda builder - buildPhase = '' - agda=`${Agda}/bin/agda-mode locate` - cp `dirname $agda`/*.el* . - ''; - - meta = { - description = "Agda2-mode for Emacs extracted from Agda package"; - longDescription = '' - Wrapper packages that liberates init.el from `agda-mode locate` magic. - Simply add this to user profile or systemPackages and do `(require 'agda2)` in init.el. - ''; - homepage = Agda.meta.homepage; - license = Agda.meta.license; - }; - }; - - emacsql-sqlite = melpaBuild rec { - pname = "emacsql-sqlite"; - ename = "emacsql-sqlite"; - version = "20180128.1252"; - src = fetchFromGitHub { - owner = "skeeto"; - repo = "emacsql"; - rev = "62d39157370219a1680265fa593f90ccd51457da"; - sha256 = "0ghl3g8n8wlw8rnmgbivlrm99wcwn93bv8flyalzs0z9j7p7fdq9"; - }; - recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/3cfa28c7314fa57fa9a3aaaadf9ef83f8ae541a9/recipes/emacsql-sqlite"; - sha256 = "1y81nabzzb9f7b8azb9giy23ckywcbrrg4b88gw5qyjizbb3h70x"; - name = "recipe"; - }; - preBuild = '' - cd sqlite - make - ''; - stripDebugList = [ "share" ]; - packageRequires = [ emacs emacsql ]; - meta = { - homepage = "https://melpa.org/#/emacsql-sqlite"; - license = lib.licenses.free; - }; - }; - - elpy = melpaBuild rec { - pname = "elpy"; - version = external.elpy.version; - src = fetchFromGitHub { - owner = "jorgenschaefer"; - repo = pname; - rev = "39ea47c73f040ce8dcc1c2d2639ebc0eb57ab8c8"; - sha256 = "0q3av1qv4m6aj4bil608f688hjpr5px8zqnnrdqx784nz98rpjrs"; - }; - recipe = writeText "recipe" '' - (elpy :repo "jorgenschaefer/elpy" :fetcher github) - ''; - - patchPhase = '' - for file in elpy.el elpy-pkg.el; do - substituteInPlace $file \ - --replace "company \"0.8.2\"" "company \"${company.version}\"" \ - --replace "find-file-in-project \"3.3\"" "find-file-in-project \"${(melpaPackages self).find-file-in-project.version}\"" \ - --replace "highlight-indentation \"0.5.0\"" "highlight-indentation \"${highlight-indentation.version}\"" \ - --replace "pyvenv \"1.3\"" "pyvenv \"${pyvenv.version}\"" \ - --replace "yasnippet \"0.8.0\"" "yasnippet \"${yasnippet.version}\"" - done - ''; - - packageRequires = [ - company find-file-in-project highlight-indentation pyvenv yasnippet - ]; - - propagatedUserEnvPkgs = [ external.elpy ] ++ packageRequires; - - meta = { - description = "Emacs Python Development Environment"; - longDescription = '' - Elpy is an Emacs package to bring powerful Python editing to Emacs. - It combines a number of other packages, both written in Emacs Lisp as - well as Python. - ''; - license = gpl3Plus; - }; - }; - - emacs-libvterm = callPackage ../applications/editors/emacs-modes/emacs-libvterm { }; - - evil-jumper = melpaBuild rec { - pname = "evil-jumper"; - version = "20151017"; - src = fetchFromGitHub { - owner = "bling"; - repo = pname; - rev = "fcadf2d93aaea3ba88a2ae63a860b9c1f0568167"; - sha256 = "0axx6cc9z9c1wh7qgm6ya54dsp3bn82bnb0cwj1rpv509qqmwgsj"; - }; - recipe = writeText "recipe" '' - (evil-jumper :repo "bling/evil-jumper" :fetcher github) - ''; - packageRequires = [ evil ]; - meta = { - description = "Jump across buffer boundaries and revive dead buffers if necessary"; - license = gpl3Plus; - }; - }; - - ess-R-object-popup = - callPackage ../applications/editors/emacs-modes/ess-R-object-popup { }; - - filesets-plus = callPackage ../applications/editors/emacs-modes/filesets-plus { }; - - font-lock-plus = callPackage ../applications/editors/emacs-modes/font-lock-plus { }; - - ghc-mod = melpaBuild rec { - pname = "ghc"; - version = external.ghc-mod.version; - src = external.ghc-mod.src; - packageRequires = [ haskell-mode ]; - propagatedUserEnvPkgs = [ external.ghc-mod ]; - recipe = writeText "recipe" '' - (ghc-mod :repo "DanielG/ghc-mod" :fetcher github :files ("elisp/*.el")) - ''; - fileSpecs = [ "elisp/*.el" ]; - meta = { - description = "An extension of haskell-mode that provides completion of symbols and documentation browsing"; - license = bsd3; - }; - }; - - haskell-unicode-input-method = melpaBuild rec { - pname = "emacs-haskell-unicode-input-method"; - version = "20110905.2307"; - src = fetchFromGitHub { - owner = "roelvandijk"; - repo = "emacs-haskell-unicode-input-method"; - rev = "d8d168148c187ed19350bb7a1a190217c2915a63"; - sha256 = "09b7bg2s9aa4s8f2kdqs4xps3jxkq5wsvbi87ih8b6id38blhf78"; - }; - recipe = writeText "recipe" '' - (haskell-unicode-input-method - :repo "roelvandijk/emacs-haskell-unicode-input-method" - :fetcher github) - ''; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#haskell-unicode-input-method/"; - license = lib.licenses.free; - }; - }; - - hexrgb = callPackage ../applications/editors/emacs-modes/hexrgb { }; - - header2 = callPackage ../applications/editors/emacs-modes/header2 { }; - - helm-words = callPackage ../applications/editors/emacs-modes/helm-words { }; - - icicles = callPackage ../applications/editors/emacs-modes/icicles { }; - - irony = melpaBuild rec { - pname = "irony"; - ename = "irony"; - version = "20190516"; - src = fetchFromGitHub { - owner = "Sarcasm"; - repo = "irony-mode"; - rev = "c3ae899b61124a747ebafc705086345e460ac08e"; - sha256 = "06ld83vzyklfmrfi6pp893mvlnhacv9if75c9pbipjvy6nwfb63r"; - }; - recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/3cfa28c7314fa57fa9a3aaaadf9ef83f8ae541a9/recipes/irony"; - sha256 = "1xcxrdrs7imi31nxpszgpaywq4ivni75hrdl4zzrf103xslqpl8a"; - name = "recipe"; - }; - preConfigure = '' - cd server - ''; - preBuild = '' - make - ''; - postInstall = '' - mkdir -p $out - mv $out/share/emacs/site-lisp/elpa/*/server/bin $out - rm -rf $out/share/emacs/site-lisp/elpa/*/server - ''; - preCheck = '' - cd source/server - ''; - dontUseCmakeBuildDir = true; - doCheck = true; - packageRequires = [ emacs ]; - nativeBuildInputs = [ external.cmake external.llvmPackages.llvm external.llvmPackages.clang ]; - meta = { - homepage = "https://melpa.org/#/irony"; - license = lib.licenses.gpl3; - }; - }; - - redshank = callPackage ../applications/editors/emacs-modes/redshank { }; - - rtags = melpaBuild rec { - pname = "rtags"; - version = "2.12"; - src = external.rtags.src; - - dontConfigure = true; - - propagatedUserEnvPkgs = [ external.rtags ]; - recipe = writeText "recipe" '' - (rtags - :repo "andersbakken/rtags" :fetcher github - :files ("src/*.el")) - ''; - inherit (external.rtags) meta; - }; - - lcs = melpaBuild rec { - pname = "lcs"; - version = circe.version; - src = circe.src; - recipe = writeText "recipe" '' - (lcs :repo "jorgenschaefer/circe" :fetcher github :files ("lcs.el")) - ''; - meta = { - description = "Longest Common Sequence (LCS) library for Emacs"; - license = gpl3Plus; - }; - }; - - lib-requires = - callPackage ../applications/editors/emacs-modes/lib-requires { }; - - lui = melpaBuild rec { - pname = "lui"; - version = circe.version; - src = circe.src; - packageRequires = [ tracking ]; - recipe = writeText "recipe" '' - (lcs :repo "jorgenschaefer/circe" :fetcher github :files ("lui*.el")) - ''; - meta = { - description = "User interface library for Emacs"; - license = gpl3Plus; - }; - }; - - nyan-mode = callPackage ../applications/editors/emacs-modes/nyan-mode { - inherit lib; - }; - - org-mac-link = - callPackage ../applications/editors/emacs-modes/org-mac-link { }; - - perl-completion = - callPackage ../applications/editors/emacs-modes/perl-completion { }; - - railgun = callPackage ../applications/editors/emacs-modes/railgun { }; - - gn = callPackage ../applications/editors/emacs-modes/gn { }; - - shorten = melpaBuild rec { - pname = "shorten"; - version = circe.version; - src = circe.src; - recipe = writeText "recipe" '' - (shorten :repo "jorgenschaefer/circe" :fetcher github :files ("shorten.el")) - ''; - meta = { - description = "String shortening to unique prefix library for Emacs"; - license = gpl3Plus; - }; - }; - - stgit = callPackage ../applications/editors/emacs-modes/stgit { }; - - structured-haskell-mode = self.shm; - shm = (melpaPackages self).shm.overrideAttrs (attrs: { - propagatedUserEnvPkgs = [ external.structured-haskell-mode ]; - }); - - thingatpt-plus = callPackage ../applications/editors/emacs-modes/thingatpt-plus { }; - - tramp = callPackage ../applications/editors/emacs-modes/tramp { }; - - yaoddmuse = callPackage ../applications/editors/emacs-modes/yaoddmuse { }; - - zeitgeist = callPackage ../applications/editors/emacs-modes/zeitgeist { }; - - zmq = melpaBuild rec { - pname = "zmq"; - ename = "zmq"; - version = "0.10.10"; - src = fetchFromGitHub { - owner = "dzop"; - repo = "emacs-zmq"; - rev = "v0.10.10"; - sha256 = "0ngxm5mm0kqgvn8977ryrngamx0khzlw86d8vz5s0jhm2kgwnqp8"; - }; - recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/72f4dcc2723de826bf1af7235ac6d9119a243c63/recipes/zmq"; - sha256 = "14bbh00a58xgxyxl8zjxl57rf6351fnwsnk4cvvy341fvf86dklc"; - name = "recipe"; - }; - stripDebugList = [ "share" ]; - packageRequires = [ emacs ]; - nativeBuildInputs = [ - external.autoconf external.automake external.pkgconfig external.libtool - (external.zeromq.override { enableDrafts = true; }) - ]; - preBuild = '' - make - ''; - postInstall = '' - mv $out/share/emacs/site-lisp/elpa/zmq-*/src/.libs/emacs-zmq.so $out/share/emacs/site-lisp/elpa/zmq-* - rm -r $out/share/emacs/site-lisp/elpa/zmq-*/src - rm $out/share/emacs/site-lisp/elpa/zmq-*/Makefile - ''; - meta = { - homepage = "https://melpa.org/#/zmq"; - description = "Emacs bindings to ØMQ"; - license = lib.licenses.gpl2; - }; - }; - - }; - -in - lib.makeScope newScope (self: - {} - // elpaPackages self - // melpaStablePackages self - // melpaPackages self - // orgPackages self - // packagesFun self - ) + mkManualPackages = import ../applications/editors/emacs-modes/manual-packages.nix { + inherit external lib pkgs; + }; + +in lib.makeScope newScope (self: lib.makeOverridable ({ + elpaPackages ? mkElpaPackages self + , melpaStablePackages ? mkMelpaStablePackages self + , melpaPackages ? mkMelpaPackages self + , orgPackages ? mkOrgPackages self + , manualPackages ? mkManualPackages self +}: ({} + // elpaPackages // { inherit elpaPackages; } + // melpaStablePackages // { inherit melpaStablePackages; } + // melpaPackages // { inherit melpaPackages; } + // orgPackages // { inherit orgPackages; } + // manualPackages + // { + inherit emacs melpaBuild trivialBuild; + emacsWithPackages = emacsWithPackages self; + }) +) {}) diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 1df001895b7..f42b9fd2e33 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -12,6 +12,8 @@ let buildOcaml = callPackage ../build-support/ocaml { }; + buildOasisPackage = callPackage ../build-support/ocaml/oasis.nix { }; + buildDunePackage = callPackage ../build-support/ocaml/dune.nix {}; alcotest = callPackage ../development/ocaml-modules/alcotest {}; @@ -442,10 +444,14 @@ let mezzo = callPackage ../development/compilers/mezzo { }; + minisat = callPackage ../development/ocaml-modules/minisat { }; + mlgmp = callPackage ../development/ocaml-modules/mlgmp { }; mlgmpidl = callPackage ../development/ocaml-modules/mlgmpidl { }; + mmap = callPackage ../development/ocaml-modules/mmap { }; + mparser = callPackage ../development/ocaml-modules/mparser { }; mstruct = callPackage ../development/ocaml-modules/mstruct { }; @@ -515,6 +521,8 @@ let pgocaml = callPackage ../development/ocaml-modules/pgocaml {}; + ocaml-sat-solvers = callPackage ../development/ocaml-modules/ocaml-sat-solvers { }; + ocamlscript = callPackage ../development/tools/ocaml/ocamlscript { }; ocamlsdl= callPackage ../development/ocaml-modules/ocamlsdl { }; @@ -571,6 +579,8 @@ let ounit = callPackage ../development/ocaml-modules/ounit { }; + pgsolver = callPackage ../development/ocaml-modules/pgsolver { }; + piqi = callPackage ../development/ocaml-modules/piqi { base64 = base64_2; }; @@ -725,6 +735,8 @@ let stringext = callPackage ../development/ocaml-modules/stringext { }; + tcslib = callPackage ../development/ocaml-modules/tcslib { }; + toml = callPackage ../development/ocaml-modules/toml { }; topkg = callPackage ../development/ocaml-modules/topkg { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index dd75f4e5b20..9ff9045600b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16,6 +16,7 @@ let _self = with self; { inherit perl; + perlPackages = self; callPackage = pkgs.newScope self; @@ -87,10 +88,10 @@ let ack = buildPerlPackage { pname = "ack"; - version = "2.28"; + version = "3.0.2"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PETDANCE/ack-2.28.tar.gz; - sha256 = "16zgn96v1qkibpj5lic571zjl07y8x55v5xql3x7bvlsmgqcnvla"; + url = mirror://cpan/authors/id/P/PE/PETDANCE/ack-v3.0.2.tar.gz; + sha256 = "0a4mriclnmwvm8rn9crkfr00qjy6ffgf0b0bg0qz46drpnyv7d33"; }; outputs = ["out" "man"]; # use gnused so that the preCheck command passes @@ -151,10 +152,10 @@ let AlienBuild = buildPerlPackage { pname = "Alien-Build"; - version = "1.65"; + version = "1.79"; src = fetchurl { - url = mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Build-1.65.tar.gz; - sha256 = "1xvwh6r2aawilpxl8zdqb8yy3skj56nkps3h5xz6spkv4ggzzm4a"; + url = mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Build-1.79.tar.gz; + sha256 = "18qlizxa67ldnxw91ks6qffhn5iia83ygcfv3c0db331f8nr68ki"; }; propagatedBuildInputs = [ CaptureTiny FFICheckLib FileWhich Filechdir PathTiny PkgConfig ]; buildInputs = [ DevelHide Test2Suite ]; @@ -191,10 +192,10 @@ let asa = buildPerlPackage { pname = "asa"; - version = "1.03"; + version = "1.04"; src = fetchurl { - url = mirror://cpan/authors/id/A/AD/ADAMK/asa-1.03.tar.gz; - sha256 = "1w97m0gf3n9av61d0qcw7d1i1rac4gm0fd2ba5wyh53df9d7p0i2"; + url = mirror://cpan/authors/id/E/ET/ETHER/asa-1.04.tar.gz; + sha256 = "0pk783s1h2f45zbmm6a62yfgy71w4sqh8ppgs4cyxfikwxs3p0z5"; }; meta = { description = "Lets your class/object say it works like something else"; @@ -228,10 +229,10 @@ let AnyEvent = buildPerlPackage { pname = "AnyEvent"; - version = "7.15"; + version = "7.16"; src = fetchurl { - url = mirror://cpan/authors/id/M/ML/MLEHMANN/AnyEvent-7.15.tar.gz; - sha256 = "111db2335c71f789edaec271126b3810356691eb1214dd3f67b527a88ec9e354"; + url = mirror://cpan/authors/id/M/ML/MLEHMANN/AnyEvent-7.16.tar.gz; + sha256 = "149fe8c3082dfb015fd15ad2b8fea5fb75e012238c790aa0398dcfaabfa0546c"; }; buildInputs = [ CanaryStability ]; meta = { @@ -304,6 +305,19 @@ let propagatedBuildInputs = [ Moose Mouse ]; }; + AnyURIEscape = buildPerlPackage { + pname = "Any-URI-Escape"; + version = "0.01"; + src = fetchurl { + url = mirror://cpan/authors/id/P/PH/PHRED/Any-URI-Escape-0.01.tar.gz; + sha256 = "0k4c20bmw32yxksgkc2i44j4vfmzhqcqrq36pv0ab3qhkzn3r0g3"; + }; + propagatedBuildInputs = [ URI ]; + meta = { + description = "Load URI::Escape::XS preferentially over URI::Escape"; + }; + }; + ApacheAuthCookie = buildPerlPackage { pname = "Apache-AuthCookie"; version = "3.27"; @@ -359,10 +373,10 @@ let ApacheTest = buildPerlPackage { pname = "Apache-Test"; - version = "1.40"; + version = "1.41"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHAY/Apache-Test-1.40.tar.gz; - sha256 = "0h5fsi0is6nhclsd3wwkkqx2hfgl3bpdazxycafm9sqxr3qkgx9w"; + url = mirror://cpan/authors/id/S/SH/SHAY/Apache-Test-1.41.tar.gz; + sha256 = "065hka389fq8kq4623li519a6bqk84dmpiwg7c2ahmiisswn1krq"; }; doCheck = false; meta = { @@ -382,6 +396,32 @@ let buildInputs = [ TestKwalitee TestPod ]; }; + AppClusterSSH = buildPerlModule { + pname = "App-ClusterSSH"; + version = "4.13.2"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DU/DUNCS/App-ClusterSSH-v4.13.2.tar.gz; + sha256 = "0rmk2p3f2wz1h092anidjclh212rv3gxyk0c641qk3frlrjnw6mp"; + }; + propagatedBuildInputs = [ ExceptionClass Tk TryTiny X11ProtocolOther ]; + buildInputs = [ CPANChanges FileSlurp FileWhich PerlTidy Readonly TestDifferences TestDistManifest TestPerlTidy TestPod TestPodCoverage TestTrap ]; + preCheck = "rm t/perltidy.t t/manifest.t t/30cluster.t"; # do not run failing tests + postInstall = '' + mkdir -p $out/etc/bash_completion.d + mv $out/bin/clusterssh_bash_completion.dist \ + $out/etc/bash_completion.d/clusterssh_bash_completion + substituteInPlace $out/etc/bash_completion.d/clusterssh_bash_completion \ + --replace '/bin/true' '${pkgs.coreutils}/bin/true' \ + --replace 'grep' '${pkgs.gnugrep}/bin/grep' \ + --replace 'sed' '${pkgs.gnused}/bin/sed' + ''; + meta = { + description = "A container for functions of the ClusterSSH programs"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "http://github.com/duncs/clusterssh/wiki"; + }; + }; + AppCmd = buildPerlPackage { pname = "App-Cmd"; version = "0.331"; @@ -472,14 +512,14 @@ let }; AppSqitch = buildPerlModule { - version = "0.9999"; + version = "1.0.0"; pname = "App-Sqitch"; src = fetchurl { - url = mirror://cpan/authors/id/D/DW/DWHEELER/App-Sqitch-0.9999.tar.gz; - sha256 = "f5bfa80206738ab8a70358a3b0557661c7459e11ec07dece23ecafa1f34372b3"; + url = mirror://cpan/authors/id/D/DW/DWHEELER/App-Sqitch-v1.0.0.tar.gz; + sha256 = "f46466c1e9ad8bbabf6844fed4f6e534ea475731de61b775ad7c331db1ca9c5c"; }; - buildInputs = [ CaptureTiny IOPager TestDeep TestDir TestException TestFile TestFileContents TestMockModule TestNoWarnings TestWarn ]; - propagatedBuildInputs = [ Clone ConfigGitLike DBI DateTime EncodeLocale FileHomeDir HashMerge IPCRun3 IPCSystemSimple ListMoreUtils PathClass PerlIOutf8_strict StringFormatter StringShellQuote TemplateTiny Throwable TypeTiny URIdb libintl_perl ]; + buildInputs = [ CaptureTiny TestDeep TestDir TestException TestFile TestFileContents TestMockModule TestNoWarnings TestWarn ]; + propagatedBuildInputs = [ Clone ConfigGitLike DBI DateTime EncodeLocale HashMerge IOPager IPCRun3 IPCSystemSimple ListMoreUtils PathClass PerlIOutf8_strict StringFormatter StringShellQuote TemplateTiny Throwable TypeTiny URIdb libintl_perl ]; doCheck = false; # Can't find home directory. meta = { homepage = https://sqitch.org/; @@ -537,10 +577,10 @@ let ArrayDiff = buildPerlPackage { pname = "Array-Diff"; - version = "0.07"; + version = "0.09"; src = fetchurl { - url = mirror://cpan/authors/id/T/TY/TYPESTER/Array-Diff-0.07.tar.gz; - sha256 = "0il3izx45wkh71fli2hvaq32jyin95k8x3qrnwby2x2c6yix7rvq"; + url = mirror://cpan/authors/id/N/NE/NEILB/Array-Diff-0.09.tar.gz; + sha256 = "0xsh8k312spzl90xds075qprcaz4r0b93g1bgi9l3rv1k0p3j1l0"; }; propagatedBuildInputs = [ AlgorithmDiff ClassAccessor ]; meta = { @@ -710,10 +750,10 @@ let AuthenRadius = buildPerlPackage { pname = "Authen-Radius"; - version = "0.29"; + version = "0.31"; src = fetchurl { - url = mirror://cpan/authors/id/P/PO/PORTAONE/Authen-Radius-0.29.tar.gz; - sha256 = "7fb3425546b2f518e4a07edb3bcb55672454fe8e13bece58de2dc43885afb079"; + url = mirror://cpan/authors/id/P/PO/PORTAONE/Authen-Radius-0.31.tar.gz; + sha256 = "bb5191484188ac7d6e281eb199d16c4e09fb0090af7c2187aa275c454c1fc012"; }; buildInputs = [ TestNoWarnings ]; propagatedBuildInputs = [ DataHexDump NetIP ]; @@ -825,10 +865,10 @@ let BC = buildPerlPackage { pname = "B-C"; - version = "1.55"; + version = "1.57"; src = fetchurl { - url = mirror://cpan/authors/id/R/RU/RURBAN/B-C-1.55.tar.gz; - sha256 = "001bc3mxv1zkg1ynqpv3fbn1v3h3bqihg0pp19z4gfvrsrkns8q9"; + url = mirror://cpan/authors/id/R/RU/RURBAN/B-C-1.57.tar.gz; + sha256 = "1zs9a4gl63icja055kncgyny6xk1nsk6payfbzczkba3sc8sclh4"; }; propagatedBuildInputs = [ BFlags IPCRun Opcodes ]; meta = { @@ -839,6 +879,19 @@ let doCheck = false; /* test fails */ }; + BCOW = buildPerlPackage { + pname = "B-COW"; + version = "0.001"; + src = fetchurl { + url = mirror://cpan/authors/id/A/AT/ATOOMIC/B-COW-0.001.tar.gz; + sha256 = "1n5hfhm72q96cpplc8hjfwkv7haq0xnq2db6ql611jdv17z3sp4d"; + }; + meta = { + description = "B::COW additional B helpers to check COW status"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + BFlags = buildPerlPackage { pname = "B-Flags"; version = "0.17"; @@ -1166,10 +1219,10 @@ let CanaryStability = buildPerlPackage { pname = "Canary-Stability"; - version = "2012"; + version = "2013"; src = fetchurl { - url = mirror://cpan/authors/id/M/ML/MLEHMANN/Canary-Stability-2012.tar.gz; - sha256 = "fd240b111d834dbae9630c59b42fae2145ca35addc1965ea311edf0d07817107"; + url = mirror://cpan/authors/id/M/ML/MLEHMANN/Canary-Stability-2013.tar.gz; + sha256 = "a5c91c62cf95fcb868f60eab5c832908f6905221013fea2bce3ff57046d7b6ea"; }; meta = { license = stdenv.lib.licenses.gpl1Plus; @@ -1226,10 +1279,10 @@ let CarpAssertMore = buildPerlPackage { pname = "Carp-Assert-More"; - version = "1.16"; + version = "1.18"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PETDANCE/Carp-Assert-More-1.16.tar.gz; - sha256 = "1x9jd6s3lq97na6gz7g0zaq62l8z297xsfpdj2v42p3ijpfirl4f"; + url = mirror://cpan/authors/id/P/PE/PETDANCE/Carp-Assert-More-1.18.tar.gz; + sha256 = "0k7lpyb7mwck9w7vlqd4w3vw5r0qxlhzw8x6himy6p9aijwrdh4g"; }; propagatedBuildInputs = [ CarpAssert ]; meta = { @@ -1258,7 +1311,7 @@ let url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Carton-v1.0.34.tar.gz; sha256 = "77d42b92732bcfc18a59d341e56ce476205b1c4d380eab3a07224f5745c23e45"; }; - propagatedBuildInputs = [ ClassTiny MenloLegacy ModuleCPANfile PathTiny TryTiny ]; + propagatedBuildInputs = [ MenloLegacy PathTiny TryTiny ]; meta = { homepage = https://github.com/perl-carton/carton; description = "Perl module dependency manager (aka Bundler for Perl)"; @@ -1414,10 +1467,10 @@ let CatalystManual = buildPerlPackage { pname = "Catalyst-Manual"; - version = "5.9009"; + version = "5.9010"; src = fetchurl { - url = mirror://cpan/authors/id/H/HA/HAARG/Catalyst-Manual-5.9000.tar.gz; - sha256 = "1z6l0vdjxzisqgb5w447m3m73sfvkhwm7qw2l1dpcdng3zaypllh"; + url = mirror://cpan/authors/id/H/HA/HAARG/Catalyst-Manual-5.9010.tar.gz; + sha256 = "1xg2m6d76xl0a76vq0v4yv25458d6df00k5xq1ab2z8mzvwbm4ah"; }; meta = { description = "The Catalyst developer's manual"; @@ -1668,6 +1721,21 @@ let }; }; + CatalystPluginSmartURI = buildPerlPackage { + pname = "Catalyst-Plugin-SmartURI"; + version = "0.041"; + src = fetchurl { + url = mirror://cpan/authors/id/R/RK/RKITOVER/Catalyst-Plugin-SmartURI-0.041.tar.gz; + sha256 = "0msz3w2vfdb5w4ixi5llq66xlhm0181gjz9xj8yj0lalk232326b"; + }; + propagatedBuildInputs = [ CatalystRuntime ClassC3Componentised ]; + buildInputs = [ CatalystActionREST TestWarnings TimeOut URISmartURI ]; + meta = { + description = "Configurable URIs for Catalyst"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + CatalystPluginStackTrace = buildPerlPackage { pname = "Catalyst-Plugin-StackTrace"; version = "0.12"; @@ -1741,12 +1809,11 @@ let CatalystViewJSON = buildPerlPackage { pname = "Catalyst-View-JSON"; - version = "0.36"; + version = "0.37"; src = fetchurl { - url = mirror://cpan/authors/id/J/JJ/JJNAPIORK/Catalyst-View-JSON-0.36.tar.gz; - sha256 = "0x943j1n2r0zqanyzdrs1xsnn8ayn2wqskn7h144xcqa6v6gcisl"; + url = mirror://cpan/authors/id/H/HA/HAARG/Catalyst-View-JSON-0.37.tar.gz; + sha256 = "1v4xkzazs743sc7cd1kxkbi99cf00a4dadyyancckcbpi9p3znn5"; }; - buildInputs = [ YAML ]; propagatedBuildInputs = [ CatalystRuntime ]; meta = { description = "JSON view for your data"; @@ -1822,6 +1889,22 @@ let }; }; + Catmandu = buildPerlModule { + pname = "Catmandu"; + version = "1.2002"; + src = fetchurl { + url = mirror://cpan/authors/id/N/NI/NICS/Catmandu-1.2002.tar.gz; + sha256 = "0gq08q5s95p58fvdl30n1k94w01pplinw2c9b4s36946fhydqifq"; + }; + propagatedBuildInputs = [ AnyURIEscape AppCmd CGIExpand ConfigOnion CpanelJSONXS DataCompare DataUUID DataUtil IOHandleUtil LWP ListMoreUtils LogAny MIMETypes ModuleInfo MooXAliases ParserMGC PathIteratorRule PathTiny StringCamelCase TextCSV TextHogan Throwable TryTinyByClass URITemplate YAMLLibYAML namespaceclean ]; + buildInputs = [ LogAnyAdapterLog4perl LogLog4perl TestDeep TestException TestLWPUserAgent TestPod ]; + meta = { + description = "a data toolkit"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/LibreCat/Catmandu"; + }; + }; + CDDB_get = buildPerlPackage { pname = "CDDB_get"; version = "2.28"; @@ -1838,10 +1921,10 @@ let CGI = buildPerlPackage { pname = "CGI"; - version = "4.42"; + version = "4.44"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEEJO/CGI-4.42.tar.gz; - sha256 = "11d308e7dad2312d65747a7fdec5d0c22024c28df5e882e829ca1553482024e7"; + url = mirror://cpan/authors/id/L/LE/LEEJO/CGI-4.44.tar.gz; + sha256 = "12435fb7ebd3585c47b6d60ee4f5c7d6a7c114a2827d2b5acf3d62aa9fcf1208"; }; buildInputs = [ TestDeep TestNoWarnings TestWarn ]; propagatedBuildInputs = [ HTMLParser ]; @@ -2188,10 +2271,10 @@ let ClassEHierarchy = buildPerlPackage { pname = "Class-EHierarchy"; - version = "2.00"; + version = "2.01"; src = fetchurl { - url = mirror://cpan/authors/id/C/CO/CORLISS/Class-EHierarchy/Class-EHierarchy-2.00.tar.gz; - sha256 = "8498baaf7539eaa3422c6fe1055a0fc9a0c02e94dad0c63405373528e622bacb"; + url = mirror://cpan/authors/id/C/CO/CORLISS/Class-EHierarchy/Class-EHierarchy-2.01.tar.gz; + sha256 = "637ab76beb3832a9b071b999a1b15bf05d297df6a662ccb1a8004f2987308382"; }; meta = { description = "Base class for hierarchally ordered objects"; @@ -2224,10 +2307,10 @@ let ClassInspector = buildPerlPackage { pname = "Class-Inspector"; - version = "1.34"; + version = "1.36"; src = fetchurl { - url = mirror://cpan/authors/id/P/PL/PLICEASE/Class-Inspector-1.34.tar.gz; - sha256 = "1n7h3jzwdz5a8gmz515xfr7ic82dl5sbdrk5d2fskiycngf8d6py"; + url = mirror://cpan/authors/id/P/PL/PLICEASE/Class-Inspector-1.36.tar.gz; + sha256 = "0kk900bp8iq7bw5jyllfb31gvf93mmp24n4x90j7qs3jlhimsafc"; }; meta = { description = "Get information about a class and its structure"; @@ -2488,15 +2571,16 @@ let Clone = buildPerlPackage { pname = "Clone"; - version = "0.41"; + version = "0.43"; src = fetchurl { - url = mirror://cpan/authors/id/G/GA/GARU/Clone-0.41.tar.gz; - sha256 = "060mlm31lacirpnp5fl9jqk4m9cl07vjlh89k83qk25wykf5dh78"; + url = mirror://cpan/authors/id/A/AT/ATOOMIC/Clone-0.43.tar.gz; + sha256 = "1npf5s4b90ds6lv8gn76b2w4bdh0z5ni5zk4skgc2db5d12560lr"; }; meta = { description = "Recursively copy Perl datatypes"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ BCOW ]; }; CloneChoose = buildPerlPackage { @@ -2527,10 +2611,10 @@ let CodeTidyAll = buildPerlPackage { pname = "Code-TidyAll"; - version = "0.73"; + version = "0.74"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/Code-TidyAll-0.73.tar.gz; - sha256 = "1fvw73q5vj5b12y9jj9mmwl0dipdjlvpsw5rzvldr4csicrpiz6q"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/Code-TidyAll-0.74.tar.gz; + sha256 = "1nbbmn136b09kzpfz5ld2mx6syfx16hdrlf7vcj3j0kjvkjifapq"; }; propagatedBuildInputs = [ CaptureTiny ConfigINI FileWhich Filepushd IPCRun3 IPCSystemSimple ListCompare ListSomeUtils LogAny Moo ScopeGuard SpecioLibraryPathTiny TextDiff TimeDate TimeDurationParse ]; buildInputs = [ TestClass TestClassMost TestDeep TestDifferences TestException TestFatal TestMost TestWarn TestWarnings librelative ]; @@ -2740,6 +2824,21 @@ let }; }; + ConfigOnion = buildPerlPackage { + pname = "Config-Onion"; + version = "1.007"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DS/DSHEROH/Config-Onion-1.007.tar.gz; + sha256 = "1bx81nakvgj9m7x1q7pnra2cm1rzfdyf7fm2wmlj92qkivvdszrj"; + }; + propagatedBuildInputs = [ ConfigAny HashMergeSimple Moo ]; + buildInputs = [ TestException YAML ]; + meta = { + description = "Layered configuration, because configs are like ogres"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + ConfigMVP = buildPerlPackage { pname = "Config-MVP"; version = "2.200011"; @@ -2786,11 +2885,12 @@ let ConfigTiny = buildPerlPackage { pname = "Config-Tiny"; - version = "2.23"; + version = "2.24"; src = fetchurl { - url = mirror://cpan/authors/id/R/RS/RSAVAGE/Config-Tiny-2.23.tgz; - sha256 = "037524cpx962cjdgcp1m8sd30s43g3zvwfn4hmjvq322xpind2ls"; + url = mirror://cpan/authors/id/R/RS/RSAVAGE/Config-Tiny-2.24.tgz; + sha256 = "0cjj2f0pj9y3cx1lgk2qp6arsnyaacf7kj6v33iqczn59f798r0h"; }; + buildInputs = [ TestPod ]; }; ConfigVersioned = buildPerlPackage { @@ -2810,10 +2910,10 @@ let Connector = buildPerlPackage { pname = "Connector"; - version = "1.26"; + version = "1.27"; src = fetchurl { - url = mirror://cpan/authors/id/M/MR/MRSCOTTY/Connector-1.26.tar.gz; - sha256 = "9852c2b43a8201996530deb1d3aa7fda18abe1ce24c80fbdebd7981cd2f05c45"; + url = mirror://cpan/authors/id/M/MR/MRSCOTTY/Connector-1.27.tar.gz; + sha256 = "98ff4700fde2b7872d89566a3308d03c2899c88cb6317af901869513bdbfb603"; }; buildInputs = [ ConfigMerge ConfigStd ConfigVersioned DBDSQLite DBI ProcSafeExec TemplateToolkit YAML ]; propagatedBuildInputs = [ LogLog4perl Moose ]; @@ -2911,10 +3011,10 @@ let CookieBaker = buildPerlModule { pname = "Cookie-Baker"; - version = "0.10"; + version = "0.11"; src = fetchurl { - url = mirror://cpan/authors/id/K/KA/KAZEBURO/Cookie-Baker-0.10.tar.gz; - sha256 = "b42bad15b12da4cdc5c90c902faf3ad484281a42203fa4e7652866434f6fa4dd"; + url = mirror://cpan/authors/id/K/KA/KAZEBURO/Cookie-Baker-0.11.tar.gz; + sha256 = "59275f474e07c0aa3611e3e684b894e7db913333d8214420be63f12ec18cd7ab"; }; buildInputs = [ ModuleBuildTiny TestTime ]; propagatedBuildInputs = [ URI ]; @@ -2937,10 +3037,10 @@ let Coro = buildPerlPackage { pname = "Coro"; - version = "6.54"; + version = "6.55"; src = fetchurl { - url = mirror://cpan/authors/id/M/ML/MLEHMANN/Coro-6.54.tar.gz; - sha256 = "0a00b351m7fxm39vfk726wpva2xx8qxlx5nv4yjgkbqap502ld2m"; + url = mirror://cpan/authors/id/M/ML/MLEHMANN/Coro-6.55.tar.gz; + sha256 = "0c4ams0lqxlh9nwp2l3gd0if35dw0m3774pfl16dmz3hf419rms3"; }; propagatedBuildInputs = [ AnyEvent Guard commonsense ]; buildInputs = [ CanaryStability ]; @@ -2965,10 +3065,10 @@ let CPAN = buildPerlPackage { pname = "CPAN"; - version = "2.26"; + version = "2.27"; src = fetchurl { - url = mirror://cpan/authors/id/A/AN/ANDK/CPAN-2.26.tar.gz; - sha256 = "0db80ce17c374affa71534033bcac94a213912d6b35f5379e263ae3d7c98ae5c"; + url = mirror://cpan/authors/id/A/AN/ANDK/CPAN-2.27.tar.gz; + sha256 = "b4b1471a2881e2d616f59e723879b4110ae485b79d5962f115119c28cf69e07f"; }; propagatedBuildInputs = [ ArchiveZip CPANChecksums CPANPerlReleases Expect FileHomeDir LWP LogLog4perl ModuleBuild TermReadKey YAML YAMLLibYAML YAMLSyck ]; meta = { @@ -2979,10 +3079,10 @@ let CpanelJSONXS = buildPerlPackage { pname = "Cpanel-JSON-XS"; - version = "4.11"; + version = "4.12"; src = fetchurl { - url = mirror://cpan/authors/id/R/RU/RURBAN/Cpanel-JSON-XS-4.11.tar.gz; - sha256 = "08d17df7d373868a154bfa687f54fa06e0691836af8470fb29d538215d82bc78"; + url = mirror://cpan/authors/id/R/RU/RURBAN/Cpanel-JSON-XS-4.12.tar.gz; + sha256 = "49417b118fb111607cc7d021443e5b32fd104c0bf59d1852c95923a4916ac658"; }; meta = { description = "CPanel fork of JSON::XS, fast and correct serializing"; @@ -3061,10 +3161,10 @@ let CPANPerlReleases = buildPerlPackage { pname = "CPAN-Perl-Releases"; - version = "3.94"; + version = "4.10"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BINGOS/CPAN-Perl-Releases-3.94.tar.gz; - sha256 = "12g3mdl8lziz218a5rlflhbd295paqfqq5f9ylkdr00pnss5jfnp"; + url = mirror://cpan/authors/id/B/BI/BINGOS/CPAN-Perl-Releases-4.10.tar.gz; + sha256 = "1dgijw8rpvhy79ff8jbly5bwh7gdb7d6mn6vx5mm6krjfybdprrk"; }; meta = { homepage = https://github.com/bingos/cpan-perl-releases; @@ -3075,10 +3175,10 @@ let CPANPLUS = buildPerlPackage { pname = "CPANPLUS"; - version = "0.9176"; + version = "0.9178"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BINGOS/CPANPLUS-0.9176.tar.gz; - sha256 = "09fypxwd13fraarq6qznmw04n1zh2f2ykdz037jmzm4m2ic8n8xc"; + url = mirror://cpan/authors/id/B/BI/BINGOS/CPANPLUS-0.9178.tar.gz; + sha256 = "1x2r5pnxw3f637z1b1c1pphkbvbm7y6v63nycrqni2zlx1xjpxnm"; }; propagatedBuildInputs = [ ArchiveExtract ModulePluggable ObjectAccessor PackageConstants TermUI ]; meta = { @@ -3266,10 +3366,10 @@ let CryptRijndael = buildPerlPackage { pname = "Crypt-Rijndael"; - version = "1.13"; + version = "1.14"; src = fetchurl { url = mirror://cpan/authors/id/L/LE/LEONT/Crypt-Rijndael-1.14.tar.gz; - sha256 = "0ki16vkgzvzyjdx6mmvjfpngyvhf7cis46pymy6dr8z0vyk0jwnd"; + sha256 = "03l5nwq97a8q9na4dpd4m3r7vrwpranx225vw8xm40w7zvgw6lb4"; }; }; @@ -3454,10 +3554,10 @@ let CryptX = buildPerlPackage { pname = "CryptX"; - version = "0.063"; + version = "0.064"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIK/CryptX-0.063.tar.gz; - sha256 = "6cfc672e0e56d56cf849caf0b929ed94f87cb4e6be5c20757ca3d3dbe5569595"; + url = mirror://cpan/authors/id/M/MI/MIK/CryptX-0.064.tar.gz; + sha256 = "176ef4d2eac80731b360db04289431f0b96acc2568a1fec856abed4a51779a47"; }; meta = { description = "Crypto toolkit"; @@ -3682,10 +3782,10 @@ let DataPage = buildPerlPackage { pname = "Data-Page"; - version = "2.02"; + version = "2.03"; src = fetchurl { - url = mirror://cpan/authors/id/L/LB/LBROCARD/Data-Page-2.02.tar.gz; - sha256 = "1hvi92c4h2angryc6pngw7gbm3ysc2jfmyxk2wh9ia4vdwpbs554"; + url = mirror://cpan/authors/id/E/ET/ETHER/Data-Page-2.03.tar.gz; + sha256 = "12rxrr2b11qjk0c437cisw2kfqkafw1awcng09cv6yhzglb55yif"; }; propagatedBuildInputs = [ ClassAccessorChained ]; buildInputs = [ TestException ]; @@ -3834,6 +3934,21 @@ let }; }; + DataUtil = buildPerlModule { + pname = "Data-Util"; + version = "0.66"; + src = fetchurl { + url = mirror://cpan/authors/id/S/SY/SYOHEX/Data-Util-0.66.tar.gz; + sha256 = "1x662pqjg9p0wcigi7pwf969b2ymk66ncm2vd5dfm5i08pdkjpf3"; + }; + buildInputs = [ HashUtilFieldHashCompat ModuleBuildXSUtil ScopeGuard TestException ]; + meta = { + description = "A selection of utilities for data and data types"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/gfx/Perl-Data-Util"; + }; + }; + DataURIEncode = buildPerlPackage { pname = "Data-URIEncode"; version = "0.11"; @@ -3949,10 +4064,10 @@ let DateManip = buildPerlPackage { pname = "Date-Manip"; - version = "6.76"; + version = "6.77"; src = fetchurl { - url = mirror://cpan/authors/id/S/SB/SBECK/Date-Manip-6.76.tar.gz; - sha256 = "1a33mpkx7qqb9nqxyh2kkb596d8xq6jw0ljrd4xrwiz30f6cg1qw"; + url = mirror://cpan/authors/id/S/SB/SBECK/Date-Manip-6.77.tar.gz; + sha256 = "0sw36dc224km06jnzkyxgpi6l4cavdn8gfxd3zb11mnf0y12phsi"; }; # for some reason, parsing /etc/localtime does not work anymore - make sure that the fallback "/bin/date +%Z" will work patchPhase = '' @@ -3962,7 +4077,7 @@ let meta = { description = "Date manipulation routines"; }; - buildInputs = [ TestInter ]; + buildInputs = [ FileFindRule TestInter TestPod TestPodCoverage ]; }; DateSimple = buildPerlPackage { @@ -3979,10 +4094,10 @@ let DateTime = buildPerlPackage { pname = "DateTime"; - version = "1.50"; + version = "1.51"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-1.50.tar.gz; - sha256 = "165iqk1xvhs5j0kzsipa7aqycx3h37wqsl2r4jl104yqvmqhqszd"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-1.51.tar.gz; + sha256 = "1ibfq6acz1ih28vl613yygbb3r2d8ykx6di669vajhvswl6xl8ny"; }; buildInputs = [ CPANMetaCheck TestFatal TestWarnings ]; propagatedBuildInputs = [ DateTimeLocale DateTimeTimeZone ]; @@ -4247,10 +4362,10 @@ let DateTimeTimeZone = buildPerlPackage { pname = "DateTime-TimeZone"; - version = "2.34"; + version = "2.36"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-TimeZone-2.34.tar.gz; - sha256 = "dee1111c06f2aa705f803bc4f3d93b50df566d864a1a8bf31b55dfaf2b3de809"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-TimeZone-2.36.tar.gz; + sha256 = "7e033a3cae17a62a0a4011b9e3dd900acf8b7614e05dc6595d1f55406ec6f6a7"; }; buildInputs = [ TestFatal TestRequires ]; propagatedBuildInputs = [ ClassSingleton ParamsValidationCompiler Specio namespaceautoclean ]; @@ -4355,10 +4470,10 @@ let DevelPatchPerl = buildPerlPackage { pname = "Devel-PatchPerl"; - version = "1.56"; + version = "1.64"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BINGOS/Devel-PatchPerl-1.56.tar.gz; - sha256 = "1b97a6b82qh1dsv13rgxyiv4lffp360crgc9wiq3pyj0zr13nfc2"; + url = mirror://cpan/authors/id/B/BI/BINGOS/Devel-PatchPerl-1.64.tar.gz; + sha256 = "16fl04m0b9jccq30h7myaj6hsv4ivx53i3q5klq0d0q6w0k5sb4v"; }; propagatedBuildInputs = [ Filepushd ModulePluggable ]; meta = { @@ -4384,10 +4499,10 @@ let DevelPPPort = buildPerlPackage { pname = "Devel-PPPort"; - version = "3.45"; + version = "3.52"; src = fetchurl { - url = mirror://cpan/authors/id/A/AT/ATOOMIC/Devel-PPPort-3.45.tar.gz; - sha256 = "171dcfb3abd964081986634b79c53108f0825c47f95f915eb7cdb3309f7d04f0"; + url = mirror://cpan/authors/id/A/AT/ATOOMIC/Devel-PPPort-3.52.tar.gz; + sha256 = "cf4963786ea6821fcb7fe8979229f1c1c69a624b1ef968a498460792e35ec390"; }; meta = { description = "Perl/Pollution/Portability"; @@ -4408,6 +4523,17 @@ let }; }; + DeviceSerialPort = buildPerlPackage { + pname = "Device-SerialPort"; + version = "1.04"; + src = fetchurl { + url = mirror://cpan/authors/id/C/CO/COOK/Device-SerialPort-1.04.tar.gz; + sha256 = "1mz9a2qzkz6fbz76wcwmp48h6ckjxpcazb70q03acklvndy5d4nk"; + }; + meta = { + }; + }; + DBDMock = buildPerlModule { pname = "DBD-Mock"; version = "1.45"; @@ -4782,10 +4908,10 @@ let DevelStackTrace = buildPerlPackage { pname = "Devel-StackTrace"; - version = "2.03"; + version = "2.04"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/Devel-StackTrace-2.03.tar.gz; - sha256 = "7618cd4ebe24e254c17085f4b418784ab503cb4cb3baf8f48a7be894e59ba848"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/Devel-StackTrace-2.04.tar.gz; + sha256 = "cd3c03ed547d3d42c61fa5814c98296139392e7971c092e09a431f2c9f5d6855"; }; meta = { description = "An object representing a stack trace"; @@ -4907,6 +5033,34 @@ let }; }; + DirManifest = buildPerlModule { + pname = "Dir-Manifest"; + version = "0.2.0"; + src = fetchurl { + url = mirror://cpan/authors/id/S/SH/SHLOMIF/Dir-Manifest-0.2.0.tar.gz; + sha256 = "0yfi23czr1l50666bb9akm3sqjpqr3j8sxwn86lwzgd5qg51n2zh"; + }; + propagatedBuildInputs = [ Moo PathTiny ]; + meta = { + description = "treat a directory and a manifest file as a hash/dictionary of keys to texts or blobs"; + license = with stdenv.lib.licenses; [ mit ]; + }; + }; + + DispatchClass = buildPerlPackage { + pname = "Dispatch-Class"; + version = "0.02"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MA/MAUKE/Dispatch-Class-0.02.tar.gz; + sha256 = "10k5l4n2mp0hfn9jwn785k211n75y56zwny1zx3bvs7r38xv8kfp"; + }; + propagatedBuildInputs = [ ExporterTiny ]; + meta = { + description = "dispatch on the type (class) of an argument"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + DistCheckConflicts = buildPerlPackage { pname = "Dist-CheckConflicts"; version = "0.11"; @@ -5125,14 +5279,14 @@ let }; }; - DistZillaPluginTestMinimumVersion = buildPerlPackage { + DistZillaPluginTestMinimumVersion = buildPerlModule { pname = "Dist-Zilla-Plugin-Test-MinimumVersion"; - version = "2.000008"; + version = "2.000010"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-Plugin-Test-MinimumVersion-2.000008.tar.gz; - sha256 = "d924ce79aaaa1885510ca6ecfcb4d8bc250fb6995bc96627f1536cb589e3b660"; + url = mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Plugin-Test-MinimumVersion-2.000010.tar.gz; + sha256 = "b8b71f4b64b689f4b647a3a87d6aaaae45a68892d35e36baa976f605736370fb"; }; - buildInputs = [ TestDeep TestMinimumVersion TestOutput ]; + buildInputs = [ ModuleBuildTiny TestDeep TestMinimumVersion TestOutput ]; propagatedBuildInputs = [ DistZilla ]; meta = { description = "Release tests for minimum required versions"; @@ -5669,10 +5823,10 @@ let EV = buildPerlPackage { pname = "EV"; - version = "4.25"; + version = "4.27"; src = fetchurl { - url = mirror://cpan/authors/id/M/ML/MLEHMANN/EV-4.25.tar.gz; - sha256 = "2e65c8e8f2358599f9a48f766cc1b3ad0eaf2e6cef416adc8ad9cddc3f329c6a"; + url = mirror://cpan/authors/id/M/ML/MLEHMANN/EV-4.27.tar.gz; + sha256 = "55750e5422d8cac7a2d0c89feeaca7d840ab2268f4c537655cdda0085e0d0cbc"; }; buildInputs = [ CanaryStability ]; propagatedBuildInputs = [ commonsense ]; @@ -5926,10 +6080,10 @@ let ExtUtilsMakeMaker = buildPerlPackage { pname = "ExtUtils-MakeMaker"; - version = "7.34"; + version = "7.36"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BINGOS/ExtUtils-MakeMaker-7.34.tar.gz; - sha256 = "95f1eb44de480d00b28d031b574ec868f7aeeee199eb5abe5666f6bcbbf68480"; + url = mirror://cpan/authors/id/B/BI/BINGOS/ExtUtils-MakeMaker-7.36.tar.gz; + sha256 = "06cef6429315cdc6afa9b2dc6fbdfa33538b6f68c827f441294621858e28c558"; }; meta = { description = "Create a module Makefile"; @@ -6073,10 +6227,10 @@ let FFICheckLib = buildPerlPackage { pname = "FFI-CheckLib"; - version = "0.23"; + version = "0.25"; src = fetchurl { - url = mirror://cpan/authors/id/P/PL/PLICEASE/FFI-CheckLib-0.23.tar.gz; - sha256 = "0rjivas0rsp7d5599cjcxss80zfj7a5b8did771dlw7h2p5apisf"; + url = mirror://cpan/authors/id/P/PL/PLICEASE/FFI-CheckLib-0.25.tar.gz; + sha256 = "193b6vx11cfj2w6nv61zi9apq8165klh2zmpn5jllxpirykvjdpb"; }; buildInputs = [ Test2Suite ]; meta = { @@ -6168,10 +6322,10 @@ let FileCopyRecursive = buildPerlPackage { pname = "File-Copy-Recursive"; - version = "0.44"; + version = "0.45"; src = fetchurl { - url = mirror://cpan/authors/id/D/DM/DMUEY/File-Copy-Recursive-0.44.tar.gz; - sha256 = "1r3frbl61kr7ig9bzd60fka772cd504v3kx9kgnwvcy1inss06df"; + url = mirror://cpan/authors/id/D/DM/DMUEY/File-Copy-Recursive-0.45.tar.gz; + sha256 = "0mqivx4nbzagl3s2kxka72050sfb75xvn25j8a0f6ic3ibvir5yk"; }; buildInputs = [ PathTiny TestDeep TestFatal TestFile TestWarnings ]; }; @@ -6573,10 +6727,10 @@ let FilesysDiskUsage = buildPerlPackage { pname = "Filesys-DiskUsage"; - version = "0.12"; + version = "0.13"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MANWAR/Filesys-DiskUsage-0.12.tar.gz; - sha256 = "e8afee07014df5868f9a2784e041c82c3c8c38550f4cd48bec56d0d6c4997273"; + url = mirror://cpan/authors/id/M/MA/MANWAR/Filesys-DiskUsage-0.13.tar.gz; + sha256 = "fd3e52c6f6241271a281348d1d43c44154c2f61a32543db46aa9e15692d1b713"; }; buildInputs = [ TestWarn ]; meta = { @@ -6738,17 +6892,18 @@ let FinanceQuote = buildPerlPackage { pname = "Finance-Quote"; - version = "1.47"; + version = "1.49"; src = fetchurl { - url = mirror://cpan/authors/id/E/EC/ECOCODE/Finance-Quote-1.47.tar.gz; - sha256 = "0gzbq85738f299jaw4nj3ljnka380j2y6yspmyl71rgfypqjvbr7"; + url = mirror://cpan/authors/id/E/EC/ECOCODE/Finance-Quote-1.49.tar.gz; + sha256 = "0lxz9fsm4ld3l900zxh2w91wjygk0ifn4miw6q5k4mm67d2c9nwm"; }; - propagatedBuildInputs = [ CGI DateTime HTMLTableExtract JSON LWPProtocolHttps ]; + propagatedBuildInputs = [ CGI DateTimeFormatStrptime HTMLTableExtract JSON JSONParse LWPProtocolHttps StringUtil TextTemplate ]; meta = with stdenv.lib; { homepage = http://finance-quote.sourceforge.net/; description = "Get stock and mutual fund quotes from various exchanges"; license = licenses.gpl2; }; + buildInputs = [ TestPod ]; }; FontAFM = buildPerlPackage { @@ -6816,13 +6971,13 @@ let GamesSolitaireVerify = buildPerlModule { pname = "Games-Solitaire-Verify"; - version = "0.2000"; + version = "0.2202"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Games-Solitaire-Verify-0.2000.tar.gz; - sha256 = "dc87a348a2cacfadfb8205ff3fdbc138f475126bef175bc806ec9454285c2165"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/Games-Solitaire-Verify-0.2202.tar.gz; + sha256 = "14fe240613b41c9d3e7cc560eaabd78bd13ded66d2838b738b74f7d1811d9263"; }; - buildInputs = [ PathTiny TestDifferences ]; - propagatedBuildInputs = [ ClassXSAccessor ExceptionClass ListMoreUtils ]; + buildInputs = [ DirManifest TestDifferences ]; + propagatedBuildInputs = [ ClassXSAccessor ExceptionClass ListMoreUtils PathTiny ]; meta = { description = "Verify solutions for solitaire games"; license = stdenv.lib.licenses.mit; @@ -6900,10 +7055,10 @@ let GeoIP2 = buildPerlPackage { pname = "GeoIP2"; - version = "2.006001"; + version = "2.006002"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MAXMIND/GeoIP2-2.006001.tar.gz; - sha256 = "05pb8bj2dkfcn8z56f8dcs76x65xcn05fywm7vifmfh39qgkmm62"; + url = mirror://cpan/authors/id/M/MA/MAXMIND/GeoIP2-2.006002.tar.gz; + sha256 = "0d4qq0k0pd0xd83iykr0jkyizl499ii6ajwwwl93rgg9xsl44189"; }; propagatedBuildInputs = [ JSONMaybeXS LWPProtocolHttps MaxMindDBReader ParamsValidate Throwable ]; buildInputs = [ PathClass TestFatal TestNumberDelta ]; @@ -7362,10 +7517,10 @@ let Gtk3 = buildPerlPackage { pname = "Gtk3"; - version = "0.034"; + version = "0.035"; src = fetchurl { - url = mirror://cpan/authors/id/X/XA/XAOC/Gtk3-0.034.tar.gz; - sha256 = "0baxyhlzdf7avka40h1niiir8vz4nilqkiwh876i0hv0f8xj3nqa"; + url = mirror://cpan/authors/id/X/XA/XAOC/Gtk3-0.035.tar.gz; + sha256 = "1zhr4ixjb93rjnxsbrjc3fg86qkx1fj4w21yg5q4swjvm6fxdfcg"; }; propagatedBuildInputs = [ pkgs.gtk3 CairoGObject GlibObjectIntrospection ]; meta = { @@ -8724,10 +8879,10 @@ let Inline = buildPerlPackage { pname = "Inline"; - version = "0.82"; + version = "0.83"; src = fetchurl { - url = mirror://cpan/authors/id/T/TI/TINITA/Inline-0.82.tar.gz; - sha256 = "1af94a8e95e4ba4545592341c47d8d1dc45b01822b877f7d3095a438566e874b"; + url = mirror://cpan/authors/id/T/TI/TINITA/Inline-0.83.tar.gz; + sha256 = "171a8e5f66faf88fe5ef4de7126267cd8fb2503483432eabc3b88ac7d5be4239"; }; buildInputs = [ TestWarn ]; meta = { @@ -8745,10 +8900,10 @@ let InlineC = buildPerlPackage { pname = "Inline-C"; - version = "0.80"; + version = "0.81"; src = fetchurl { - url = mirror://cpan/authors/id/T/TI/TINITA/Inline-C-0.80.tar.gz; - sha256 = "35f5ff188f56b9c8a5ec342e2ff3a2d248ddbc91eead80d9361697914d5adbe3"; + url = mirror://cpan/authors/id/T/TI/TINITA/Inline-C-0.81.tar.gz; + sha256 = "f185258d9050d7f79b4f00f12625cc469c2f700ff62d3e831cb18d80d2c87aac"; }; buildInputs = [ FileCopyRecursive FileShareDirInstall TestWarn YAMLLibYAML ]; propagatedBuildInputs = [ Inline ParseRecDescent Pegex ]; @@ -8878,10 +9033,10 @@ let JSONPP = buildPerlPackage { pname = "JSON-PP"; - version = "4.02"; + version = "4.04"; src = fetchurl { - url = mirror://cpan/authors/id/I/IS/ISHIGAKI/JSON-PP-4.02.tar.gz; - sha256 = "11wlh4clq0cddiamh1ipps3fh9ly01j4pcdh8f4nw7912bw7pimc"; + url = mirror://cpan/authors/id/I/IS/ISHIGAKI/JSON-PP-4.04.tar.gz; + sha256 = "0smna2b8h9jlzlbfb64i31vabyqyjs3iwhng0f0byjxrsxb1qcc1"; }; meta = { description = "JSON::XS compatible pure-Perl module"; @@ -8902,6 +9057,19 @@ let }; }; + JSONParse = buildPerlPackage { + pname = "JSON-Parse"; + version = "0.55"; + src = fetchurl { + url = mirror://cpan/authors/id/B/BK/BKB/JSON-Parse-0.55.tar.gz; + sha256 = "0mnjypkiga8zdxr5kbd7sf49pcbn55ivndn01p5ln4amqgdmd66w"; + }; + meta = { + description = "Read JSON into a Perl variable"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + JSONWebToken = buildPerlModule { pname = "JSON-WebToken"; version = "0.10"; @@ -9064,10 +9232,10 @@ let LinguaENInflect = buildPerlPackage { pname = "Lingua-EN-Inflect"; - version = "1.903"; + version = "1.904"; src = fetchurl { - url = mirror://cpan/authors/id/D/DC/DCONWAY/Lingua-EN-Inflect-1.903.tar.gz; - sha256 = "fcef4b67b04cc39e427b2d70e7c5b24195edd0ed88dd705a08ecd5cd830b0d49"; + url = mirror://cpan/authors/id/D/DC/DCONWAY/Lingua-EN-Inflect-1.904.tar.gz; + sha256 = "54d344884ba9b585680975bbd4049ddbf27bf654446fb00c7e1fc538e08c3173"; }; meta = { description = "Convert singular to plural. Select 'a' or 'an'"; @@ -9122,10 +9290,10 @@ let LinguaENTagger = buildPerlPackage { pname = "Lingua-EN-Tagger"; - version = "0.30"; + version = "0.31"; src = fetchurl { - url = mirror://cpan/authors/id/A/AC/ACOBURN/Lingua-EN-Tagger-0.30.tar.gz; - sha256 = "0nrnkvsf9f0a7lp82sanmy89ms2nqq1lvjqicvsagsvzp513bl5b"; + url = mirror://cpan/authors/id/A/AC/ACOBURN/Lingua-EN-Tagger-0.31.tar.gz; + sha256 = "14z9fbl3mf6lxhp0v2apdlxy1fw1y07j4ydrjsh7p3w0wj3qr7ll"; }; propagatedBuildInputs = [ HTMLParser LinguaStem MemoizeExpireLRU ]; meta = { @@ -9394,15 +9562,16 @@ let LocaleCodes = buildPerlPackage { pname = "Locale-Codes"; - version = "3.60"; + version = "3.61"; src = fetchurl { - url = mirror://cpan/authors/id/S/SB/SBECK/Locale-Codes-3.60.tar.gz; - sha256 = "32829bc49d927335de6994f3cfd55c5e693881602564c2aa966fe86740371194"; + url = mirror://cpan/authors/id/S/SB/SBECK/Locale-Codes-3.61.tar.gz; + sha256 = "9432c02674dd789da45fe5b778599b4c648f0a3433bf71cda203fc8a0cec501d"; }; meta = { description = "A distribution of modules to handle locale codes"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ FileFindRule TestInter TestPod TestPodCoverage ]; }; LocaleGettext = buildPerlPackage { @@ -9597,6 +9766,21 @@ let }; }; + LogAnyAdapterLog4perl = buildPerlPackage { + pname = "Log-Any-Adapter-Log4perl"; + version = "0.09"; + src = fetchurl { + url = mirror://cpan/authors/id/P/PR/PREACTION/Log-Any-Adapter-Log4perl-0.09.tar.gz; + sha256 = "19f1drqnzr6g4xwjm6jk4iaa3zmiax8bzxqch04f4jr12bjd75qi"; + }; + propagatedBuildInputs = [ LogAny LogLog4perl ]; + meta = { + description = "Log::Any adapter for Log::Log4perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/preaction/Log-Any-Adapter-Log4perl"; + }; + }; + LogContextual = buildPerlPackage { pname = "Log-Contextual"; version = "0.008001"; @@ -9680,10 +9864,10 @@ let MCE = buildPerlPackage { pname = "MCE"; - version = "1.838"; + version = "1.843"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MARIOROY/MCE-1.838.tar.gz; - sha256 = "1xg63kd2la5zh7cvapv1l1wsxjallj4xv5l15bdp8jl3vvffwdhi"; + url = mirror://cpan/authors/id/M/MA/MARIOROY/MCE-1.843.tar.gz; + sha256 = "0x1s4xxxc9jj46h6i8mr8sczz0qavhal5639img1n8b96nsj6cf7"; }; meta = { description = "Many-Core Engine for Perl providing parallel processing capabilities"; @@ -9724,10 +9908,10 @@ let LogDispatchouli = buildPerlPackage { pname = "Log-Dispatchouli"; - version = "2.017"; + version = "2.019"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Log-Dispatchouli-2.017.tar.gz; - sha256 = "99f8341c8d4f8f46a673b1ff1a6edc96165d75af96ddcb6d99fa227f9af4dfbf"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Log-Dispatchouli-2.019.tar.gz; + sha256 = "fe8890c553c8f72b8b55633067270862c34db2ab8ff1cf8db0855f0427c23442"; }; buildInputs = [ TestDeep TestFatal ]; propagatedBuildInputs = [ LogDispatchArray StringFlogger SubExporterGlobExporter ]; @@ -9754,10 +9938,10 @@ let LWP = buildPerlPackage { pname = "libwww-perl"; - version = "6.38"; + version = "6.39"; src = fetchurl { - url = mirror://cpan/authors/id/O/OA/OALDERS/libwww-perl-6.38.tar.gz; - sha256 = "a8e0849b8d2798fc45a2a5f2fe45c96cbbad5baf3bcbe64a3bf85f210e78708c"; + url = mirror://cpan/authors/id/O/OA/OALDERS/libwww-perl-6.39.tar.gz; + sha256 = "9a8d7747938aa75d7d524c71574ae7f99ca66a5dac8255a7f7759f373e7774d5"; }; propagatedBuildInputs = [ FileListing HTMLParser HTTPCookies HTTPDaemon HTTPNegotiate NetHTTP TryTiny WWWRobotRules ]; # support cross-compilation by avoiding using `has_module` which does not work in miniperl (it requires B native module) @@ -9926,11 +10110,11 @@ let }; MailBox = buildPerlPackage { - version = "3.006"; + version = "3.007"; pname = "Mail-Box"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MARKOV/Mail-Box-3.006.tar.gz; - sha256 = "1fm17z13jq7ff2f4ynnajdzzdqa4sb0kx5nfy9fvb0nzw49qd502"; + url = mirror://cpan/authors/id/M/MA/MARKOV/Mail-Box-3.007.tar.gz; + sha256 = "1rqn9d6sjinbnl8a9ia4rqfmp899ad89y9h9hpzvmr8jxni7i19s"; }; doCheck = false; @@ -10072,10 +10256,10 @@ let MailTools = buildPerlPackage { pname = "MailTools"; - version = "2.20"; + version = "2.21"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MARKOV/MailTools-2.20.tar.gz; - sha256 = "15iizg2x1w7ca0r8rn3wwhp7w160ljvf55prspljwd6cm7vhcmpm"; + url = mirror://cpan/authors/id/M/MA/MARKOV/MailTools-2.21.tar.gz; + sha256 = "1js43bp2dnd8n2rv8clsv749166jnyqnc91k4wkkmw5n4rlbvnaa"; }; propagatedBuildInputs = [ TimeDate ]; meta = { @@ -10086,10 +10270,10 @@ let MailTransport = buildPerlPackage { pname = "Mail-Transport"; - version = "3.003"; + version = "3.004"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MARKOV/Mail-Transport-3.003.tar.gz; - sha256 = "0lb1awpk2wcnn5wg663982jl45x9fdn8ikxscayscxa16rim116p"; + url = mirror://cpan/authors/id/M/MA/MARKOV/Mail-Transport-3.004.tar.gz; + sha256 = "049xsjxfn00v5znmrg7vgyafy5wzxxa901hq2g083s0pyq4mlcfg"; }; propagatedBuildInputs = [ MailMessage ]; meta = { @@ -10175,10 +10359,10 @@ let MathClipper = buildPerlModule { pname = "Math-Clipper"; - version = "1.27"; + version = "1.29"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHELDRAKE/Math-Clipper-1.27.tar.gz; - sha256 = "0di8frcxa8laa5s0x4vkr2mp9abv2a099c3x4gsdpnbijj10j6dn"; + url = mirror://cpan/authors/id/S/SH/SHELDRAKE/Math-Clipper-1.29.tar.gz; + sha256 = "14vmz1x8hwnlk239dcsh0n39kd7cd7v5g1iikgbyjvc66gqw89sk"; }; nativeBuildInputs = [ pkgs.ld-is-cc-hook ]; buildInputs = [ ExtUtilsCppGuess ExtUtilsTypemapsDefault ExtUtilsXSpp ModuleBuildWithXSpp TestDeep ]; @@ -10334,10 +10518,10 @@ let MaxMindDBReader = buildPerlPackage { pname = "MaxMind-DB-Reader"; - version = "1.000013"; + version = "1.000014"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MAXMIND/MaxMind-DB-Reader-1.000013.tar.gz; - sha256 = "0w7dmfhpibazrh75bdr7vmpji83fzldsy0zjvhg3cwadr4f35kmq"; + url = mirror://cpan/authors/id/M/MA/MAXMIND/MaxMind-DB-Reader-1.000014.tar.gz; + sha256 = "1a9rrvarw3q6378w3sqv632w36a9bsh0r90yfa49lzwnkj7hf81q"; }; propagatedBuildInputs = [ DataIEEE754 DataPrinter DataValidateIP MaxMindDBCommon ]; buildInputs = [ PathClass TestBits TestFatal TestNumberDelta TestRequires ]; @@ -10349,10 +10533,10 @@ let MaxMindDBReaderXS = buildPerlModule { pname = "MaxMind-DB-Reader-XS"; - version = "1.000007"; + version = "1.000008"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MAXMIND/MaxMind-DB-Reader-XS-1.000007.tar.gz; - sha256 = "1wg1x1pqamapfhn6rbffqipncgs15k99q34agdamv76i6782ny8r"; + url = mirror://cpan/authors/id/M/MA/MAXMIND/MaxMind-DB-Reader-XS-1.000008.tar.gz; + sha256 = "11y71m77y38mi68gw5dqx54z9syvax42x3m9v7mgx35c5z4gpal4"; }; propagatedBuildInputs = [ pkgs.libmaxminddb MathInt128 MaxMindDBReader ]; buildInputs = [ NetWorks PathClass TestFatal TestNumberDelta TestRequires ]; @@ -10408,7 +10592,7 @@ let url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Menlo-1.9019.tar.gz; sha256 = "3b573f68e7b3a36a87c860be258599330fac248b518854dfb5657ac483dca565"; }; - propagatedBuildInputs = [ CPANCommonIndex CPANDistnameInfo CPANMetaCheck CaptureTiny ClassTiny ExtUtilsConfig ExtUtilsHelpers ExtUtilsInstallPaths FileWhich Filepushd HTTPTinyish ModuleCPANfile ParsePMFile StringShellQuote URI Win32ShellQuote locallib ]; + propagatedBuildInputs = [ CPANCommonIndex CPANMetaCheck CaptureTiny ExtUtilsHelpers ExtUtilsInstallPaths Filepushd HTTPTinyish ModuleCPANfile ParsePMFile StringShellQuote Win32ShellQuote locallib ]; meta = { homepage = https://github.com/miyagawa/cpanminus; description = "A CPAN client"; @@ -10604,11 +10788,11 @@ let ModernPerl = buildPerlPackage { pname = "Modern-Perl"; - version = "1.20181021"; + version = "1.20190727"; src = fetchurl { - url = mirror://cpan/authors/id/C/CH/CHROMATIC/Modern-Perl-1.20181021.tar.gz; - sha256 = "1d482b528f7c6c60f868d7d0bf0fcc9c3668250dc44fcb39a95b7c63e092c9c5"; + url = mirror://cpan/authors/id/C/CH/CHROMATIC/Modern-Perl-1.20190727.tar.gz; + sha256 = "2e69d7ab7e4a53153e686c25547ad914e7464d4e5604b8851931a6e63fc51b21"; }; meta = { homepage = https://github.com/chromatic/Modern-Perl; @@ -11029,10 +11213,10 @@ let Mojolicious = buildPerlPackage { pname = "Mojolicious"; - version = "8.14"; + version = "8.22"; src = fetchurl { - url = mirror://cpan/authors/id/S/SR/SRI/Mojolicious-8.14.tar.gz; - sha256 = "0dammdx51cyqn2b35yihk85gz1blgw85w6jv6h04cv4cdahph59q"; + url = mirror://cpan/authors/id/S/SR/SRI/Mojolicious-8.22.tar.gz; + sha256 = "0m28yb1pbnbgdq0z7ykb44j93c1vwjzv7msm6vs7msysyx84mqw6"; }; meta = { homepage = https://mojolicious.org; @@ -11323,6 +11507,21 @@ let }; }; + MooXAliases = buildPerlPackage { + pname = "MooX-Aliases"; + version = "0.001006"; + src = fetchurl { + url = mirror://cpan/authors/id/H/HA/HAARG/MooX-Aliases-0.001006.tar.gz; + sha256 = "0rrqqsm8i6rckzxgzcj2p2s4cfszzddzwbcm04yjcqdcihkk2q01"; + }; + propagatedBuildInputs = [ Moo strictures ]; + buildInputs = [ TestFatal ]; + meta = { + description = "easy aliasing of methods and attributes in Moo"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + MooXCmd = buildPerlPackage { pname = "MooX-Cmd"; version = "0.017"; @@ -11676,12 +11875,12 @@ let MooseXRoleParameterized = buildPerlModule { pname = "MooseX-Role-Parameterized"; - version = "1.10"; + version = "1.11"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Role-Parameterized-1.10.tar.gz; - sha256 = "0plx25n80mv9qwhix52z79md0qil616nbcryk2f4216kghpw2ij8"; + url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Role-Parameterized-1.11.tar.gz; + sha256 = "17pc5dly7ba0p50p2xcmp7bar8m262jcqgbkgyswl3kzbmn7dzhw"; }; - buildInputs = [ CPANMetaCheck ModuleBuildTiny MooseXRoleWithOverloading TestFatal TestRequires ]; + buildInputs = [ CPANMetaCheck ModuleBuildTiny TestFatal TestNeeds ]; propagatedBuildInputs = [ Moose namespaceautoclean ]; meta = { homepage = https://github.com/sartak/MooseX-Role-Parameterized/tree; @@ -12328,10 +12527,10 @@ let NetHTTP = buildPerlPackage { pname = "Net-HTTP"; - version = "6.18"; + version = "6.19"; src = fetchurl { - url = mirror://cpan/authors/id/O/OA/OALDERS/Net-HTTP-6.18.tar.gz; - sha256 = "7e42df2db7adce3e0eb4f78b88c450f453f5380f120fd5411232e03374ba951c"; + url = mirror://cpan/authors/id/O/OA/OALDERS/Net-HTTP-6.19.tar.gz; + sha256 = "52b76ec13959522cae64d965f15da3d99dcb445eddd85d2ce4e4f4df385b2fc4"; }; propagatedBuildInputs = [ URI ]; __darwinAllowLocalNetworking = true; @@ -12581,10 +12780,10 @@ let NetSSLeay = buildPerlPackage { pname = "Net-SSLeay"; - version = "1.85"; + version = "1.88"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIKEM/Net-SSLeay-1.85.tar.gz; - sha256 = "1j5h4ycm8538397l204d2d5fkm9595aj174pj7bkpbhwzfwqi0cx"; + url = mirror://cpan/authors/id/C/CH/CHRISN/Net-SSLeay-1.88.tar.gz; + sha256 = "1pfgh4h3szcpvqlcimc60pjbk9zwls99x5863sva0wc47i4dl010"; }; buildInputs = [ pkgs.openssl ]; doCheck = false; # Test performs network access. @@ -12651,14 +12850,13 @@ let url = mirror://cpan/authors/id/B/BS/BSCHMITZ/Net-Whois-IP-1.19.tar.gz; sha256 = "08kj2h9qiyfvv3jfz619xl796j93cslg7d96919mnrnjy6hdz6zh"; }; - - propagatedBuildInputs = [ RegexpIPv6 LWPProtocolhttps ]; doCheck = false; # https://rt.cpan.org/Public/Bug/Display.html?id=99377 postPatch = '' substituteInPlace IP.pm --replace " AutoLoader" "" ''; + buildInputs = [ RegexpIPv6 ]; }; NetWorks = buildPerlPackage { @@ -13199,6 +13397,20 @@ let }; }; + ParserMGC = buildPerlModule { + pname = "Parser-MGC"; + version = "0.16"; + src = fetchurl { + url = mirror://cpan/authors/id/P/PE/PEVANS/Parser-MGC-0.16.tar.gz; + sha256 = "14bv2fwg59q4s3kv0vf11hh222anlm181ig87cph2f68y32n2i3l"; + }; + propagatedBuildInputs = [ FileSlurpTiny ]; + meta = { + description = "build simple recursive-descent parsers"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + PathClass = buildPerlModule { pname = "Path-Class"; version = "0.37"; @@ -13212,6 +13424,22 @@ let }; }; + PathIteratorRule = buildPerlPackage { + pname = "Path-Iterator-Rule"; + version = "1.014"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Path-Iterator-Rule-1.014.tar.gz; + sha256 = "19mik0r5v1cmxfxm0h4lwqyj0nmq6jgnvvq96hqcjgylpvc02x1z"; + }; + propagatedBuildInputs = [ NumberCompare TextGlob TryTiny ]; + buildInputs = [ Filepushd PathTiny TestDeep TestFilename ]; + meta = { + description = "Iterative, recursive file finder"; + license = with stdenv.lib.licenses; [ asl20 ]; + homepage = "https://github.com/dagolden/Path-Iterator-Rule"; + }; + }; + PathTiny = buildPerlPackage { pname = "Path-Tiny"; version = "0.108"; @@ -13267,10 +13495,10 @@ let PDFAPI2 = buildPerlPackage { pname = "PDF-API2"; - version = "2.033"; + version = "2.034"; src = fetchurl { - url = mirror://cpan/authors/id/S/SS/SSIMMS/PDF-API2-2.033.tar.gz; - sha256 = "9c0866ec1a3053f73afaca5f5cdbe6925903b4ce606f4bf4ac317731a69d27a0"; + url = mirror://cpan/authors/id/S/SS/SSIMMS/PDF-API2-2.034.tar.gz; + sha256 = "8aa98818fb6e4bebd6f9096e222989dcdd5fd4c5fa2ad1c7f0149053fc68f1cc"; }; buildInputs = [ TestException TestMemoryCycle ]; propagatedBuildInputs = [ FontTTF ]; @@ -13338,13 +13566,13 @@ let PerlCritic = buildPerlModule { pname = "Perl-Critic"; - version = "1.132"; + version = "1.134"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PETDANCE/Perl-Critic-1.132.tar.gz; - sha256 = "bcf36e32830373cf1ee35abbe2e20336fbbcad5041c14aad6822ac947be092b1"; + url = mirror://cpan/authors/id/P/PE/PETDANCE/Perl-Critic-1.134.tar.gz; + sha256 = "90ec87ed8d49dd5fd686a0e4c8ef77268962faf14b18b43f2385db79e34085eb"; }; buildInputs = [ TestDeep ]; - propagatedBuildInputs = [ BKeywords ConfigTiny FileHomeDir ModulePluggable PPIxQuoteLike PPIxRegexp PPIxUtilities PerlTidy PodSpell StringFormat ]; + propagatedBuildInputs = [ BKeywords ConfigTiny FileWhich ModulePluggable PPIxQuoteLike PPIxRegexp PPIxUtilities PerlTidy PodSpell StringFormat ]; meta = { homepage = http://perlcritic.com; description = "Critique Perl source code for best-practices"; @@ -13449,10 +13677,10 @@ let PerlTidy = buildPerlPackage { pname = "Perl-Tidy"; - version = "20181120"; + version = "20190601"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHANCOCK/Perl-Tidy-20181120.tar.gz; - sha256 = "7db0eeb76535a62cbb4e69b6558e0705162d476a654a7a5ec472aa846b8c4569"; + url = mirror://cpan/authors/id/S/SH/SHANCOCK/Perl-Tidy-20190601.tar.gz; + sha256 = "8f3d704b4eff457bf5bb70f9adf570690b2252dec31f75e8cb743392f1be338f"; }; meta = { description = "Indent and reformat perl scripts"; @@ -13625,10 +13853,10 @@ let PlackMiddlewareRemoveRedundantBody = buildPerlPackage { pname = "Plack-Middleware-RemoveRedundantBody"; - version = "0.07"; + version = "0.09"; src = fetchurl { - url = mirror://cpan/authors/id/S/SW/SWEETKID/Plack-Middleware-RemoveRedundantBody-0.07.tar.gz; - sha256 = "64b841d5d74b4c4a595b85749d69297f4f5f5c0829a6e99e0099f05dd69be3c3"; + url = mirror://cpan/authors/id/S/SW/SWEETKID/Plack-Middleware-RemoveRedundantBody-0.09.tar.gz; + sha256 = "80d45f93d6b7290b0bd8b3cedd84a37fc501456cc3dec02ec7aad81c0018087e"; }; propagatedBuildInputs = [ Plack ]; meta = { @@ -13772,13 +14000,13 @@ let PPI = buildPerlPackage { pname = "PPI"; - version = "1.236"; + version = "1.270"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MITHALDU/PPI-1.236.tar.gz; - sha256 = "c6674b349c0b7d9a6d668e789a5e5215477d88ed4c8203aa69a2a50085308aec"; + url = mirror://cpan/authors/id/M/MI/MITHALDU/PPI-1.270.tar.gz; + sha256 = "622a698c781bb85d2bdf7bbfe040fe70d33b79774c9ae01fce2375dc73faf457"; }; - buildInputs = [ ClassInspector FileRemove TestDeep TestObject TestSubCalls ]; - propagatedBuildInputs = [ Clone IOString ListMoreUtils ParamsUtil TaskWeaken ]; + buildInputs = [ ClassInspector TestDeep TestNoWarnings TestObject TestSubCalls ]; + propagatedBuildInputs = [ Clone IOString ParamsUtil TaskWeaken ]; # Remove test that fails due to unexpected shebang after # patchShebang. @@ -13793,10 +14021,10 @@ let PPIxQuoteLike = buildPerlModule { pname = "PPIx-QuoteLike"; - version = "0.006"; + version = "0.007"; src = fetchurl { - url = mirror://cpan/authors/id/W/WY/WYANT/PPIx-QuoteLike-0.006.tar.gz; - sha256 = "1gyp3ywnhpv7k3cqdgywpinz7wgqzg38iailcnyiwgl62wib0bsq"; + url = mirror://cpan/authors/id/W/WY/WYANT/PPIx-QuoteLike-0.007.tar.gz; + sha256 = "040ma7763isxn9axsf9s8g00hm3ld6dajwp3nhq0nn4mz8cfaa3w"; }; propagatedBuildInputs = [ PPI ]; meta = { @@ -13807,12 +14035,12 @@ let PPIxRegexp = buildPerlModule { pname = "PPIx-Regexp"; - version = "0.064"; + version = "0.065"; src = fetchurl { - url = mirror://cpan/authors/id/W/WY/WYANT/PPIx-Regexp-0.064.tar.gz; - sha256 = "8769c634294c941f83b5a7e74a14eda3671c1fa131b8d6416e7fc77f7cd57408"; + url = mirror://cpan/authors/id/W/WY/WYANT/PPIx-Regexp-0.065.tar.gz; + sha256 = "eb4a56858c077d9e6a859c4f29d7659ed40ea588d21cfe7193dd91143a8e843e"; }; - propagatedBuildInputs = [ PPI ]; + propagatedBuildInputs = [ ListMoreUtils PPI ]; meta = { description = "Parse regular expressions"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -13847,10 +14075,10 @@ let ProcProcessTable = buildPerlPackage { pname = "Proc-ProcessTable"; - version = "0.56"; + version = "0.59"; src = fetchurl { - url = mirror://cpan/authors/id/J/JW/JWB/Proc-ProcessTable-0.56.tar.gz; - sha256 = "99fb8fd11e4e438399dd362d95b5b2073f1f340e9b3a7f04e76b6c7428170660"; + url = mirror://cpan/authors/id/J/JW/JWB/Proc-ProcessTable-0.59.tar.gz; + sha256 = "f8cc5054d78c35a0ce39fb75430b4ef402e2a99013d2ec37e7997f316594606c"; }; meta = { description = "Perl extension to access the unix process table"; @@ -13988,7 +14216,7 @@ let url = mirror://cpan/authors/id/R/RJ/RJBS/Perl-PrereqScanner-1.023.tar.gz; sha256 = "280a1c4710390865fb9f310a861a34720b28b4cbe50609c841af5cf2d3a2bced"; }; - propagatedBuildInputs = [ GetoptLongDescriptive ModulePath Moose PPI StringRewritePrefix namespaceautoclean ]; + propagatedBuildInputs = [ GetoptLongDescriptive ListMoreUtils ModulePath Moose PPI StringRewritePrefix namespaceautoclean ]; meta = { homepage = https://github.com/rjbs/Perl-PrereqScanner; description = "A tool to scan your Perl code for its prerequisites"; @@ -13998,10 +14226,10 @@ let PerlPrereqScannerNotQuiteLite = buildPerlPackage { pname = "Perl-PrereqScanner-NotQuiteLite"; - version = "0.9904"; + version = "0.9906"; src = fetchurl { - url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Perl-PrereqScanner-NotQuiteLite-0.9904.tar.gz; - sha256 = "1qf6x49sjswazh7bicpm7wnwpdnx245ws02s53dvbxcbw2c66hsn"; + url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Perl-PrereqScanner-NotQuiteLite-0.9906.tar.gz; + sha256 = "19b59zf69ayabkacifz36b5z3kfh4kbv5kn1a1habk46f6v7g9pj"; }; propagatedBuildInputs = [ DataDump ModuleCPANfile ModuleFind RegexpTrie ]; buildInputs = [ ExtUtilsMakeMakerCPANfile TestFailWarnings TestUseAllModules ]; @@ -14261,10 +14489,10 @@ let PodSimple = buildPerlPackage { pname = "Pod-Simple"; - version = "3.35"; + version = "3.39"; src = fetchurl { - url = mirror://cpan/authors/id/K/KH/KHW/Pod-Simple-3.35.tar.gz; - sha256 = "0gg11ibbc02l2aw0bsv4jx0jax8z0apgfy3p5csqnvhlsb6218cr"; + url = mirror://cpan/authors/id/K/KH/KHW/Pod-Simple-3.39.tar.gz; + sha256 = "0qh43griaz3i21ca745irrnjbksv5q07h4wdjv28nqpcc55pva8m"; }; }; @@ -14362,10 +14590,10 @@ let Razor2ClientAgent = buildPerlPackage { pname = "Razor2-Client-Agent"; - version = "2.84"; + version = "2.86"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TODDR/Razor2-Client-Agent-2.84.tar.gz; - sha256 = "d7c2ed7f347a673b1425e4da7656073d6c52847bc7403bf57e3a404b52f7e501"; + url = mirror://cpan/authors/id/T/TO/TODDR/Razor2-Client-Agent-2.86.tar.gz; + sha256 = "5e062e02ebb65e24b708e7eefa5300c43d6f657bf20d08fec4ca8a0a3b94845f"; }; propagatedBuildInputs = [ DigestSHA1 URI ]; meta = { @@ -14403,12 +14631,12 @@ let Redis = buildPerlModule { pname = "Redis"; - version = "1.991"; + version = "1.995"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAMS/Redis-1.991.tar.gz; - sha256 = "f7d1a934fa9360a26e480f896f97be0fd62807f9d9baca65a9aa8d007ff2acaa"; + url = mirror://cpan/authors/id/D/DA/DAMS/Redis-1.995.tar.gz; + sha256 = "a0b07b284ff12bb852a3120723f1e63ab279df575d6c52a78f914565a9f0b906"; }; - buildInputs = [ IOString ModuleBuildTiny PodCoverageTrustPod TestCPANMeta TestDeep TestFatal TestSharedFork TestTCP ]; + buildInputs = [ IOString ModuleBuildTiny TestDeep TestFatal TestSharedFork TestTCP ]; propagatedBuildInputs = [ IOSocketTimeout TryTiny ]; meta = { homepage = https://github.com/PerlRedis/perl-redis; @@ -14467,10 +14695,10 @@ let RegexpGrammars = buildPerlModule { pname = "Regexp-Grammars"; - version = "1.049"; + version = "1.052"; src = fetchurl { - url = mirror://cpan/authors/id/D/DC/DCONWAY/Regexp-Grammars-1.049.tar.gz; - sha256 = "2e642a7051b9ea5dccd05d53e49684ca28e99c43b811bbec37d160d3f81edf68"; + url = mirror://cpan/authors/id/D/DC/DCONWAY/Regexp-Grammars-1.052.tar.gz; + sha256 = "d552e7aaec956fc9ff0c56602fc95bc5c97ef815a0a8df7f42d1128f39534a62"; }; meta = { description = "Add grammatical parsing features to Perl 5.10 regexes"; @@ -14604,10 +14832,10 @@ let RoleTiny = buildPerlPackage { pname = "Role-Tiny"; - version = "2.000006"; + version = "2.000007"; src = fetchurl { - url = mirror://cpan/authors/id/H/HA/HAARG/Role-Tiny-2.000006.tar.gz; - sha256 = "cc73418c904a0286ecd8915eac11f5be2a8d1e17ea9cb54c9116b0340cd3e382"; + url = mirror://cpan/authors/id/E/ET/ETHER/Role-Tiny-2.000007.tar.gz; + sha256 = "33af02d79d5e9ae76172fd1b2a80230bd8cfde146e1b9327a094a6dfdec6fb56"; }; meta = { description = "Roles. Like a nouvelle cuisine portion size slice of Moose"; @@ -14701,10 +14929,10 @@ let ScopeUpper = buildPerlPackage { pname = "Scope-Upper"; - version = "0.31"; + version = "0.32"; src = fetchurl { - url = mirror://cpan/authors/id/V/VP/VPIT/Scope-Upper-0.31.tar.gz; - sha256 = "cc4d2ce0f185b4867d73b4083991117052a523fd409debf15bdd7e374cc16d8c"; + url = mirror://cpan/authors/id/V/VP/VPIT/Scope-Upper-0.32.tar.gz; + sha256 = "ccaff3251c092f2af8b5ad840b76655c4bc4ccf504ff7bde233811822a40abcf"; }; meta = { description = "Act on upper scopes"; @@ -15077,12 +15305,12 @@ let SQLTranslator = buildPerlPackage { pname = "SQL-Translator"; - version = "0.11024"; + version = "1.60"; src = fetchurl { - url = mirror://cpan/authors/id/I/IL/ILMARI/SQL-Translator-0.11024.tar.gz; - sha256 = "5bde9d6f67850089ef35a9296d6f53e5ee8e991438366b71477f3f27c1581bb1"; + url = mirror://cpan/authors/id/I/IL/ILMARI/SQL-Translator-1.60.tar.gz; + sha256 = "6bb0cb32ca25da69df65e5de71f679f3ca90044064526fa336cabd342f220e87"; }; - buildInputs = [ JSON TestDifferences TestException XMLWriter YAML ]; + buildInputs = [ FileShareDirInstall JSONMaybeXS TestDifferences TestException XMLWriter YAML ]; propagatedBuildInputs = [ CarpClan DBI FileShareDir Moo PackageVariant ParseRecDescent TryTiny ]; meta = { description = "SQL DDL transformations and more"; @@ -15131,10 +15359,10 @@ let Starman = buildPerlModule { pname = "Starman"; - version = "0.4014"; + version = "0.4015"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Starman-0.4014.tar.gz"; - sha256 = "1sbb5rb3vs82rlh1fjkgkcmj5pj62b4y9si4ihh45sl9m8c2qxx5"; + url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Starman-0.4015.tar.gz; + sha256 = "1y1kn4929k299fbf6sw9lxcsdlq9fvq777p6yrzk591rr9xhkx8h"; }; buildInputs = [ LWP ModuleBuildTiny TestRequires TestTCP ]; propagatedBuildInputs = [ DataDump HTTPParserXS NetServer Plack ]; @@ -15207,10 +15435,10 @@ let Storable = buildPerlPackage { pname = "Storable"; - version = "3.11"; + version = "3.15"; src = fetchurl { - url = mirror://cpan/authors/id/X/XS/XSAWYERX/Storable-3.11.tar.gz; - sha256 = "b2dac116d2f5adaf289e9a8a9bbac35cc2c24a9d2221fea9b6578a33b8ec7d28"; + url = mirror://cpan/authors/id/X/XS/XSAWYERX/Storable-3.15.tar.gz; + sha256 = "fc3dad06cb2e6fc86a2f2abc5b5491d9da328ca3e6b6306559c224521db174da"; }; meta = { license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -15853,7 +16081,7 @@ let sha256 = "a2f73c65d0e5676cf4aae213ba4c3f88bf85f084a2165f1e71e3ce5b19023206"; }; buildInputs = [ CodeTidyAll TestDataSplit TestDifferences TestPerlTidy TestRunPluginTrimDisplayedFilenames TestRunValgrind TestTrailingSpace TestTrap ]; - propagatedBuildInputs = [ EnvPath FileWhich GamesSolitaireVerify InlineC MooX PathTiny StringShellQuote TaskTestRunAllPlugins TemplateToolkit YAMLLibYAML ]; + propagatedBuildInputs = [ EnvPath FileWhich GamesSolitaireVerify InlineC MooX StringShellQuote TaskTestRunAllPlugins TemplateToolkit YAMLLibYAML ]; meta = { description = "Install the CPAN dependencies of the Freecell Solver test suite"; license = stdenv.lib.licenses.mit; @@ -15988,10 +16216,10 @@ let TemplateToolkit = buildPerlPackage { pname = "Template-Toolkit"; - version = "2.28"; + version = "2.29"; src = fetchurl { - url = mirror://cpan/authors/id/A/AT/ATOOMIC/Template-Toolkit-2.28.tar.gz; - sha256 = "1msxg3j1hx5wsc7vr81x5gs9gdbn4y0x6cvyj3pq4dgi1603dbvi"; + url = mirror://cpan/authors/id/A/AT/ATOOMIC/Template-Toolkit-2.29.tar.gz; + sha256 = "0ya7c49q2rd2gdjf28y60iq8wsr2afphsy1labyhbf0zyhfdgp9b"; }; propagatedBuildInputs = [ AppConfig ]; doCheck = !stdenv.isDarwin; @@ -16145,10 +16373,10 @@ let TermShell = buildPerlModule { pname = "Term-Shell"; - version = "0.10"; + version = "0.11"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Term-Shell-0.10.tar.gz; - sha256 = "7d1f824c2db22769b60000b5b9ca2ad469c154939f9ec1cd3f0e06e9c967dda3"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/Term-Shell-0.11.tar.gz; + sha256 = "7a142361f22f2e5fae9d6e39353663e8bdfa6118d1aee82204bd9083ddb04154"; }; propagatedBuildInputs = [ TermReadKey TextAutoformat ]; meta = with stdenv.lib; { @@ -16259,12 +16487,12 @@ let Test2PluginNoWarnings = buildPerlPackage { pname = "Test2-Plugin-NoWarnings"; - version = "0.06"; + version = "0.07"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/Test2-Plugin-NoWarnings-0.06.tar.gz; - sha256 = "002qk6qsm0l6r2kaxywvc38w0yf0mlavgywq8li076pn6kcw3242"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/Test2-Plugin-NoWarnings-0.07.tar.gz; + sha256 = "1sxqcbklmpxpkysq3wbivs77n3c8mvasvfa38dzmyqz04ifaf7gz"; }; - buildInputs = [ IPCRun3 Test2Suite ]; + buildInputs = [ CaptureTiny IPCRun3 Test2Suite ]; meta = { description = "Fail if tests warn"; license = with stdenv.lib.licenses; [ artistic2 ]; @@ -16273,10 +16501,10 @@ let Test2Suite = buildPerlPackage { pname = "Test2-Suite"; - version = "0.000119"; + version = "0.000122"; src = fetchurl { - url = mirror://cpan/authors/id/E/EX/EXODIST/Test2-Suite-0.000119.tar.gz; - sha256 = "fd48764118acf1c30057f58f0af90696b194fbc5b637c77e08672e949c101e74"; + url = mirror://cpan/authors/id/E/EX/EXODIST/Test2-Suite-0.000122.tar.gz; + sha256 = "83828cf440ce2a7bfc2fe48f535931e44328e39810370b04c9e947db888a7442"; }; propagatedBuildInputs = [ ModulePluggable ScopeGuard SubInfo TermTable TestSimple13 ]; meta = { @@ -16454,10 +16682,10 @@ let TestCompile = buildPerlModule { pname = "Test-Compile"; - version = "1.3.0"; + version = "2.2.2"; src = fetchurl { - url = mirror://cpan/authors/id/E/EG/EGILES/Test-Compile-v1.3.0.tar.gz; - sha256 = "77527e9477ac5260443c756367a7f7bc3d8f6c6ebbc561b0b2fb3f79303bad33"; + url = mirror://cpan/authors/id/E/EG/EGILES/Test-Compile-v2.2.2.tar.gz; + sha256 = "7853b44a9819eb3e6003260eedf904a1ad80035ea5254296ce014f96084b65d4"; }; propagatedBuildInputs = [ UNIVERSALrequire ]; meta = { @@ -16657,6 +16885,20 @@ let }; }; + TestFilename = buildPerlPackage { + pname = "Test-Filename"; + version = "0.03"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Test-Filename-0.03.tar.gz; + sha256 = "1gpw4mjw68gnby8s4cifvbz6g2923xsc189jkw9d27i8qv20qiba"; + }; + propagatedBuildInputs = [ PathTiny ]; + meta = { + description = "Portable filename comparison"; + license = with stdenv.lib.licenses; [ asl20 ]; + }; + }; + TestFork = buildPerlModule { pname = "Test-Fork"; version = "0.02"; @@ -16749,6 +16991,22 @@ let }; }; + TestLWPUserAgent = buildPerlPackage { + pname = "Test-LWP-UserAgent"; + version = "0.033"; + src = fetchurl { + url = mirror://cpan/authors/id/E/ET/ETHER/Test-LWP-UserAgent-0.033.tar.gz; + sha256 = "03fjjj65fpjr4pv1532kwci1llfbsv4g9an0h7k723yqfx1wgdsb"; + }; + propagatedBuildInputs = [ LWP SafeIsa namespaceclean ]; + buildInputs = [ PathTiny Plack TestDeep TestFatal TestNeeds TestRequiresInternet TestWarnings ]; + meta = { + description = "A LWP::UserAgent suitable for simulating and testing network calls"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/karenetheridge/Test-LWP-UserAgent"; + }; + }; + TestLeakTrace = buildPerlPackage { pname = "Test-LeakTrace"; version = "0.16"; @@ -16854,10 +17112,10 @@ let SUPER = buildPerlModule { pname = "SUPER"; - version = "1.20141117"; + version = "1.20190531"; src = fetchurl { - url = mirror://cpan/authors/id/C/CH/CHROMATIC/SUPER-1.20141117.tar.gz; - sha256 = "1a620e7d60aee9b13b1b26a44694c43fdb2bba1755cfff435dae83c7d42cc0b2"; + url = mirror://cpan/authors/id/C/CH/CHROMATIC/SUPER-1.20190531.tar.gz; + sha256 = "685d1ee76e7f0e9006942923bf7df8b11c107132992917593dcf7397d417d39a"; }; propagatedBuildInputs = [ SubIdentify ]; meta = { @@ -17297,10 +17555,10 @@ let TestRunValgrind = buildPerlModule { pname = "Test-RunValgrind"; - version = "0.2.0"; + version = "0.2.1"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Test-RunValgrind-0.2.0.tar.gz; - sha256 = "70947565ad0be3e5d0cd9aca9e1fd0cb07c873e574310e92e8eca629ec6cd631"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/Test-RunValgrind-0.2.1.tar.gz; + sha256 = "25a4a8bfcefaed7c40d8b8492e8828e798e6c85ca5f34ce4b9993f9899a7b09c"; }; buildInputs = [ TestTrap ]; propagatedBuildInputs = [ PathTiny ]; @@ -17340,10 +17598,10 @@ let TestSimple13 = buildPerlPackage { pname = "Test-Simple"; - version = "1.302162"; + version = "1.302164"; src = fetchurl { - url = mirror://cpan/authors/id/E/EX/EXODIST/Test-Simple-1.302162.tar.gz; - sha256 = "73a0197c3d735e060881da509f4c5fa76c4cbf7dbabd4297d3cf5f5feed31fc4"; + url = mirror://cpan/authors/id/E/EX/EXODIST/Test-Simple-1.302164.tar.gz; + sha256 = "50277b613f09cd52eb87b02c69ce0517b80080be8a8d80e1eda609479b0d6615"; }; meta = { description = "Basic utilities for writing tests"; @@ -17378,10 +17636,10 @@ let TestSynopsis = buildPerlPackage { pname = "Test-Synopsis"; - version = "0.15"; + version = "0.16"; src = fetchurl { - url = mirror://cpan/authors/id/Z/ZO/ZOFFIX/Test-Synopsis-0.15.tar.gz; - sha256 = "1cxxidhwf8j8n41d423ankvls2wdi7aw755csi3hcv3mj9k67mfi"; + url = mirror://cpan/authors/id/Z/ZO/ZOFFIX/Test-Synopsis-0.16.tar.gz; + sha256 = "09891vnkw9i8v074rswaxbrp6x2d8j8r90gqc306497ppiryq4qv"; }; meta = { description = "Test your SYNOPSIS code"; @@ -17659,11 +17917,11 @@ let TextBibTeX = buildPerlModule { pname = "Text-BibTeX"; - version = "0.87"; + version = "0.88"; buildInputs = [ CaptureTiny ConfigAutoConf ExtUtilsLibBuilder ]; src = fetchurl { - url = mirror://cpan/authors/id/A/AM/AMBS/Text-BibTeX-0.87.tar.gz; - sha256 = "1qhm0fin3j6nqpzlk0xy1lx6bzcrhb7fr82rjgkcq0wgmw91mqax"; + url = mirror://cpan/authors/id/A/AM/AMBS/Text-BibTeX-0.88.tar.gz; + sha256 = "0b7lmjvfmypps1nw6nsdikgaakm0n0g4186glaqazg5xd1p5h55h"; }; perlPreHook = "export LD=$CC"; perlPostHook = stdenv.lib.optionalString stdenv.isDarwin '' @@ -17702,10 +17960,10 @@ let TextCSV = buildPerlPackage { pname = "Text-CSV"; - version = "1.99"; + version = "2.00"; src = fetchurl { - url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Text-CSV-1.99.tar.gz; - sha256 = "e74ec039b12cc51d346bf1d814af7db8a05cb0a98340e7547a21646da8668cd2"; + url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Text-CSV-2.00.tar.gz; + sha256 = "8ccbd9195805222d995844114d0e595bb24ce188f85284dbf256080311cbb2c2"; }; meta = { description = "Comma-separated values manipulator (using XS or PurePerl)"; @@ -17789,6 +18047,21 @@ let }; }; + TextHogan = buildPerlPackage { + pname = "Text-Hogan"; + version = "2.02"; + src = fetchurl { + url = mirror://cpan/authors/id/K/KA/KAORU/Text-Hogan-2.02.tar.gz; + sha256 = "0b3hzl4fz1bypmdh225wwx9lcmjx4bxz8l2p800x5vy8r2w7ngd3"; + }; + propagatedBuildInputs = [ Clone TextTrim ]; + buildInputs = [ DataVisitor PathTiny TryTiny YAML ]; + meta = { + description = "Text::Hogan - A mustache templating engine statement-for-statement cloned from hogan.js"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + TextIconv = buildPerlPackage { pname = "Text-Iconv"; version = "1.7"; @@ -18017,10 +18290,10 @@ let TextTemplate = buildPerlPackage { pname = "Text-Template"; - version = "1.55"; + version = "1.56"; src = fetchurl { - url = mirror://cpan/authors/id/M/MS/MSCHOUT/Text-Template-1.55.tar.gz; - sha256 = "a4948be945250c17f9f0aaee56cc79b3195dcebcb75215b55d6ed1ca2b02f18b"; + url = mirror://cpan/authors/id/M/MS/MSCHOUT/Text-Template-1.56.tar.gz; + sha256 = "09aaa095c562d22824daf849378a58632446093f397d8c7acb37c25a7f37e646"; }; buildInputs = [ TestMoreUTF8 TestWarnings ]; }; @@ -18379,10 +18652,10 @@ let TimeDuration = buildPerlPackage { pname = "Time-Duration"; - version = "1.20"; + version = "1.21"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/Time-Duration-1.20.tar.gz; - sha256 = "1f5vkid4pl5iq3hal01hk1zjbbzrqpx4m1djawbp93l152shb0j5"; + url = mirror://cpan/authors/id/N/NE/NEILB/Time-Duration-1.21.tar.gz; + sha256 = "1f59z2svfydxgd1gzrb5k3hl6d432kzmskk7jhv2dyb5hyx0wd7y"; }; meta = { description = "Rounded or exact English expression of durations"; @@ -18392,10 +18665,10 @@ let TimeDurationParse = buildPerlPackage { pname = "Time-Duration-Parse"; - version = "0.14"; + version = "0.15"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/Time-Duration-Parse-0.14.tar.gz; - sha256 = "17nh73r50mqqpgxdf3zpgdiqrizmjy0vdk0zd6xi9zcsdijrdhnc"; + url = mirror://cpan/authors/id/N/NE/NEILB/Time-Duration-Parse-0.15.tar.gz; + sha256 = "10g39bbrxkabbsfq4rv7f5b5x7h3jba08j4pg8gwr0b9iqx19n31"; }; buildInputs = [ TimeDuration ]; propagatedBuildInputs = [ ExporterLite ]; @@ -18418,6 +18691,17 @@ let }; }; + TimeOut = buildPerlPackage { + pname = "Time-Out"; + version = "0.11"; + src = fetchurl { + url = mirror://cpan/authors/id/P/PA/PATL/Time-Out-0.11.tar.gz; + sha256 = "1lhmx1x8j6z1k9vn32bcsw7g44cg22icshnnc37djlnlixlxm5lk"; + }; + meta = { + }; + }; + TimeParseDate = buildPerlPackage { pname = "Time-ParseDate"; version = "2015.103"; @@ -18513,6 +18797,19 @@ let }; }; + TryTinyByClass = buildPerlPackage { + pname = "Try-Tiny-ByClass"; + version = "0.01"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MA/MAUKE/Try-Tiny-ByClass-0.01.tar.gz; + sha256 = "0ipif12ix6vnmlyar4gh89libfadbsd9kvqg52f2cpr957slx3h3"; + }; + propagatedBuildInputs = [ DispatchClass TryTiny ]; + meta = { + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + Twiggy = buildPerlPackage { pname = "Twiggy"; version = "0.1025"; @@ -18755,6 +19052,35 @@ let }; }; + URISmartURI = buildPerlPackage { + pname = "URI-SmartURI"; + version = "0.032"; + src = fetchurl { + url = mirror://cpan/authors/id/R/RK/RKITOVER/URI-SmartURI-0.032.tar.gz; + sha256 = "0b2grkmkbnp37q85wj7jpj5zr93vdbisgxlls2vl5q928rwln5zb"; + }; + propagatedBuildInputs = [ ClassC3Componentised FileFindRule ListMoreUtils Moose URI namespaceclean ]; + buildInputs = [ TestFatal TestNoWarnings ]; + meta = { + description = "Subclassable and hostless URIs"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + URITemplate = buildPerlPackage { + pname = "URI-Template"; + version = "0.24"; + src = fetchurl { + url = mirror://cpan/authors/id/B/BR/BRICAS/URI-Template-0.24.tar.gz; + sha256 = "1phibcmam2hklrddzj79l43va1gcqpyszbw21ynxq53ynmhjvbk8"; + }; + propagatedBuildInputs = [ URI ]; + meta = { + description = "Object for handling URI templates (RFC 6570)"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + URIws = buildPerlPackage { pname = "URI-ws"; version = "0.03"; @@ -18811,15 +19137,11 @@ let vidir = buildPerlPackage { pname = "App-vidir"; - version = "0.040"; + version = "0.042"; src = fetchurl { - url = "mirror://cpan/authors/id/W/WO/WOLDRICH/App-vivid-0.040-woldrich.tar.gz"; - sha256 = "0c97yx33pyhskbmwpqbwlkxr85awd6kg1baibvqkarhhvc8v7l0h"; + url = "mirror://cpan/authors/id/W/WO/WOLDRICH/App-vidir-0.042.tar.gz"; + sha256 = "18xkln3xajysxk0jwfyhavnifrsz38zv81s1gfb1w0xkwky3cla3"; }; - # NB: This preInstall a workaround for a problem that is fixed in HEAD. - preInstall = '' - sed -i -e '/^use encoding/d' bin/vidir - ''; outputs = [ "out" ]; meta = { maintainers = [ maintainers.chreekat ]; @@ -18892,10 +19214,10 @@ let WWWFormUrlEncoded = buildPerlModule { pname = "WWW-Form-UrlEncoded"; - version = "0.25"; + version = "0.26"; src = fetchurl { - url = mirror://cpan/authors/id/K/KA/KAZEBURO/WWW-Form-UrlEncoded-0.25.tar.gz; - sha256 = "0kh7qrskhbk4j253pr2q4vpn73q5k6fj517m3lnj8n755z9adxz1"; + url = mirror://cpan/authors/id/K/KA/KAZEBURO/WWW-Form-UrlEncoded-0.26.tar.gz; + sha256 = "1x4h5m5fkwaa0gbn6zp9mjrhr3r989w8wyrjxiii3dqm3xghnj60"; }; meta = { description = "parser and builder for application/x-www-form-urlencoded"; @@ -18999,10 +19321,10 @@ let Workflow = buildPerlModule { pname = "Workflow"; - version = "1.45"; + version = "1.46"; src = fetchurl { - url = mirror://cpan/authors/id/J/JO/JONASBN/Workflow-1.45.tar.gz; - sha256 = "0w814z4j85gghzqnbxzsr60m8dbqc02yi7137sq58lhbsfshmvhx"; + url = mirror://cpan/authors/id/J/JO/JONASBN/Workflow-1.46.tar.gz; + sha256 = "10zxp39yp11ry5j1c1krhx7s57rb2r8m48jf66k8f4jzm6f0w7pf"; }; buildInputs = [ DBDMock ListMoreUtils PodCoverageTrustPod TestException TestKwalitee TestPod TestPodCoverage ]; propagatedBuildInputs = [ ClassAccessor ClassFactory ClassObservable DBI DataUUID DateTimeFormatStrptime FileSlurp LogDispatch LogLog4perl XMLSimple ]; @@ -19065,6 +19387,22 @@ let doCheck = false; # requires an X server }; + X11ProtocolOther = buildPerlPackage { + pname = "X11-Protocol-Other"; + version = "31"; + src = fetchurl { + url = mirror://cpan/authors/id/K/KR/KRYDE/X11-Protocol-Other-31.tar.gz; + sha256 = "1x3kvic52jgp2mvd5wzrqrprqi82cdk8l4075v8b33ksvj9mjqiw"; + }; + propagatedBuildInputs = [ X11Protocol ]; + buildInputs = [ EncodeHanExtra ModuleUtil ]; + meta = { + description = "Miscellaneous helpers for X11::Protocol connections."; + license = with stdenv.lib.licenses; [ gpl1Plus gpl3Plus ]; + homepage = "http://user42.tuxfamily.org/x11-protocol-other/index.html"; + }; + }; + X11GUITest = buildPerlPackage { pname = "X11-GUITest"; version = "0.28"; @@ -19330,10 +19668,10 @@ let XMLSAX = buildPerlPackage { pname = "XML-SAX"; - version = "1.00"; + version = "1.02"; src = fetchurl { - url = mirror://cpan/authors/id/G/GR/GRANTM/XML-SAX-1.00.tar.gz; - sha256 = "1qra9k3wszjxvsgbragl55z3qba4nri0ipmjaxfib4l6xxj6bsj5"; + url = mirror://cpan/authors/id/G/GR/GRANTM/XML-SAX-1.02.tar.gz; + sha256 = "0am13vnv8qsjafr5ljakwnkhlwpk15sga02z8mxsg9is0j3w61j5"; }; propagatedBuildInputs = [ XMLNamespaceSupport XMLSAXBase ]; postInstall = '' @@ -19481,10 +19819,10 @@ let YAML = buildPerlPackage { pname = "YAML"; - version = "1.27"; + version = "1.29"; src = fetchurl { - url = mirror://cpan/authors/id/T/TI/TINITA/YAML-1.27.tar.gz; - sha256 = "1yc2yqjyrcdlhp209f3a63f9xx6v5klisli25fv221yy43la34n9"; + url = mirror://cpan/authors/id/T/TI/TINITA/YAML-1.29.tar.gz; + sha256 = "0gl5ssvrdajlbc85cy6z873n9cwlssk5q8z97a31vyiikhw5fp4w"; }; buildInputs = [ TestBase TestDeep TestYAML ]; @@ -19520,10 +19858,10 @@ let YAMLLibYAML = buildPerlPackage { pname = "YAML-LibYAML"; - version = "0.77"; + version = "0.79"; src = fetchurl { - url = mirror://cpan/authors/id/T/TI/TINITA/YAML-LibYAML-0.77.tar.gz; - sha256 = "04wfa78i3r6gznl47gj3qvsa1ixdas7l7c5c3n5mwm81wi4d9vsi"; + url = mirror://cpan/authors/id/T/TI/TINITA/YAML-LibYAML-0.79.tar.gz; + sha256 = "0wwmk3f2q0qv229sjjl3vbypppa9wmaiqh2b0qlai33m476vl1c4"; }; }; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 3b7bb5692a2..801a9c9e30b 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -39,10 +39,10 @@ let }; ast = buildPecl rec { - version = "1.0.1"; + version = "1.0.3"; pname = "ast"; - sha256 = "0ja74k2lmxwhhvp9y9kc7khijd7s2dqma5x8ghbhx9ajkn0wg8iq"; + sha256 = "1sk9bkyw3ck9jgvlazxx8zl2nv6lc0gq66v1rfcby9v0zyydb7xr"; }; box = mkDerivation rec { @@ -73,12 +73,12 @@ let }; composer = mkDerivation rec { - version = "1.8.6"; + version = "1.9.0"; pname = "composer"; src = pkgs.fetchurl { url = "https://getcomposer.org/download/${version}/composer.phar"; - sha256 = "0hnm7njab9nsifpb1qbwx54yfpsi00g8mzny11s13ibjvd9rnvxn"; + sha256 = "0x88bin1c749ajymz2cqjx8660a3wxvndpv4xr6w3pib16fzdpy9"; }; dontUnpack = true; @@ -143,10 +143,10 @@ let }; event = buildPecl rec { - version = "2.5.2"; + version = "2.5.3"; pname = "event"; - sha256 = "0b9zbwyyfcrzs1gcpqn2dkjq6jliw89g2m981f8ildbp84snkpcf"; + sha256 = "12liry5ldvgwp1v1a6zgfq8w6iyyxmsdj4c71bp157nnf58cb8hb"; configureFlags = [ "--with-event-libevent-dir=${pkgs.libevent.dev}" @@ -215,6 +215,23 @@ let buildInputs = with pkgs; [ cyrus_sasl zlib ]; }; + mongodb = buildPecl { + pname = "mongodb"; + version = "1.5.5"; + + sha256 = "0gpywk3wkimjrva1p95a7abvl3s8yccalf6yimn3nbkpvn2kknm6"; + + nativeBuildInputs = [ pkgs.pkgconfig ]; + buildInputs = with pkgs; [ + cyrus_sasl + icu + openssl + snappy + zlib + (if isPhp73 then pcre2 else pcre) + ] ++ lib.optional (pkgs.stdenv.isDarwin) pkgs.darwin.apple_sdk.frameworks.Security; + }; + oci8 = buildPecl rec { version = "2.2.0"; pname = "oci8"; @@ -450,10 +467,10 @@ let }; protobuf = buildPecl rec { - version = "3.8.0"; + version = "3.9.0"; pname = "protobuf"; - sha256 = "09zs7w9iv6432i0js44ihxymbd4pcxlprlzqkcjsxjpbprs4qpv2"; + sha256 = "1pyfxrfdbzzg5al4byyazdrvy7yad13zwq7papbb2d8gkvc3f3kh"; buildInputs = with pkgs; [ (if isPhp73 then pcre2 else pcre) ]; @@ -493,20 +510,41 @@ let }; }; - pthreads = assert (pkgs.config.php.zts or false); buildPecl rec { - version = "3.1.5"; + pthreads = if isPhp73 then pthreads32-dev else pthreads32; + + pthreads32 = assert (pkgs.config.php.zts or false); assert !isPhp73; buildPecl rec { + version = "3.2.0"; pname = "pthreads"; - sha256 = "1ziap0py3zrc7qj9lw4nzq6wx1viyj8v9y1babchizzan014x6p5"; + src = pkgs.fetchFromGitHub { + owner = "krakjoe"; + repo = "pthreads"; + rev = "v${version}"; + sha256 = "17hypm75d4w7lvz96jb7s0s87018yzmmap0l125d5fd7abnhzfvv"; + }; - meta.broken = true; + buildInputs = with pkgs; [ pcre.dev ]; + }; + + pthreads32-dev = assert (pkgs.config.php.zts or false); assert isPhp73; buildPecl rec { + version = "3.2.0-dev"; + pname = "pthreads"; + + src = pkgs.fetchFromGitHub { + owner = "krakjoe"; + repo = "pthreads"; + rev = "4d1c2483ceb459ea4284db4eb06646d5715e7154"; + sha256 = "07kdxypy0bgggrfav2h1ccbv67lllbvpa3s3zsaqci0gq4fyi830"; + }; + + buildInputs = with pkgs; [ pcre2.dev ]; }; redis = buildPecl rec { - version = "4.3.0"; + version = "5.0.2"; pname = "redis"; - sha256 = "18hvll173mlp6dk6xvgajkjf4min8f5gn809nr1ahq4r6kn4rw60"; + sha256 = "0b5pw17lzqknhijfymksvf8fm1zilppr97ypb31n599jw3mxf62f"; }; sqlsrv = buildPecl rec { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0896322e510..daf9f5e70cf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -183,7 +183,10 @@ in { asciitree = callPackage ../development/python-modules/asciitree { }; - ase = callPackage ../development/python-modules/ase { }; + ase = if isPy27 then + callPackage ../development/python-modules/ase/3.17.nix { } + else + callPackage ../development/python-modules/ase { }; asn1crypto = callPackage ../development/python-modules/asn1crypto { }; @@ -474,8 +477,12 @@ in { clustershell = callPackage ../development/python-modules/clustershell { }; + cnvkit = callPackage ../development/python-modules/cnvkit { }; + cozy = callPackage ../development/python-modules/cozy { }; + codespell = callPackage ../development/python-modules/codespell { }; + curio = callPackage ../development/python-modules/curio { }; dendropy = callPackage ../development/python-modules/dendropy { }; @@ -514,6 +521,8 @@ in { emcee = callPackage ../development/python-modules/emcee { }; + emailthreads = callPackage ../development/python-modules/emailthreads { }; + email_validator = callPackage ../development/python-modules/email-validator { }; ewmh = callPackage ../development/python-modules/ewmh { }; @@ -574,6 +583,8 @@ in { filemagic = callPackage ../development/python-modules/filemagic { }; + fsspec = callPackage ../development/python-modules/fsspec { }; + fuse = callPackage ../development/python-modules/fuse-python { inherit (pkgs) fuse pkgconfig; }; @@ -606,7 +617,9 @@ in { gsd = callPackage ../development/python-modules/gsd { }; - gssapi = callPackage ../development/python-modules/gssapi { }; + gssapi = callPackage ../development/python-modules/gssapi { + inherit (pkgs) darwin krb5Full; + }; guestfs = callPackage ../development/python-modules/guestfs { }; @@ -630,6 +643,8 @@ in { hdmedians = callPackage ../development/python-modules/hdmedians { }; + hocr-tools = callPackage ../development/python-modules/hocr-tools { }; + holoviews = callPackage ../development/python-modules/holoviews { }; hoomd-blue = toPythonModule (callPackage ../development/python-modules/hoomd-blue { @@ -660,6 +675,8 @@ in { jwcrypto = callPackage ../development/python-modules/jwcrypto { }; + kconfiglib = callPackage ../development/python-modules/kconfiglib { }; + lammps-cython = callPackage ../development/python-modules/lammps-cython { mpi = pkgs.openmpi; }; @@ -743,6 +760,8 @@ in { numericalunits = callPackage ../development/python-modules/numericalunits { }; + oath = callPackage ../development/python-modules/oath { }; + oauthenticator = callPackage ../development/python-modules/oauthenticator { }; ordered-set = callPackage ../development/python-modules/ordered-set { }; @@ -868,6 +887,8 @@ in { pyfakefs = callPackage ../development/python-modules/pyfakefs {}; + pyfaidx = callPackage ../development/python-modules/pyfaidx { }; + pyfttt = callPackage ../development/python-modules/pyfttt { }; pyftdi = callPackage ../development/python-modules/pyftdi { }; @@ -975,6 +996,8 @@ in { inherit (pkgs) cmake qt5 llvmPackages; }); + simplefix = callPackage ../development/python-modules/simplefix { }; + pyside2-tools = toPythonModule (callPackage ../development/python-modules/pyside2-tools { inherit (pkgs) cmake qt5; }); @@ -1001,6 +1024,8 @@ in { pytest-mypy = callPackage ../development/python-modules/pytest-mypy { }; + pytest-ordering = callPackage ../development/python-modules/pytest-ordering { }; + pytest-pylint = callPackage ../development/python-modules/pytest-pylint { }; pytest-testmon = callPackage ../development/python-modules/pytest-testmon { }; @@ -1059,10 +1084,14 @@ in { python-utils = callPackage ../development/python-modules/python-utils { }; + python-vipaccess = callPackage ../development/python-modules/python-vipaccess { }; + pytimeparse = callPackage ../development/python-modules/pytimeparse { }; pytricia = callPackage ../development/python-modules/pytricia { }; + pytrends = callPackage ../development/python-modules/pytrends { }; + py-vapid = callPackage ../development/python-modules/py-vapid { }; PyWebDAV = callPackage ../development/python-modules/pywebdav { }; @@ -1145,6 +1174,8 @@ in { statistics = callPackage ../development/python-modules/statistics { }; + stm32loader = callPackage ../development/python-modules/stm32loader { }; + stumpy = callPackage ../development/python-modules/stumpy { }; sumo = callPackage ../development/python-modules/sumo { }; @@ -1252,6 +1283,8 @@ in { aiorpcx = callPackage ../development/python-modules/aiorpcx { }; + aiosmtpd = callPackage ../development/python-modules/aiosmtpd { }; + aiounifi = callPackage ../development/python-modules/aiounifi { }; aiozeroconf = callPackage ../development/python-modules/aiozeroconf { }; @@ -1323,8 +1356,12 @@ in { astor = callPackage ../development/python-modules/astor {}; + asyncpg = callPackage ../development/python-modules/asyncpg { }; + asyncssh = callPackage ../development/python-modules/asyncssh { }; + atpublic = callPackage ../development/python-modules/atpublic { }; + python-fontconfig = callPackage ../development/python-modules/python-fontconfig { }; funcsigs = callPackage ../development/python-modules/funcsigs { }; @@ -1478,6 +1515,8 @@ in { boltztrap2 = callPackage ../development/python-modules/boltztrap2 { }; + boolean-py = callPackage ../development/python-modules/boolean-py { }; + bumps = callPackage ../development/python-modules/bumps {}; cached-property = callPackage ../development/python-modules/cached-property { }; @@ -1874,6 +1913,8 @@ in { pkginfo = callPackage ../development/python-modules/pkginfo { }; + pre-commit = callPackage ../development/python-modules/pre-commit { }; + pretend = callPackage ../development/python-modules/pretend { }; detox = callPackage ../development/python-modules/detox { }; @@ -1915,11 +1956,7 @@ in { hypothesis = self.hypothesis.override { doCheck = false; }; }; - # Keep 3 because many test suites are not yet compatible with Pytest 4. - pytest_3 = callPackage ../development/python-modules/pytest/3.10.nix { - # hypothesis tests require pytest that causes dependency cycle - hypothesis = self.hypothesis.override { doCheck = false; }; - }; + pytest-helpers-namespace = callPackage ../development/python-modules/pytest-helpers-namespace { }; pytest-httpbin = callPackage ../development/python-modules/pytest-httpbin { }; @@ -2108,6 +2145,8 @@ in { demjson = callPackage ../development/python-modules/demjson { }; + deprecated = callPackage ../development/python-modules/deprecated { }; + deprecation = callPackage ../development/python-modules/deprecation { }; derpconf = callPackage ../development/python-modules/derpconf { }; @@ -2186,6 +2225,8 @@ in { elasticsearch-curator = callPackage ../development/python-modules/elasticsearch-curator { }; + elementpath = callPackage ../development/python-modules/elementpath { }; + entrypoints = callPackage ../development/python-modules/entrypoints { }; enzyme = callPackage ../development/python-modules/enzyme {}; @@ -2409,6 +2450,8 @@ in { jsmin = callPackage ../development/python-modules/jsmin { }; + jsonmerge = callPackage ../development/python-modules/jsonmerge { }; + jsonpatch = callPackage ../development/python-modules/jsonpatch { }; jsonpickle = callPackage ../development/python-modules/jsonpickle { }; @@ -2431,6 +2474,8 @@ in { libthumbor = callPackage ../development/python-modules/libthumbor { }; + license-expression = callPackage ../development/python-modules/license-expression { }; + lightblue = callPackage ../development/python-modules/lightblue { }; lightgbm = callPackage ../development/python-modules/lightgbm { }; @@ -2787,6 +2832,8 @@ in { django-cors-headers = callPackage ../development/python-modules/django-cors-headers { }; + django-csp = callPackage ../development/python-modules/django-csp { }; + django-discover-runner = callPackage ../development/python-modules/django-discover-runner { }; django_environ = callPackage ../development/python-modules/django_environ { }; @@ -2803,6 +2850,8 @@ in { django-jinja = callPackage ../development/python-modules/django-jinja2 { }; + django-logentry-admin = callPackage ../development/python-modules/django-logentry-admin { }; + django-pglocks = callPackage ../development/python-modules/django-pglocks { }; django-picklefield = callPackage ../development/python-modules/django-picklefield { }; @@ -2956,6 +3005,8 @@ in { flake8-import-order = callPackage ../development/python-modules/flake8-import-order { }; + flake8-polyfill = callPackage ../development/python-modules/flake8-polyfill { }; + flaky = callPackage ../development/python-modules/flaky { }; flask = callPackage ../development/python-modules/flask { }; @@ -3119,6 +3170,8 @@ in { gipc = callPackage ../development/python-modules/gipc { }; + git-revise = callPackage ../development/python-modules/git-revise { }; + git-sweep = callPackage ../development/python-modules/git-sweep { }; glances = callPackage ../development/python-modules/glances { }; @@ -3438,6 +3491,10 @@ in { kubernetes = callPackage ../development/python-modules/kubernetes { }; + k5test = callPackage ../development/python-modules/k5test { + inherit (pkgs) krb5Full findutils which; + }; + pylast = callPackage ../development/python-modules/pylast { }; pylru = callPackage ../development/python-modules/pylru { }; @@ -4044,6 +4101,8 @@ in { pep8 = callPackage ../development/python-modules/pep8 { }; + pep8-naming = callPackage ../development/python-modules/pep8-naming { }; + pep257 = callPackage ../development/python-modules/pep257 { }; percol = callPackage ../development/python-modules/percol { }; @@ -4065,6 +4124,12 @@ in { pgspecial = callPackage ../development/python-modules/pgspecial { }; + pgpy = callPackage ../development/python-modules/pgpy { + cryptography = self.cryptography.override { + openssl = pkgs.openssl_1_1; + }; + }; + pickleshare = callPackage ../development/python-modules/pickleshare { }; piep = callPackage ../development/python-modules/piep { }; @@ -4084,6 +4149,8 @@ in { pika-pool = callPackage ../development/python-modules/pika-pool { }; + pikepdf = callPackage ../development/python-modules/pikepdf { }; + kmapper = callPackage ../development/python-modules/kmapper { }; kmsxx = (callPackage ../development/libraries/kmsxx { @@ -4678,6 +4745,11 @@ in { seqdiag = callPackage ../development/python-modules/seqdiag { }; + sequoia = disabledIf (isPyPy || !isPy3k) (toPythonModule (pkgs.sequoia.override { + pythonPackages = self; + pythonSupport = true; + })); + safe = callPackage ../development/python-modules/safe { }; sampledata = callPackage ../development/python-modules/sampledata { }; @@ -4806,6 +4878,8 @@ in { sqlalchemy_migrate = callPackage ../development/python-modules/sqlalchemy-migrate { }; + sqlalchemy-utils = callPackage ../development/python-modules/sqlalchemy-utils { }; + staticjinja = callPackage ../development/python-modules/staticjinja { }; statsmodels = callPackage ../development/python-modules/statsmodels { }; @@ -4949,8 +5023,6 @@ in { wordfreq = callPackage ../development/python-modules/wordfreq { }; - wikipedia = callPackage ../development/python-modules/wikipedia { }; - magic-wormhole = callPackage ../development/python-modules/magic-wormhole { }; magic-wormhole-mailbox-server = callPackage ../development/python-modules/magic-wormhole-mailbox-server { }; @@ -4964,8 +5036,15 @@ in { inherit (pkgs) pkgconfig; }; + wxPython_4_0 = callPackage ../development/python-modules/wxPython/4.0.nix { + inherit (pkgs) pkgconfig; + wxGTK = pkgs.wxGTK30.override { withGtk2 = false; withWebKit = true; }; + }; + xml2rfc = callPackage ../development/python-modules/xml2rfc { }; + xmlschema = callPackage ../development/python-modules/xmlschema { }; + xmltodict = callPackage ../development/python-modules/xmltodict { }; xarray = callPackage ../development/python-modules/xarray { }; @@ -5017,6 +5096,8 @@ in { ruamel_yaml = callPackage ../development/python-modules/ruamel_yaml { }; + ruffus = callPackage ../development/python-modules/ruffus { }; + runsnakerun = callPackage ../development/python-modules/runsnakerun { }; pysendfile = callPackage ../development/python-modules/pysendfile { }; @@ -5264,6 +5345,8 @@ in { units = callPackage ../development/python-modules/units { }; + unittest-data-provider = callPackage ../development/python-modules/unittest-data-provider { }; + unittest2 = callPackage ../development/python-modules/unittest2 { }; unittest-xml-reporting = callPackage ../development/python-modules/unittest-xml-reporting { }; @@ -5601,6 +5684,8 @@ in { python-u2flib-host = callPackage ../development/python-modules/python-u2flib-host { }; + python-xmp-toolkit = callPackage ../development/python-modules/python-xmp-toolkit { }; + pluggy = callPackage ../development/python-modules/pluggy {}; xcffib = callPackage ../development/python-modules/xcffib {}; @@ -6094,6 +6179,14 @@ in { fastapi = callPackage ../development/python-modules/fastapi { }; stringcase = callPackage ../development/python-modules/stringcase { }; + + webrtcvad = callPackage ../development/python-modules/webrtcvad { }; + + wget = callPackage ../development/python-modules/wget { }; + + runway-python = callPackage ../development/python-modules/runway-python { }; + + pyprof2calltree = callPackage ../development/python-modules/pyprof2calltree { }; }); in fix' (extends overrides packages) diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix index 108c6006fb6..eac84cfc1a8 100644 --- a/pkgs/top-level/static.nix +++ b/pkgs/top-level/static.nix @@ -163,9 +163,11 @@ in { enableShared = false; inherit libcxxabi; }; + libunwind = super.llvmPackages_8.libraries.libunwind.override { + enableShared = false; + }; }; }; python27 = super.python27.override { static = true; }; - } |